From patchwork Thu Oct 29 12:20:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 40918 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 76EE4398546C; Thu, 29 Oct 2020 12:21:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76EE4398546C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1603974097; bh=Lnjb9BfPTPpNsS1gULYeqIHoB9UVjlIZ+SYYxE2d25U=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=L6/qu5hPOCJcBloDHn/yisiDqW808Ekb0/G00Et1tuUJX02x1s8oWHYgXkvzuCioj bt1Y2Ny+gvR9vlNZJN3xMLf2IAKb0uBYbq5wKVNpWEedUQGJP0m+T9SCLbEa8IsMkx eyreGeEAyYinRT4MIIoVkIFevbYDSTC5G8Jbbhsg= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) by sourceware.org (Postfix) with ESMTPS id 475C03985462 for ; Thu, 29 Oct 2020 12:21:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 475C03985462 Received: by mail-qv1-xf49.google.com with SMTP id l16so527423qvt.17 for ; Thu, 29 Oct 2020 05:21:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=Lnjb9BfPTPpNsS1gULYeqIHoB9UVjlIZ+SYYxE2d25U=; b=eUjowFalPhahtdp1rUwZueHTj7Xmk8en9FeHrFvkIJw+4wTfZqIC899G+uzzj/8w5X cm2YqGK4gIpc9Q6kcdETpVJBrVD3gX0kU+rTZwOIM8MrcYGhS8EcZ/FD4hjlYCbcJh4c 7fuU+uxyoabEsUbVJK38kHdgbpFCj5jB+AvyxgAf+i6tB0PPR+R4KV8Phziz/aL8ZTep mRbSwyumVdfVwMDwygt1rAT0Y0g4cXy1kqw84fIHVKNnH62/4jC2+OZYyiusdbDniPy0 Ai0BTF9yS4teWu9aeyf4ucjUlkyITcBUyvEiekfQ2e6PPiD/n+ViDPuC8dZOcAhw6MHF cK5A== X-Gm-Message-State: AOAM533aLp48UCacfLeZWX0zcpxMBRdPpzh6xHxcfsGxSNVmcKsCI4YH XrVyx9IPfjftPAmhP9RwfnUR6VTAc1uYhvhIWfChjA4y8uMnqH1TJqoi3dFxSDZLFwMwgIn4Be5 nH7RNIlVSiVbYtx5rwXHRmoIqrDvVIkxaR4kxhDH6yDKgb4NzoDnBvzZkseJFq9OzjiYGZ+4= X-Google-Smtp-Source: ABdhPJx1HCeQaltYm+DVt0DrQpNIypHDcCR0elSXnSKlv9sq1F0dF5UYz/v8qK03OtIGt/yMxS2VGMmIhF6gkA== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a05:6214:943:: with SMTP id dn3mr3959839qvb.45.1603974074629; Thu, 29 Oct 2020 05:21:14 -0700 (PDT) Date: Thu, 29 Oct 2020 12:20:59 +0000 In-Reply-To: <20201029122100.765143-1-maennich@google.com> Message-Id: <20201029122100.765143-2-maennich@google.com> Mime-Version: 1.0 References: <20201029122100.765143-1-maennich@google.com> X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH 2/3] Improve enum synthetic type names To: libabigail@sourceware.org X-Spam-Status: No, score=-21.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SCC_10_SHORT_WORD_LINES, SCC_20_SHORT_WORD_LINES, SCC_5_SHORT_WORD_LINES, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" From: Giuliano Procida The ordering of canonical types (in an abi-instr XML element) appears to be sensitive to the particular C++ library used and the presence of other threads doing heap allocation. This patch forces distinct synthetic enum-underlying types to have distinct names, which ensures deterministic XML output order. * src/abg-dwarf-reader.cc (build_internal_underlying_enum_type_name): Add a size argument (and don't default is_anonymous argument). Append size of type to synthetic type name. (build_enum_underlying_type): Pass type size to build_internal_underlying_enum_type_name. * tests/data/test-abidiff-exit/test-decl-enum-report-3.txt: Update. Note that there may be an issue with leaf-mode reporting of pointer type changes. * tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi: Regenerate this (catching up with various abidw updates). * tests/data/test-annotate/test-anonymous-members-0.o.abi: Refresh with new type names. * tests/data/test-annotate/test0.abi: Likewise. * tests/data/test-annotate/test13-pr18894.so.abi: Likewise. * tests/data/test-annotate/test14-pr18893.so.abi: Likewise. * tests/data/test-annotate/test15-pr18892.so.abi: Likewise. * tests/data/test-annotate/test17-pr19027.so.abi: Likewise. * tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: Likewise. * tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise. * tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise. * tests/data/test-annotate/test21-pr19092.so.abi: Likewise. * tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi: Likewise. * tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise. * tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise. * tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi: Likewise. * tests/data/test-read-dwarf/test0.abi: Likewise. * tests/data/test-read-dwarf/test0.hash.abi: Likewise. * tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise. * tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise. * tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise. * tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise. * tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise. * tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise. * tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise. * tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise. * tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: Likewise. * tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise. * tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise. * tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise. * tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi: Likewise. * tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise. Signed-off-by: Giuliano Procida Signed-off-by: Matthias Maennich --- src/abg-dwarf-reader.cc | 11 +- .../test-decl-enum-report-3.txt | 4 +- .../test-anonymous-members-0.o.abi | 4 +- tests/data/test-annotate/test0.abi | 4 +- .../data/test-annotate/test13-pr18894.so.abi | 4 +- .../data/test-annotate/test14-pr18893.so.abi | 4 +- .../data/test-annotate/test15-pr18892.so.abi | 4 +- .../data/test-annotate/test17-pr19027.so.abi | 4 +- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 4 +- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 4 +- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 4 +- .../data/test-annotate/test21-pr19092.so.abi | 4 +- .../PR25409-librte_bus_dpaa.so.20.0.abi | 1689 ++++++++--------- .../PR22015-libboost_iostreams.so.abi | 2 +- .../test-read-dwarf/PR22122-libftdc.so.abi | 2 +- .../data/test-read-dwarf/PR25007-sdhci.ko.abi | 2 +- .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi | 2 +- tests/data/test-read-dwarf/test0.abi | 2 +- tests/data/test-read-dwarf/test0.hash.abi | 4 +- .../test-read-dwarf/test10-pr18818-gcc.so.abi | 2 +- .../test-read-dwarf/test11-pr18828.so.abi | 2 +- .../test-read-dwarf/test12-pr18844.so.abi | 2 +- .../test-read-dwarf/test13-pr18894.so.abi | 2 +- .../test-read-dwarf/test14-pr18893.so.abi | 2 +- .../test-read-dwarf/test15-pr18892.so.abi | 2 +- .../test-read-dwarf/test16-pr18904.so.abi | 2 +- .../test-read-dwarf/test17-pr19027.so.abi | 2 +- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 2 +- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 2 +- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 2 +- .../test-read-dwarf/test21-pr19092.so.abi | 2 +- .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 2 +- .../test9-pr18818-clang.so.abi | 2 +- 33 files changed, 891 insertions(+), 895 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index f19c4ae3e32e..d207efdbba9e 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -431,7 +431,8 @@ get_internal_anonymous_die_name(Dwarf_Die *die, static string build_internal_underlying_enum_type_name(const string &base_name, - bool is_anonymous); + bool is_anonymous, + uint64_t size); static string die_qualified_type_name(const read_context& ctxt, @@ -10408,7 +10409,8 @@ build_internal_anonymous_die_name(const string &base_name, /// be anonymous. static string build_internal_underlying_enum_type_name(const string &base_name, - bool is_anonymous = true) + bool is_anonymous, + uint64_t size) { std::ostringstream o; @@ -10417,7 +10419,7 @@ build_internal_underlying_enum_type_name(const string &base_name, else o << "enum-" << base_name; - o << "-underlying-type"; + o << "-underlying-type-" << size; return o.str(); } @@ -12974,7 +12976,8 @@ build_enum_underlying_type(read_context& ctxt, bool is_anonymous = true) { string underlying_type_name = - build_internal_underlying_enum_type_name(enum_name, is_anonymous); + build_internal_underlying_enum_type_name(enum_name, is_anonymous, + enum_size); type_decl_sptr result(new type_decl(ctxt.env(), underlying_type_name, enum_size, enum_size, location())); diff --git a/tests/data/test-abidiff-exit/test-decl-enum-report-3.txt b/tests/data/test-abidiff-exit/test-decl-enum-report-3.txt index b5b84c71f6fb..b3b11368a3d4 100644 --- a/tests/data/test-abidiff-exit/test-decl-enum-report-3.txt +++ b/tests/data/test-abidiff-exit/test-decl-enum-report-3.txt @@ -1,5 +1,5 @@ -Leaf changes summary: 0 artifact changed +Leaf changes summary: 0 artifact changed (2 filtered out) Changed leaf types summary: 0 leaf type changed -Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function +Removed/Changed/Added functions summary: 0 Removed, 0 Changed (2 filtered out), 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi index 5eca89ddb25f..51d01dfc52c9 100644 --- a/tests/data/test-annotate/test-anonymous-members-0.o.abi +++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi @@ -10,8 +10,8 @@ - - + + diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi index 5ac64e7051d6..06cb2044be0b 100644 --- a/tests/data/test-annotate/test0.abi +++ b/tests/data/test-annotate/test0.abi @@ -44,8 +44,8 @@ - - + + diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi index efb83bccf8d9..787ccf900035 100644 --- a/tests/data/test-annotate/test13-pr18894.so.abi +++ b/tests/data/test-annotate/test13-pr18894.so.abi @@ -667,8 +667,8 @@ - - + + diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi index c3a4a6730182..f1b606eb23dd 100644 --- a/tests/data/test-annotate/test14-pr18893.so.abi +++ b/tests/data/test-annotate/test14-pr18893.so.abi @@ -14490,8 +14490,8 @@ - - + + diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi index 60ccfae78455..51290f81150e 100644 --- a/tests/data/test-annotate/test15-pr18892.so.abi +++ b/tests/data/test-annotate/test15-pr18892.so.abi @@ -8812,8 +8812,8 @@ - - + + diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi index 9caf6bc6c2d3..79ada2185739 100644 --- a/tests/data/test-annotate/test17-pr19027.so.abi +++ b/tests/data/test-annotate/test17-pr19027.so.abi @@ -537,8 +537,8 @@ - - + + diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi index e1ae24200030..89efef8f30a2 100644 --- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi +++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi @@ -931,8 +931,8 @@ - - + + diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi index fcd70f5749af..426476c2d42d 100644 --- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi +++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi @@ -32022,8 +32022,8 @@ - - + + diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi index 82dfd635cf65..0bd8d7acd4ad 100644 --- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi +++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi @@ -817,8 +817,8 @@ - - + + diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi index b979f913d31d..fa2cb68a442c 100644 --- a/tests/data/test-annotate/test21-pr19092.so.abi +++ b/tests/data/test-annotate/test21-pr19092.so.abi @@ -981,8 +981,8 @@ - - + + diff --git a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi index 45984d7317e9..480f96132204 100644 --- a/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi +++ b/tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi @@ -1,4 +1,4 @@ - + @@ -137,7 +137,7 @@ - + @@ -3057,85 +3057,78 @@ - - - - - - - - + - + - - - + + + - + - - - - - + + + + + - - - + + + - - + + - + - + - - + + - + - + - + - - + + - + - + - - + + - + - + - + - + - + - + @@ -3144,62 +3137,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3208,304 +3201,304 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - + - + - - + + - - + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + @@ -3520,16 +3513,16 @@ - + - + - + @@ -3541,13 +3534,13 @@ - + - + - + @@ -3568,37 +3561,37 @@ - + - + - + - + - + - + - + - + @@ -3612,7 +3605,7 @@ - + @@ -3626,38 +3619,38 @@ - + - + - + - + - + - + - + - + - + @@ -3678,7 +3671,7 @@ - + @@ -3689,9 +3682,9 @@ - + - + @@ -3715,28 +3708,28 @@ - + - + - + - + - + - + - + @@ -3747,9 +3740,9 @@ - + - + @@ -3761,20 +3754,20 @@ - + - + - + - + @@ -3782,22 +3775,22 @@ - + - + - + - + - + - + @@ -3815,62 +3808,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3878,27 +3871,27 @@ - + - + - + - + - + @@ -3916,7 +3909,7 @@ - + @@ -3933,12 +3926,12 @@ - + - + - + @@ -3950,7 +3943,7 @@ - + @@ -3958,21 +3951,21 @@ - + - + - + - + - + - + @@ -3981,15 +3974,15 @@ - + - + - + @@ -4000,7 +3993,7 @@ - + @@ -4009,325 +4002,325 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4335,21 +4328,21 @@ - - - + + + - + - - - + + + - + - + @@ -4361,7 +4354,7 @@ - + @@ -4412,10 +4405,10 @@ - + - + @@ -4427,10 +4420,10 @@ - + - + @@ -4442,16 +4435,16 @@ - + - + - + @@ -4460,9 +4453,9 @@ - + - + @@ -4483,7 +4476,7 @@ - + @@ -4494,9 +4487,9 @@ - + - + @@ -4517,7 +4510,7 @@ - + @@ -4534,7 +4527,7 @@ - + @@ -4545,9 +4538,9 @@ - + - + @@ -4556,13 +4549,13 @@ - - + + - + @@ -4571,55 +4564,55 @@ - - + + - + - - + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -4633,7 +4626,7 @@ - + @@ -4642,27 +4635,27 @@ - + - - - + + + - + - - - - + + + + @@ -4673,20 +4666,20 @@ - + - + - + - - - + + + @@ -4694,11 +4687,11 @@ - - - + + + - + @@ -4713,7 +4706,7 @@ - + @@ -4725,22 +4718,22 @@ - - - - - - + + + + + + - + - - - + + + @@ -4757,9 +4750,9 @@ - - - + + + @@ -4773,9 +4766,9 @@ - - - + + + @@ -4783,9 +4776,9 @@ - - - + + + @@ -4800,7 +4793,7 @@ - + @@ -4813,30 +4806,30 @@ - - + + - + - + - + - + - + - + - + @@ -4844,33 +4837,33 @@ - - - - + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -4884,16 +4877,16 @@ - - + + - + - + @@ -4901,16 +4894,16 @@ - - + + - + - + @@ -4922,16 +4915,16 @@ - + - + - + @@ -4939,7 +4932,7 @@ - + @@ -4954,9 +4947,9 @@ - + - + @@ -4965,10 +4958,10 @@ - + - + @@ -4976,49 +4969,49 @@ - + - - + + - + - + - + - + - + - + - + - + - - - + + + - + @@ -5029,166 +5022,166 @@ - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -5203,399 +5196,399 @@ - + - + - - - + + + + + + + + + - + + + + + - - + - + + + - + - - - - + + - + - - + + + - + + - - - + + - - + + + + - - + + + + - - - - + + + - - - - + + - - - + + - - + + - - + + - - + + - + - + - + - + - - + + + + - - + + + + - + - - - + - - - + + - - + + - - - + + - - + + + - + + + - - + + - - - - + + - - - + + + - - + + + + - - - + + + - - - - + + - - - + + + - - + + - - - - - - - - - - - - + - - + + - - + + - + - - + + - - + + - + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - + - + - - - + + + - + - + - + - + - + - + - + - - + + - + - - + + - - + + - - + + - + - - + + - + - - + + - + - + - - + + diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi index 00921cd53016..ba376c0e998f 100644 --- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi +++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi @@ -163,7 +163,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi index ba918b7e3ec8..2552b51a4c72 100644 --- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi +++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi @@ -264,7 +264,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi index c6f407197519..44e2e608260b 100644 --- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi +++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi @@ -300,7 +300,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi index 4cd83b4fa992..36e7483fdf29 100644 --- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi +++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi @@ -223,7 +223,7 @@ - + diff --git a/tests/data/test-read-dwarf/test0.abi b/tests/data/test-read-dwarf/test0.abi index 1931ad0c527b..de6fb16e70bf 100644 --- a/tests/data/test-read-dwarf/test0.abi +++ b/tests/data/test-read-dwarf/test0.abi @@ -27,7 +27,7 @@ - + diff --git a/tests/data/test-read-dwarf/test0.hash.abi b/tests/data/test-read-dwarf/test0.hash.abi index 3d34a9de35ab..3ea90f65db6a 100644 --- a/tests/data/test-read-dwarf/test0.hash.abi +++ b/tests/data/test-read-dwarf/test0.hash.abi @@ -27,7 +27,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi index cb4d90710707..d47daea47f5f 100644 --- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi +++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi @@ -3844,7 +3844,7 @@ - + diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi index 32934d89f024..4d3cc7ad78c2 100644 --- a/tests/data/test-read-dwarf/test11-pr18828.so.abi +++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi @@ -701,7 +701,7 @@ - + diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi index 5b6d24b8415c..3b4aa7e24f00 100644 --- a/tests/data/test-read-dwarf/test12-pr18844.so.abi +++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi @@ -1788,7 +1788,7 @@ - + diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi index 70fddaed7ddc..d7f1ebeb0f11 100644 --- a/tests/data/test-read-dwarf/test13-pr18894.so.abi +++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi @@ -364,7 +364,7 @@ - + diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi index da1dd1038be0..2fe05d7e6e74 100644 --- a/tests/data/test-read-dwarf/test14-pr18893.so.abi +++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi @@ -9290,7 +9290,7 @@ - + diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi index bb0c2ea8dbdc..6885e253e2b4 100644 --- a/tests/data/test-read-dwarf/test15-pr18892.so.abi +++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi @@ -5021,7 +5021,7 @@ - + diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi index 377d322475f9..1f8ff2c11acc 100644 --- a/tests/data/test-read-dwarf/test16-pr18904.so.abi +++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi @@ -34737,7 +34737,7 @@ - + diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi index bbf86a915a2d..21013f41852a 100644 --- a/tests/data/test-read-dwarf/test17-pr19027.so.abi +++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi @@ -276,7 +276,7 @@ - + diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi index 8e0fed6b8bda..221d09afca61 100644 --- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi +++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi @@ -490,7 +490,7 @@ - + diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi index 825ca4106928..5b57263abdc9 100644 --- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi +++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi @@ -20105,7 +20105,7 @@ - + diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi index 76f9f1836d14..9329918f9670 100644 --- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi +++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi @@ -426,7 +426,7 @@ - + diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi index 36e462fdbc3d..8f2f6e3c6374 100644 --- a/tests/data/test-read-dwarf/test21-pr19092.so.abi +++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi @@ -506,7 +506,7 @@ - + diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi index 0c3611ebbf7b..752288d7ce10 100644 --- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi +++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi @@ -9288,7 +9288,7 @@ - + diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi index 340bdd5ecd99..520f9b5a07f6 100644 --- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi +++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi @@ -1967,7 +1967,7 @@ - +