[PATCH 0/7] Mostly whitespace changes and fixes.

Giuliano Procida gprocida@google.com
Fri Mar 27 14:00:10 GMT 2020


Hi.

These are mostly whitespace changes. Let me know if any of them need
a tweak. Apologies in advance for fedabipkgdiff test breakage.

The first patch partially undoes 474ad38f in line with
maennich@google.com's review comments and my original intention.

However, if you prefer the more compact output format for top-level
lists of [C]hanged things, it should be easy to switch to that as all
the places where the different behaviour happens is commented.

The fourth patch touches quite a bit of code which is not covered by
current tests and I wasn't able to exercise.

The fifth patch has semantic changes and warrants more careful review.

This was also me working out how to do hg split with git.

 git rebase -i
 git reset HEAD^1
 git add -p
 git commit -c REBASE_HEAD

Regards,
Giuliano.

Giuliano Procida (7):
  abidiff: Clean up new lines between sections.
  abidiff: Remove blank line after base class diffs.
  abidiff: Fix enum impacted interfaces blank line.
  abidiff: Remove member function diff blank lines.
  abidiff: Fix variable declaration formatting.
  abidiff: Eliminate leaf mode double blank lines.
  abidiff: Remove new lines after parameter diffs.

 src/abg-default-reporter.cc                   |  97 +++---------------
 src/abg-leaf-reporter.cc                      |  37 ++-----
 src/abg-reporter-priv.cc                      |  61 +++++++----
 tests/data/Makefile.am                        |   5 +
 .../test0-fn-changed-report-0.txt             |   1 -
 .../test0-fn-changed-report-2.txt             |   1 -
 .../test7-fn-changed-report-0.txt             |   1 -
 .../test-leaf-cxx-members-report.txt          |  42 ++++++++
 .../test-leaf-cxx-members-v0.cc               |  12 +++
 .../test-leaf-cxx-members-v0.o                | Bin 0 -> 7328 bytes
 .../test-leaf-cxx-members-v1.cc               |  14 +++
 .../test-leaf-cxx-members-v1.o                | Bin 0 -> 7360 bytes
 .../test-leaf-peeling-report.txt              |   5 -
 .../test-abidiff-exit/test-leaf2-report.txt   |   1 -
 .../test-abidiff-exit/test-leaf3-report.txt   |   3 +
 .../test-loc-with-locs-report.txt             |   1 -
 .../test-loc-without-locs-report.txt          |   1 -
 .../test1-voffset-change-report0.txt          |   1 -
 .../test-abidiff/test-PR18791-report0.txt     |   5 -
 tests/data/test-abidiff/test-enum0-report.txt |   1 -
 tests/data/test-abidiff/test-enum1-report.txt |   1 -
 .../data/test-abidiff/test-struct1-report.txt |   1 -
 .../PR25058-liblttng-ctl-report-1.txt         |   8 --
 .../test-23-diff-arch-report-0.txt            |   1 -
 tests/data/test-diff-dwarf/test0-report.txt   |   2 -
 tests/data/test-diff-dwarf/test1-report.txt   |   1 -
 tests/data/test-diff-dwarf/test10-report.txt  |   1 -
 tests/data/test-diff-dwarf/test11-report.txt  |   1 -
 tests/data/test-diff-dwarf/test13-report.txt  |   1 -
 .../test-diff-dwarf/test15-enum-report.txt    |   2 -
 tests/data/test-diff-dwarf/test2-report.txt   |   1 -
 .../test20-add-fn-parm-report-0.txt           |   2 -
 .../test21-redundant-fn-report-0.txt          |   1 -
 .../test22-changed-parm-c-report-0.txt        |   1 -
 .../test24-added-fn-parms-report-0.txt        |   2 -
 .../test25-removed-fn-parms-report-0.txt      |   2 -
 ...t26-added-parms-before-variadic-report.txt |   5 -
 .../test27-local-base-diff-report.txt         |   2 -
 .../test28-vtable-changes-report-0.txt        |   1 -
 tests/data/test-diff-dwarf/test3-report.txt   |   1 -
 .../test30-vtable-changes-report-0.txt        |   1 -
 .../test31-vtable-changes-report-0.txt        |   1 -
 .../test32-fnptr-changes-report-0.txt         |   2 -
 .../test33-fnref-changes-report-0.txt         |   2 -
 .../test36-ppc64-aliases-report-0.txt         |   1 -
 .../test-diff-dwarf/test37-union-report-0.txt |   1 -
 .../test-diff-dwarf/test38-union-report-0.txt |   1 -
 .../test-diff-dwarf/test39-union-report-0.txt |   1 -
 tests/data/test-diff-dwarf/test4-report.txt   |   1 -
 .../data/test-diff-dwarf/test40-report-0.txt  |   1 -
 .../test41-PR20476-hidden-report-0.txt        |   3 -
 .../test42-PR21296-clanggcc-report0.txt       |   2 -
 .../test43-PR22913-report-0.txt               |   1 -
 .../test44-anon-struct-union-report-0.txt     |   1 -
 .../test45-anon-dm-change-report-0.txt        |   1 +
 .../test-diff-dwarf/test46-rust-report-0.txt  |   2 -
 tests/data/test-diff-dwarf/test5-report.txt   |   1 -
 tests/data/test-diff-dwarf/test6-report.txt   |   1 -
 tests/data/test-diff-dwarf/test8-report.txt   |   2 -
 .../libtest45-basic-type-change-report-0.txt  |   1 -
 .../libtest45-basic-type-change-report-1.txt  |   8 +-
 .../test-PR24731-report-1.txt                 |   1 -
 tests/data/test-diff-filter/test0-report.txt  |   2 -
 tests/data/test-diff-filter/test01-report.txt |   2 -
 tests/data/test-diff-filter/test1-report.txt  |   1 -
 tests/data/test-diff-filter/test10-report.txt |   1 -
 tests/data/test-diff-filter/test11-report.txt |   1 -
 tests/data/test-diff-filter/test13-report.txt |   1 -
 .../data/test-diff-filter/test14-0-report.txt |   1 -
 .../data/test-diff-filter/test14-1-report.txt |   1 -
 .../data/test-diff-filter/test15-1-report.txt |   1 +
 .../data/test-diff-filter/test16-report-2.txt |   1 -
 tests/data/test-diff-filter/test16-report.txt |   1 -
 .../data/test-diff-filter/test17-0-report.txt |   1 -
 .../data/test-diff-filter/test17-1-report.txt |   1 -
 tests/data/test-diff-filter/test18-report.txt |   1 -
 .../test-diff-filter/test19-enum-report-1.txt |   2 -
 tests/data/test-diff-filter/test2-report.txt  |   1 -
 .../test22-compatible-fns-report-0.txt        |   1 -
 ...st23-redundant-fn-parm-change-report-0.txt |   1 -
 .../test25-cyclic-type-report-0.txt           |   1 -
 .../test25-cyclic-type-report-1.txt           |   1 -
 ...st26-qualified-redundant-node-report-0.txt |   1 -
 ...st26-qualified-redundant-node-report-1.txt |   1 -
 ...t-and-filtered-children-nodes-report-0.txt |   1 -
 ...t-and-filtered-children-nodes-report-1.txt |   1 -
 ...t-and-filtered-children-nodes-report-2.txt |   1 -
 ...t-and-filtered-children-nodes-report-0.txt |   1 -
 ...t-and-filtered-children-nodes-report-1.txt |   1 -
 ...st29-finer-redundancy-marking-report-0.txt |   2 -
 tests/data/test-diff-filter/test3-report.txt  |   1 -
 .../test30-pr18904-rvalueref-report0.txt      |   3 -
 .../test30-pr18904-rvalueref-report1.txt      |   3 -
 .../test30-pr18904-rvalueref-report2.txt      |   3 -
 .../test31-pr18535-libstdc++-report-0.txt     |   2 -
 .../test31-pr18535-libstdc++-report-1.txt     |   2 -
 .../test32-ppc64le-struct-change-report0.txt  |   1 -
 .../test35-pr18754-no-added-syms-report-0.txt |   3 -
 .../data/test-diff-filter/test36-report-0.txt |   1 -
 .../data/test-diff-filter/test37-report-0.txt |   1 -
 .../test39/test39-report-0.txt                |   1 -
 .../data/test-diff-filter/test41-report-0.txt |   1 -
 .../test44-anonymous-data-member-report-0.txt |   1 -
 .../test44-anonymous-data-member-report-1.txt |   2 +-
 tests/data/test-diff-filter/test6-report.txt  |   1 -
 tests/data/test-diff-filter/test7-report.txt  |   1 -
 tests/data/test-diff-filter/test9-report.txt  |   1 -
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |   1 -
 .../PR24690/PR24690-report-0.txt              |   1 -
 .../data/test-diff-pkg/dirpkg-1-report-1.txt  |   1 -
 .../data/test-diff-pkg/dirpkg-3-report-1.txt  |   1 -
 .../data/test-diff-pkg/dirpkg-3-report-2.txt  |   1 -
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |   2 +-
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |   1 -
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |   4 -
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |   7 --
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-0.txt |   2 -
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-1.txt |   2 -
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt |   2 -
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-3.txt |   1 -
 .../symlink-dir-test1-report0.txt             |   1 -
 .../data/test-diff-pkg/tarpkg-0-report-0.txt  |   1 -
 .../data/test-diff-pkg/tarpkg-1-report-0.txt  |   1 -
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt |   5 -
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt |   2 -
 .../libtest48-soname-abixml-report-1.txt      |   1 -
 .../test0-type-suppr-report-0.txt             |   1 -
 .../test0-type-suppr-report-3.txt             |   1 -
 .../test0-type-suppr-report-5.txt             |   1 -
 .../test0-type-suppr-report-7.txt             |   1 -
 .../test1-typedef-suppr-report-0.txt          |   1 -
 .../test1-typedef-suppr-report-2.txt          |   1 -
 .../test10-changed-parm-c-report-0.txt        |   1 -
 .../test11-add-data-member-report-0.txt       |   1 -
 .../test12-add-data-member-report-0.txt       |   1 -
 .../test12-add-data-member-report-2.txt       |   1 -
 .../test13-suppr-through-pointer-report-0.txt |   1 -
 .../test13-suppr-through-pointer-report-1.txt |   1 -
 .../test14-suppr-non-redundant-report-0.txt   |   1 -
 .../test14-suppr-non-redundant-report-1.txt   |   1 -
 .../test15-suppr-added-fn-report-0.txt        |   1 -
 .../test15-suppr-added-fn-report-1.txt        |   1 -
 .../test15-suppr-added-fn-report-5.txt        |   1 -
 .../test16-suppr-removed-fn-report-0.txt      |   1 -
 .../test16-suppr-removed-fn-report-2.txt      |   1 -
 .../test2-struct-suppr-report-0.txt           |   1 -
 .../test23-alias-filter-report-0.txt          |   1 -
 .../test23-alias-filter-report-2.txt          |   1 -
 .../test24-soname-report-1.txt                |   1 -
 .../test24-soname-report-10.txt               |   1 -
 .../test24-soname-report-12.txt               |   1 -
 .../test24-soname-report-14.txt               |   1 -
 .../test24-soname-report-16.txt               |   1 -
 .../test24-soname-report-4.txt                |   1 -
 .../test25-typedef-report-0.txt               |   1 -
 .../test26-loc-suppr-report-0.txt             |   1 -
 .../test26-loc-suppr-report-3.txt             |   1 -
 .../test3-struct-suppr-report-0.txt           |   1 -
 .../test3-struct-suppr-report-1.txt           |   1 -
 .../test3-struct-suppr-report-2.txt           |   1 -
 .../data/test-diff-suppr/test30-report-0.txt  |   1 -
 .../data/test-diff-suppr/test31-report-1.txt  |   1 -
 .../data/test-diff-suppr/test32-report-0.txt  |   1 -
 .../data/test-diff-suppr/test32-report-1.txt  |   1 -
 .../data/test-diff-suppr/test33-report-0.txt  |   1 -
 .../test-diff-suppr/test36-leaf-report-0.txt  |   1 -
 .../test39-opaque-type-report-0.txt           |   1 -
 .../test4-local-suppr-report-0.txt            |   1 -
 .../test4-local-suppr-report-1.txt            |   1 -
 .../test41-enumerator-changes-report-0.txt    |   3 -
 .../test42-negative-suppr-type-report-0.txt   |   1 -
 .../test42-negative-suppr-type-report-1.txt   |   1 -
 .../test47-non-reachable-types-report-1.txt   |   1 -
 .../test47-non-reachable-types-report-2.txt   |   1 -
 .../test47-non-reachable-types-report-3.txt   |   1 -
 .../test47-non-reachable-types-report-4.txt   |   1 -
 .../test47-non-reachable-types-report-5.txt   |   1 -
 .../test47-non-reachable-types-report-7.txt   |   1 -
 .../test47-non-reachable-types-report-8.txt   |   1 -
 .../test5-fn-suppr-report-0.txt               |   1 -
 .../test5-fn-suppr-report-1.txt               |   1 -
 .../test5-fn-suppr-report-2.txt               |   1 -
 .../test5-fn-suppr-report-3.txt               |   1 -
 .../test5-fn-suppr-report-4.txt               |   1 -
 .../test5-fn-suppr-report-5.txt               |   1 -
 .../test6-fn-suppr-report-0-1.txt             |   1 -
 .../test6-fn-suppr-report-0.txt               |   1 -
 .../test6-fn-suppr-report-1.txt               |   1 -
 .../test6-fn-suppr-report-2.txt               |   1 -
 .../test6-fn-suppr-report-3.txt               |   1 -
 .../test7-var-suppr-report-0.txt              |   1 +
 .../test7-var-suppr-report-8.txt              |   1 +
 .../test8-redundant-fn-report-0.txt           |   1 -
 .../test8-redundant-fn-report-1.txt           |   1 -
 .../test9-changed-parm-c-report-0.txt         |   1 -
 .../test9-changed-parm-c-report-1.txt         |   1 -
 tests/test-abidiff-exit.cc                    |  10 ++
 197 files changed, 156 insertions(+), 385 deletions(-)
 create mode 100644 tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
 create mode 100644 tests/data/test-abidiff-exit/test-leaf-cxx-members-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/test-leaf-cxx-members-v0.o
 create mode 100644 tests/data/test-abidiff-exit/test-leaf-cxx-members-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/test-leaf-cxx-members-v1.o

-- 
2.25.1.696.g5e7596f4ac-goog



More information about the Libabigail mailing list