From patchwork Wed Apr 5 16:05:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 67399 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 D2DCA3858D20 for ; Wed, 5 Apr 2023 16:07:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2DCA3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680710863; bh=rq0+m96N7h5T70h4/407dtMjp05hxwCZqjwZ1+qGmFA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=VMv98Gj01t3545S28fCFsj3JFvBDh9CPFBvMwTWLaU07m0r7urvN2Yqiz3RlXMKzP PKtpThY7fN1iD9RCnVWM1rauCPzhpGeijCnsJ1e6hdaTorHo+z/g2byXsSyE5k/wmM JrGdIc4gUm/+lryHMcLHWWEBxjMr9ZCsi03w1jFY= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C54F93858D20 for ; Wed, 5 Apr 2023 16:06:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C54F93858D20 Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-UW4SpsrxNzmQPTabWdW7CQ-1; Wed, 05 Apr 2023 12:05:37 -0400 X-MC-Unique: UW4SpsrxNzmQPTabWdW7CQ-1 Received: by mail-yb1-f199.google.com with SMTP id c67-20020a254e46000000b00b88f1fd158fso7803402ybb.17 for ; Wed, 05 Apr 2023 09:05:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680710735; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rq0+m96N7h5T70h4/407dtMjp05hxwCZqjwZ1+qGmFA=; b=okj9Ibvj3YUYBJ+5aDogf1TATFfUwJzjAyQyhb2ziq1wswokMNmGySYsWK6jBrncMx 4DzKMukymEuRE7EkGvsUv+5nQuNd6Wn2o2EgbSqCyLbsAQdjTWaEKWuSLdvZHeZzTfPb HvLMWlIeumbUpgOXfa2WNGa6ojJjwfF0uzIk1Jm46LRvM9evwAwOgcbRjJ4uhi6E3wz2 90F8z8K/PoZpobKUFx+l8DsE4NEUGkITra5vdAjCSDAi1X7ego+L5csTN/5GnBpfxq/L OxHMVGY6v/XMMdd7PWDLRU++NcXpgRI6KBdy5bsFe9oNCNvYOXRVYf7PAQNc3Q4GLLr/ v/Sw== X-Gm-Message-State: AAQBX9dVpi0wRgmHd9Hf2QlPpgrZLjNCMSxeUdOaQZsQa18zDDtfUQke FWfcAJkUs8J76o0FmTTa+3plrrwm0K1o+vSWWugQWBWnwLb8e6dFfH68Nr8rfO+zzqgUZu/B7yH wqxZt/VIdNHoCZ75UZ+lI5ATiGgMJ1+8iN/gz2rVLmEiDgCEUZOWW1ROtOZ0gBwv7euTO7IlhyH wj X-Received: by 2002:a05:7500:f13:b0:fe:6dcb:e6f7 with SMTP id kl19-20020a0575000f1300b000fe6dcbe6f7mr414423gab.36.1680710733319; Wed, 05 Apr 2023 09:05:33 -0700 (PDT) X-Google-Smtp-Source: AKy350ZAxiM6PCTKZkPq/heMkBQnw1ynCBruia7iO9OlKX1hSuyF3Wbes7sZJgTnoov1xV8QnsxFsQ== X-Received: by 2002:a05:7500:f13:b0:fe:6dcb:e6f7 with SMTP id kl19-20020a0575000f1300b000fe6dcbe6f7mr414201gab.36.1680710729719; Wed, 05 Apr 2023 09:05:29 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id f8-20020a05620a280800b0074269db4699sm4522269qkp.46.2023.04.05.09.05.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 09:05:28 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 09058581C79; Wed, 5 Apr 2023 18:05:25 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] dwarf-reader: Support Ada subranges having upper_bound < lower_bound Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Wed, 05 Apr 2023 18:05:25 +0200 Message-ID: <87pm8il3ga.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, If the subrange's upper_bound is lower than its lower_bound, that means the subrange has a length of zero. This is Ada lingo. You can learn more about this at https://en.wikibooks.org/wiki/Ada_Programming/Types/array#Array_Attributes, for instance. This patch teaches the DWARF reader about this. * src/abg-dwarf-reader.cc (build_subrange_type): Be aware that the upper_bound can be lower than lower_bound.. This most likely means the length of the subrange is zero. * src/abg-ir.cc (array_type_def::subrange_type::get_length): If lower_bound > upper_bound, then length is zero. This is Ada lingo. * src/abg-writer.cc (write_array_subrange_type): Always emit lower_bound and upper_bound. Acknowledge that if lower_bound > upper_bound, it means length is zero. * tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Adjust. * tests/data/test-annotate/libtest24-drop-fns.so.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-annotate/test7.so.abi: Likewise. * tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi: Likewise. * tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt: Likewise. * tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi: Likewise. * tests/data/test-read-btf/test0.o.abi: Likewise. * tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi: Likewise. * tests/data/test-read-ctf/test-array-mdimension.abi: Likewise. * tests/data/test-read-ctf/test-array-of-pointers.abi: Likewise. * tests/data/test-read-ctf/test-array-size.abi: Likewise. * tests/data/test-read-ctf/test-const-array.abi: Likewise. * tests/data/test-read-ctf/test-dynamic-array.o.abi: Likewise. * tests/data/test-read-ctf/test0.abi: Likewise. * tests/data/test-read-ctf/test0.hash.abi: Likewise. * tests/data/test-read-ctf/test9.o.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/libtest24-drop-fns-2.so.abi: Likewise. * tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Likewise. * tests/data/test-read-dwarf/test-libaaudio.so.abi: Likewise. * tests/data/test-read-dwarf/test-libandroid.so.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/test7.so.abi: Likewise. * tests/data/test-read-dwarf/test7.so.hash.abi: Likewise. * tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise. * tests/data/test-read-write/test25.xml: Likewise. Signed-off-by: Dodji Seketeli --- src/abg-dwarf-reader.cc | 29 +- src/abg-ir.cc | 8 +- src/abg-writer.cc | 16 +- .../test-annotate/libtest24-drop-fns-2.so.abi | 4 +- .../test-annotate/libtest24-drop-fns.so.abi | 4 +- .../data/test-annotate/test13-pr18894.so.abi | 6 +- .../data/test-annotate/test14-pr18893.so.abi | 82 +- .../data/test-annotate/test15-pr18892.so.abi | 106 +- .../data/test-annotate/test17-pr19027.so.abi | 146 +- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 22 +- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 72 +- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 12 +- .../data/test-annotate/test21-pr19092.so.abi | 54 +- tests/data/test-annotate/test7.so.abi | 16 +- .../PR25409-librte_bus_dpaa.so.20.0.abi | 7195 +++--- ...-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt | 315 - .../test0-pr19026-libvtkIOSQL-6.1.so.1.abi | 18400 ++++++++-------- tests/data/test-read-btf/test0.o.abi | 4 +- .../test-ambiguous-struct-A.o.hash.abi | 2 +- .../test-read-ctf/test-array-mdimension.abi | 8 +- .../test-read-ctf/test-array-of-pointers.abi | 2 +- tests/data/test-read-ctf/test-array-size.abi | 6 +- tests/data/test-read-ctf/test-const-array.abi | 2 +- .../test-read-ctf/test-dynamic-array.o.abi | 2 +- tests/data/test-read-ctf/test0.abi | 2 +- tests/data/test-read-ctf/test0.hash.abi | 2 +- tests/data/test-read-ctf/test9.o.abi | 14 +- .../PR22015-libboost_iostreams.so.abi | 2 +- .../test-read-dwarf/PR22122-libftdc.so.abi | 54 +- .../data/test-read-dwarf/PR25007-sdhci.ko.abi | 2278 +- .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi | 20 +- .../libtest24-drop-fns-2.so.abi | 4 +- .../test-read-dwarf/libtest24-drop-fns.so.abi | 4 +- .../test-read-dwarf/test-libaaudio.so.abi | 2 +- .../test-read-dwarf/test-libandroid.so.abi | 68 +- .../test-read-dwarf/test10-pr18818-gcc.so.abi | 14 +- .../test-read-dwarf/test11-pr18828.so.abi | 36 +- .../test-read-dwarf/test12-pr18844.so.abi | 46 +- .../test-read-dwarf/test13-pr18894.so.abi | 6 +- .../test-read-dwarf/test14-pr18893.so.abi | 82 +- .../test-read-dwarf/test15-pr18892.so.abi | 106 +- .../test-read-dwarf/test16-pr18904.so.abi | 54 +- .../test-read-dwarf/test17-pr19027.so.abi | 146 +- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 22 +- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 72 +- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 12 +- .../test-read-dwarf/test21-pr19092.so.abi | 54 +- .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 86 +- tests/data/test-read-dwarf/test7.so.abi | 16 +- tests/data/test-read-dwarf/test7.so.hash.abi | 16 +- .../test9-pr18818-clang.so.abi | 6 +- tests/data/test-read-write/test25.xml | 14 +- 52 files changed, 15135 insertions(+), 14616 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 5ca1cee7..4b43cf54 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -14115,6 +14115,7 @@ build_subrange_type(reader& rdr, array_type_def::subrange_type::bound_value upper_bound; uint64_t count = 0; bool is_infinite = false; + bool count_present = false; // The DWARF 4 specifications says, in [5.11 Subrange // Type Entries]: @@ -14141,15 +14142,17 @@ build_subrange_type(reader& rdr, // // So, as DW_AT_upper_bound is not present in this // case, let's see if there is a DW_AT_count. - die_unsigned_constant_attribute(die, DW_AT_count, count); - - // We can deduce the upper_bound from the - // lower_bound and the number of elements of the - // array: - if (int64_t u = lower_bound.get_signed_value() + count) - upper_bound = u - 1; + if (die_unsigned_constant_attribute(die, DW_AT_count, count)) + { + count_present = true; + // We can deduce the upper_bound from the + // lower_bound and the number of elements of the + // array: + int64_t u = lower_bound.get_signed_value() + count; + upper_bound = u - 1; + } - if (upper_bound.get_unsigned_value() == 0 && count == 0) + if (!count_present) // No upper_bound nor count was present on the DIE, this means // the array is considered to have an infinite (or rather not // known) size. @@ -14157,12 +14160,9 @@ build_subrange_type(reader& rdr, } if (UINT64_MAX == upper_bound.get_unsigned_value()) - { - // If the upper_bound size is the max of the integer value, then - // it most certainly means infinite size. - is_infinite = true; - upper_bound.set_unsigned(0); - } + // If the upper_bound size is the max of the integer value + // then it most certainly means unknown size. + is_infinite = true; result.reset (new array_type_def::subrange_type(rdr.env(), @@ -14175,6 +14175,7 @@ build_subrange_type(reader& rdr, if (underlying_type) result->set_underlying_type(underlying_type); + // Let's ensure the resulting subrange looks metabolically healhty. ABG_ASSERT(result->is_infinite() || (result->get_length() == (uint64_t) (result->get_upper_bound() diff --git a/src/abg-ir.cc b/src/abg-ir.cc index ce553653..64dfee79 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -17396,8 +17396,12 @@ array_type_def::subrange_type::get_length() const if (is_infinite()) return 0; - ABG_ASSERT(get_upper_bound() >= get_lower_bound()); - return get_upper_bound() - get_lower_bound() + 1; + // A subrange can have an upper bound that is lower than its lower + // bound. This is possible in Ada for instance. In that case, the + // length of the subrange is considered to be zero. + if (get_upper_bound() >= get_lower_bound()) + return get_upper_bound() - get_lower_bound() + 1; + return 0; } /// Test if the length of the subrange type is infinite. diff --git a/src/abg-writer.cc b/src/abg-writer.cc index bd3f8db7..dbe43e22 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -2906,15 +2906,13 @@ write_array_subrange_type(const array_type_def::subrange_sptr& decl, o << "'"; - if (decl->get_lower_bound()) - { - ABG_ASSERT(decl->is_infinite() - || (decl->get_length() == - (uint64_t) (decl->get_upper_bound() - - decl->get_lower_bound() + 1))); - o << " lower-bound='" << decl->get_lower_bound() << "' upper-bound='" - << decl->get_upper_bound() << "'"; - } + ABG_ASSERT(decl->is_infinite() + || decl->get_length() == 0 + || (decl->get_length() == + (uint64_t) (decl->get_upper_bound() + - decl->get_lower_bound() + 1))); + o << " lower-bound='" << decl->get_lower_bound() << "' upper-bound='" + << decl->get_upper_bound() << "'"; type_base_sptr underlying_type = decl->get_underlying_type(); if (underlying_type) diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi index 5cd5a8e6..538e6c9d 100644 --- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi +++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi @@ -25,7 +25,7 @@ - + @@ -257,7 +257,7 @@ - + diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi index 5cd5a8e6..538e6c9d 100644 --- a/tests/data/test-annotate/libtest24-drop-fns.so.abi +++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi @@ -25,7 +25,7 @@ - + @@ -257,7 +257,7 @@ - + diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi index 2d8ae965..cf0f97ea 100644 --- a/tests/data/test-annotate/test13-pr18894.so.abi +++ b/tests/data/test-annotate/test13-pr18894.so.abi @@ -987,7 +987,7 @@ - + @@ -3344,12 +3344,12 @@ - + - + diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi index 10613f41..d34adb81 100644 --- a/tests/data/test-annotate/test14-pr18893.so.abi +++ b/tests/data/test-annotate/test14-pr18893.so.abi @@ -130,12 +130,12 @@ - + - + @@ -2084,7 +2084,7 @@ - + @@ -2744,34 +2744,34 @@ - + - + - + - + - + - + - + @@ -2848,7 +2848,7 @@ - + @@ -4321,7 +4321,7 @@ - + @@ -6790,21 +6790,21 @@ - + - + - + - + - + @@ -10250,9 +10250,9 @@ - + - + @@ -12867,24 +12867,24 @@ - + - + - + - + - + @@ -13015,12 +13015,12 @@ - + - + @@ -14056,7 +14056,7 @@ - + @@ -15616,7 +15616,7 @@ - + @@ -15884,7 +15884,7 @@ - + @@ -17772,19 +17772,19 @@ - + - + - + - + @@ -18103,7 +18103,7 @@ - + @@ -20394,7 +20394,7 @@ - + @@ -20494,7 +20494,7 @@ - + @@ -22212,17 +22212,17 @@ - + - + - + @@ -22238,7 +22238,7 @@ - + @@ -22720,7 +22720,7 @@ - + diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi index f14d6c3d..0c604c24 100644 --- a/tests/data/test-annotate/test15-pr18892.so.abi +++ b/tests/data/test-annotate/test15-pr18892.so.abi @@ -3668,22 +3668,22 @@ - + - + - + - + @@ -4598,12 +4598,12 @@ - + - + @@ -6072,7 +6072,7 @@ - + @@ -6756,7 +6756,7 @@ - + @@ -8161,7 +8161,7 @@ - + @@ -9030,7 +9030,7 @@ - + @@ -9861,7 +9861,7 @@ - + @@ -10650,27 +10650,27 @@ - + - + - + - + - + @@ -10822,7 +10822,7 @@ - + @@ -11713,37 +11713,37 @@ - + - + - + - + - + - + - + @@ -27367,7 +27367,7 @@ - + @@ -28079,42 +28079,42 @@ - + - + - + - + - + - + - + - + @@ -28123,12 +28123,12 @@ - + - + @@ -28215,42 +28215,42 @@ - + - + - + - + - + - + - + - + @@ -35521,7 +35521,7 @@ - + @@ -35584,22 +35584,22 @@ - + - + - + - + @@ -39059,7 +39059,7 @@ - + @@ -40849,22 +40849,22 @@ - + - + - + - + diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi index 8a88ef0e..ba558ba5 100644 --- a/tests/data/test-annotate/test17-pr19027.so.abi +++ b/tests/data/test-annotate/test17-pr19027.so.abi @@ -526,7 +526,7 @@ - + @@ -539,7 +539,7 @@ - + @@ -1211,7 +1211,7 @@ - + @@ -1483,19 +1483,19 @@ - + - + - + - + @@ -2430,17 +2430,17 @@ - + - + - + @@ -2474,7 +2474,7 @@ - + @@ -3687,12 +3687,12 @@ - + - + @@ -3870,12 +3870,12 @@ - + - + @@ -4865,7 +4865,7 @@ - + @@ -10659,52 +10659,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -10819,7 +10819,7 @@ - + @@ -12817,167 +12817,167 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -12991,32 +12991,32 @@ - + - + - + - + - + - + @@ -14162,7 +14162,7 @@ - + @@ -29821,17 +29821,17 @@ - + - + - + @@ -30607,7 +30607,7 @@ - + @@ -30788,7 +30788,7 @@ - + @@ -31200,7 +31200,7 @@ - + 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 d279ce6e..7e595474 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 @@ -874,17 +874,17 @@ - + - + - + @@ -6824,7 +6824,7 @@ - + @@ -12013,7 +12013,7 @@ - + @@ -13855,24 +13855,24 @@ - + - + - + - + @@ -25260,7 +25260,7 @@ - + @@ -25269,7 +25269,7 @@ - + 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 970bd614..a0b9f255 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 @@ -2317,7 +2317,7 @@ - + @@ -2826,7 +2826,7 @@ - + @@ -3103,12 +3103,12 @@ - + - + @@ -4157,12 +4157,12 @@ - + - + @@ -7955,7 +7955,7 @@ - + @@ -8062,7 +8062,7 @@ - + @@ -17583,7 +17583,7 @@ - + @@ -19397,7 +19397,7 @@ - + @@ -19531,9 +19531,9 @@ - + - + @@ -21511,17 +21511,17 @@ - + - + - + @@ -21965,7 +21965,7 @@ - + @@ -24304,12 +24304,12 @@ - + - + @@ -24461,7 +24461,7 @@ - + @@ -24617,7 +24617,7 @@ - + @@ -24626,22 +24626,22 @@ - + - + - + - + @@ -26643,7 +26643,7 @@ - + @@ -26652,12 +26652,12 @@ - + - + @@ -26670,7 +26670,7 @@ - + @@ -27097,22 +27097,22 @@ - + - + - + - + @@ -27175,7 +27175,7 @@ - + @@ -27184,7 +27184,7 @@ - + @@ -27193,12 +27193,12 @@ - + - + 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 13a511f1..52cf75d0 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 @@ -760,17 +760,17 @@ - + - + - + @@ -3658,7 +3658,7 @@ - + @@ -21569,7 +21569,7 @@ - + @@ -30208,7 +30208,7 @@ - + diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi index ddf2d32f..2cf71186 100644 --- a/tests/data/test-annotate/test21-pr19092.so.abi +++ b/tests/data/test-annotate/test21-pr19092.so.abi @@ -935,27 +935,27 @@ - + - + - + - + - + @@ -1003,14 +1003,14 @@ - + - + @@ -1700,7 +1700,7 @@ - + @@ -4746,32 +4746,32 @@ - + - + - + - + - + - + @@ -5769,7 +5769,7 @@ - + @@ -6381,12 +6381,12 @@ - + - + @@ -6788,7 +6788,7 @@ - + @@ -9520,22 +9520,22 @@ - + - + - + - + @@ -10118,12 +10118,12 @@ - + - + @@ -10502,7 +10502,7 @@ - + @@ -11180,12 +11180,12 @@ - + - + diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi index 85062a82..1ceb92af 100644 --- a/tests/data/test-annotate/test7.so.abi +++ b/tests/data/test-annotate/test7.so.abi @@ -9,43 +9,43 @@ - + - + - + - + - + - + - + - + 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 51fd6e9e..9537612b 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 @@ - + @@ -116,42 +116,33 @@ - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + - + - + @@ -163,31 +154,31 @@ - + - + - + - + - + - + - + - + - + @@ -198,204 +189,213 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + - + - - + + - + - - + + - - - + + + - + - + - + - + - + - - + + - - - - - - - + + - + - + - + @@ -412,134 +412,101 @@ - + - + - - - - - - - - - - - - - + - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - + + - + - - - - - - - + - + - + - + - + - + - - + + + + - - + + - + - + - - + + + + - - + + - - + + + + - + - + - - + + + + + - + - + - + - + - + - + - + - + @@ -548,1774 +515,1755 @@ - + - + - + - + - - - - + + - - - - + + - - + + - - + + - - + + + + + - + - - + + + + - - + + + + - - + + + + + - + - + - - + + + + + - + - + - - - - + + - - + + - - - - + + - - + + - - + + + + + - + - + - - + + + + + + + + - + - + + + + - + - + - - - - - - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + + + + - + + + + + + + + + + + + + + + + + + + + + - + - + + + - + - - - - + + - - + + - - + + - + - + - - - - - - + + + - - + + - - - - + + + + - - + + - - + + - + + + + - - - - - - + + + + + + - - - + + + - + - + - + - - + + - + - - + + - + - - + + - - + + - - - + - + - - + + - - + + - - + + - - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + + + - - + + - + - + - + - - + + + + - - + + - - + + + + - - + + + + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + - + - + - + - + - + - - - - + + - - + + - + - + - - + + - - + + - - + + - - + + + + + + + + + + + - + - + + + + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + - + - + - - + + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - - + - - + + - - + + - - + + - - + + + + - - + + - + - + - - + + + + + - - - + + + - - + + - - + + - - + + - - - - + + - - + + - - + + - + - + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - + - - - - - - - + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - + - - - - + - - - + + + - - + + - - + + - - + + - + - - + + - - + + - - + + + + - - + + - - + + - - + + + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + + + - - + + + + - + - + - - + + - - + + - - + + - - + + + + + - + - - - - + - - + + - + - + - - + + - - + + - + - + - + - + - - + + - + - - + + - + + + + - + - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - - + + - - - - + + - - + + - - - - - - - + + - - - - + + - - + + - - + + - - - - + + - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - - - - + + - - - - + + - - + + - - + + - + - - - - - - - - + + - - + + - + - + - - - - + + - - + + - - - - + + - - + + - - + + + + + - + - - - - + - - - - - - - - - - - + + - - + + + + - - - - + - - + + - - + + - - + + - - - - - - - - - + - + - - - - - - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + + + + - + - - - - - - - + - + - - - - + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - - - + + - + - + - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - + - + - + - - - - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - - - + + - + - + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - + - + - - - - - - - + + - - + + - - + + - + - - + + - - + + - - - - + + - - + + - - - - + + + + + - + - + - - + + - + - + - - + + - - + + - - - - - - - - - + - + - - + + - + - + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + - + - - + + - - + + + + - - + + - - - - - - + + + - - + + - - + + - + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + + + - - + + - - + + - + - - - - + - - + + - - + + - + - + - - + + - + - + + + + - + - + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + - + + + + + + + - - - + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -2336,1757 +2284,1970 @@ - - - + + + - - + + - - + + - - + + + + + + + + + + + - + - - - - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - - + - + + + + - + - + - + + + + - + - + - + - - - + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - + - + - - - - - - + + + - - - + - + - + - + + + - + - + - + - - - - - - + + + - - - + - + - - - - - - + + + - - - - + + - - + + + + - - + + - - + + - + - + - + - + - + - - - - - - + + + - - + + - - + + + + - - + + - - + + + + - - - - + + - - + + + + - - + + - - - - + + - - + + - - + + + + - - + + - - - - - - - - - - - - - - - + + + + - - - + - + - - - - - - - - - - - + + + - - + + - - - - + + + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - - - + + - - - + - + - - - - - - - - - - - - - - - + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + + + - - + + - - + + + + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - - - - + + + + - + - - - - + + + + - - + + - - - + + + - + - - - + + + - + - + - - - + + + - - + + - - + + - + - - - + + + - + - + - - + + - + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + + + + + + + + + - - - + + + + - + - - - - - + + + + - - - - - - - - + + + + - - - - - + + + + + - - - - - - - + + + + - - - - - - + + + + - - + + - + - - + + - + - + - - + + - + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + - - + + - - + + - - + + - + - + - - + + + + + - + - + - - + + + + + - - - - - - + - + - - - - - + + - - + + - - + + - - - - + + - - + + - - + + - - - - + + - - + + - + - + - + - + - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - - - - + + - - - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - - - - - - - - - - - - - - - + - + - - + + - - + + + + + - + - + - - - - - - + - + - + - + - + - + - + - + - - - - - - + - - + + - - - - - - - - - - + - - + + - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + - + - - + + - - + + - - + + + + + - + - + - - + + - - + + - - + + + + + + + + + + + + + + - + - - - - + - + - - + + + + - + - - + + - - + + - - + + - - + + - - - - - - - - - + - + - + - - + + + + - + - - + + - + - + - - - - + - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + + - - + + + + + + + - + - + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - - - - - - - - - + - + - + - + - + - - + + - + - - - - + - - - - + - - - - - - - - - + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + - + - + - - - - + - + - + - - + + - - - - + + - - + + - - + + - - + + - - - - + + - - + + - - - - - - - - - - - - - - - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + - + - + - + - - - - + - - + + - - + + - + + + + + + + - + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - + - + - - + + - + - + - + - + - - + + + + - - + + + + + + + + - - - - - - - - + - + - + @@ -4095,7 +4256,7 @@ - + @@ -4104,1502 +4265,1332 @@ - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - + + - + - + - + - + - - - - - - - + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - + - + - - + + - - + + - - + + - - - - - - + + + - - + + - - + + - + - - - - + - + - + + + + - + + + + - + - + - - - - + - - - - - - - - - - + - - - - - - - + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + + + + - + - - + + - - + + - - - - + + - - + + - + - + - + - - - - - - - + + - - - - + + - + - + - - - - - - - + + - - + + - + - + - - - - - + + - - + + - - - - - - - + - + - + - - - - - - - - - - - - + - + - + - - + + - - - - + + - + - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + + + - - + + - - + + + + - + - + + + + - + - - + + - - - - + + - - + + - - + + - + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + + + - - + + - + - - - - + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + + + - - + + - - + + - - + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - + - - - + + + - - - + + + - - + + - - - - - + + + + + - - + + - - - + + + - - + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - + + - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - + + + + + + + - - + + + + + + + - - + + - + - - - + + + + - - + + - - - + + - - - + - - + + - - + + + - - + + - - + + + - - - + + + - - - + + - - - + + + - - - + + + - - - + + + + + - - + + - - - - - - - - - - - - + - + - + - + - + - + - + - - - + + + - - - - - - + - - + + + + + + - - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - - - - - - - + + + - - - - - + + + + + diff --git a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt index 3f81ec79..e69de29b 100644 --- a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt +++ b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1-report-0.txt @@ -1,315 +0,0 @@ -Functions changes summary: 0 Removed, 22 Changed (195 filtered out), 0 Added functions -Variables changes summary: 0 Removed, 1 Changed, 0 Added variable - -22 functions with some indirect sub-type change: - - [C] 'function vtkSQLDatabaseSchemaInternals::Column* std::__uninitialized_copy_a(vtkSQLDatabaseSchemaInternals::Column*, vtkSQLDatabaseSchemaInternals::Column*, vtkSQLDatabaseSchemaInternals::Column*, std::allocator&)' at stl_uninitialized.h:254:1 has some indirect sub-type changes: - return type changed: - in pointed to type 'struct vtkSQLDatabaseSchemaInternals::Column' at vtkSQLDatabaseSchema.cxx:46:1: - type size hasn't changed - 1 data member changes (1 filtered): - type of 'vtkStdString Name' changed: - type size hasn't changed - 1 base class change: - 'struct std::basic_string, std::allocator >' at stringfwd.h:52:1 changed: - type size changed from 64 to 0 (in bits) - 1 data member change: - type of 'std::basic_string, std::allocator >::_Alloc_hider _M_dataplus' changed: - type size hasn't changed - 1 base class change: - 'struct std::allocator' at stringfwd.h:45:1 changed: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - parameter 4 of type 'std::allocator&' has sub-type changes: - in referenced type 'class std::allocator' at allocator.h:87:1: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - - [C] 'function vtkSQLDatabaseSchemaInternals::Index* std::__uninitialized_copy_a(vtkSQLDatabaseSchemaInternals::Index*, vtkSQLDatabaseSchemaInternals::Index*, vtkSQLDatabaseSchemaInternals::Index*, std::allocator&)' at stl_uninitialized.h:254:1 has some indirect sub-type changes: - return type changed: - in pointed to type 'struct vtkSQLDatabaseSchemaInternals::Index' at vtkSQLDatabaseSchema.cxx:54:1: - type size hasn't changed - 1 data member changes (1 filtered): - type of 'std::vector > ColumnNames' changed: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator' at allocator.h:87:1 changed: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - no data member changes (3 filtered); - parameter 4 of type 'std::allocator&' has sub-type changes: - in referenced type 'class std::allocator' at allocator.h:87:1: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - - [C] 'function vtkSQLDatabaseSchemaInternals::Option* std::__uninitialized_copy_a(vtkSQLDatabaseSchemaInternals::Option*, vtkSQLDatabaseSchemaInternals::Option*, vtkSQLDatabaseSchemaInternals::Option*, std::allocator&)' at stl_uninitialized.h:254:1 has some indirect sub-type changes: - parameter 4 of type 'std::allocator&' has sub-type changes: - in referenced type 'class std::allocator' at allocator.h:87:1: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - - [C] 'function vtkSQLDatabaseSchemaInternals::Trigger* std::__uninitialized_copy_a(vtkSQLDatabaseSchemaInternals::Trigger*, vtkSQLDatabaseSchemaInternals::Trigger*, vtkSQLDatabaseSchemaInternals::Trigger*, std::allocator&)' at stl_uninitialized.h:254:1 has some indirect sub-type changes: - parameter 4 of type 'std::allocator&' has sub-type changes: - in referenced type 'class std::allocator' at allocator.h:87:1: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - - [C] 'function vtkSQLDatabaseSchemaInternals::Statement* std::__uninitialized_move_a >(vtkSQLDatabaseSchemaInternals::Statement*, vtkSQLDatabaseSchemaInternals::Statement*, vtkSQLDatabaseSchemaInternals::Statement*, std::allocator&)' at stl_uninitialized.h:261:1 has some indirect sub-type changes: - parameter 4 of type 'std::allocator&' has sub-type changes: - in referenced type 'class std::allocator' at allocator.h:87:1: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - - [C] 'function vtkSQLDatabaseSchemaInternals::Table* std::__uninitialized_move_a >(vtkSQLDatabaseSchemaInternals::Table*, vtkSQLDatabaseSchemaInternals::Table*, vtkSQLDatabaseSchemaInternals::Table*, std::allocator&)' at stl_uninitialized.h:261:1 has some indirect sub-type changes: - return type changed: - in pointed to type 'struct vtkSQLDatabaseSchemaInternals::Table' at vtkSQLDatabaseSchema.cxx:75:1: - type size hasn't changed - 4 data member changes (1 filtered): - type of 'std::vector > Columns' changed: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator' at allocator.h:87:1 changed: - details were reported earlier - no data member changes (3 filtered); - type of 'std::vector > Indices' changed: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator' at allocator.h:87:1 changed: - details were reported earlier - no data member changes (3 filtered); - type of 'std::vector > Triggers' changed: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator' at allocator.h:87:1 changed: - details were reported earlier - no data member changes (3 filtered); - type of 'std::vector > Options' changed: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator' at allocator.h:87:1 changed: - details were reported earlier - no data member changes (3 filtered); - parameter 4 of type 'std::allocator&' has sub-type changes: - in referenced type 'class std::allocator' at allocator.h:87:1: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - - [C] 'method char* std::basic_string, std::allocator >::_S_construct(char*, const std::allocator&, std::forward_iterator_tag)' at basic_string.tcc:123:1 has some indirect sub-type changes: - parameter 4 of type 'struct std::forward_iterator_tag' has sub-type changes: - type size changed from 8 to 0 (in bits) - - [C] 'function std::basic_string, std::allocator > std::operator+, std::allocator >(const char*, const std::basic_string, std::allocator >&)' at basic_string.tcc:694:1 has some indirect sub-type changes: - - [C] 'method void std::vector, std::allocator >, std::allocator, std::allocator > > >::_M_insert_aux(__gnu_cxx::__normal_iterator, std::allocator >*, std::vector, std::allocator >, std::allocator, std::allocator > > > >, const std::basic_string, std::allocator >&)' at vector.tcc:295:1 has some indirect sub-type changes: - implicit parameter 0 of type 'std::vector, std::allocator >, std::allocator, std::allocator > > >*' has sub-type changes: - in pointed to type 'class std::vector, std::allocator >, std::allocator, std::allocator > > >' at stl_vector.h:171:1: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base, std::allocator >, std::allocator, std::allocator > > >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base, std::allocator >, std::allocator, std::allocator > > >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator, std::allocator > >' at allocator.h:87:1 changed: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator, std::allocator > >' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - no data member changes (3 filtered); - parameter 1 of type 'class __gnu_cxx::__normal_iterator, std::allocator >*, std::vector, std::allocator >, std::allocator, std::allocator > > > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_insert_aux(__gnu_cxx::__normal_iterator > >, vtkSQLDatabase* (const char*)* const&)' at vector.tcc:295:1 has some indirect sub-type changes: - implicit parameter 0 of type 'std::vector >*' has sub-type changes: - in pointed to type 'class std::vector >' at stl_vector.h:171:1: - type size changed from 192 to 0 (in bits) - 1 base class change: - 'struct std::_Vector_base >' at stl_vector.h:70:1 changed: - type size changed from 192 to 0 (in bits) - 1 data member change: - type of 'std::_Vector_base >::_Vector_impl _M_impl' changed: - type size hasn't changed - 1 base class change: - 'class std::allocator' at allocator.h:87:1 changed: - type size changed from 8 to 0 (in bits) - 1 base class change: - 'class __gnu_cxx::new_allocator' at new_allocator.h:52:1 changed: - type size changed from 8 to 0 (in bits) - no data member changes (3 filtered); - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long int, const vtkSQLDatabaseSchemaInternals::Column&)' at vector.tcc:372:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long int, const vtkSQLDatabaseSchemaInternals::Index&)' at vector.tcc:372:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long int, const vtkSQLDatabaseSchemaInternals::Option&)' at vector.tcc:372:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_insert_aux(__gnu_cxx::__normal_iterator > >, const vtkSQLDatabaseSchemaInternals::Statement&)' at vector.tcc:295:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_insert_aux(__gnu_cxx::__normal_iterator > >, const vtkSQLDatabaseSchemaInternals::Table&)' at vector.tcc:295:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long int, const vtkSQLDatabaseSchemaInternals::Trigger&)' at vector.tcc:372:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method void std::vector >::_M_insert_aux(__gnu_cxx::__normal_iterator > >, const vtkStdString&)' at vector.tcc:295:1 has some indirect sub-type changes: - parameter 1 of type 'class __gnu_cxx::__normal_iterator > >' has sub-type changes: - type size changed from 64 to 0 (in bits) - no data member change (1 filtered); - - [C] 'method bool vtkDatabaseToTableReader::CheckIfTableExists()' at vtkDatabaseToTableReader.cxx:78:1 has some indirect sub-type changes: - implicit parameter 0 of type 'vtkDatabaseToTableReader*' has sub-type changes: - in pointed to type 'class vtkDatabaseToTableReader' at vtkDatabaseToTableReader.h:31:1: - type size hasn't changed - no member function changes (6 filtered); - no data member changes (2 filtered); - - [C] 'method virtual bool vtkSQLiteQuery::BeginTransaction()' at vtkSQLiteQuery.cxx:415:1 has some indirect sub-type changes: - implicit parameter 0 of type 'vtkSQLiteQuery*' has sub-type changes: - in pointed to type 'class vtkSQLiteQuery' at vtkSQLiteQuery.h:53:1: - type size hasn't changed - 1 base class change: - 'class vtkSQLQuery' at vtkSQLQuery.h:66:1 changed: - type size hasn't changed - no base class change (1 filtered); - 32 member function insertions: - 'method virtual bool vtkSQLQuery::BeginTransaction()' at vtkSQLQuery.h:94:1, virtual at voffset 35/57 - 'method virtual bool vtkSQLQuery::BindParameter(int, const char*)' at vtkSQLQuery.cxx:161:1, virtual at voffset 51/57 {_ZN11vtkSQLQuery13BindParameterEiPKc} - 'method virtual bool vtkSQLQuery::BindParameter(int, const char*, size_t)' at vtkSQLQuery.cxx:167:1, virtual at voffset 52/57 {_ZN11vtkSQLQuery13BindParameterEiPKcm} - 'method virtual bool vtkSQLQuery::BindParameter(int, const vtkStdString&)' at vtkSQLQuery.cxx:174:1, virtual at voffset 53/57 {_ZN11vtkSQLQuery13BindParameterEiRK12vtkStdString} - 'method virtual bool vtkSQLQuery::BindParameter(int, double)' at vtkSQLQuery.cxx:155:1, virtual at voffset 50/57 {_ZN11vtkSQLQuery13BindParameterEid} - 'method virtual bool vtkSQLQuery::BindParameter(int, float)' at vtkSQLQuery.cxx:149:1, virtual at voffset 49/57 {_ZN11vtkSQLQuery13BindParameterEif} - 'method virtual bool vtkSQLQuery::BindParameter(int, int)' at vtkSQLQuery.cxx:119:1, virtual at voffset 45/57 {_ZN11vtkSQLQuery13BindParameterEii} - 'method virtual bool vtkSQLQuery::BindParameter(int, long int)' at vtkSQLQuery.cxx:131:1, virtual at voffset 46/57 {_ZN11vtkSQLQuery13BindParameterEil} - 'method virtual bool vtkSQLQuery::BindParameter(int, short int)' at vtkSQLQuery.cxx:107:1, virtual at voffset 44/57 {_ZN11vtkSQLQuery13BindParameterEis} - 'method virtual bool vtkSQLQuery::BindParameter(int, signed char)' at vtkSQLQuery.cxx:94:1, virtual at voffset 43/57 {_ZN11vtkSQLQuery13BindParameterEia} - 'method virtual bool vtkSQLQuery::BindParameter(int, unsigned char)' at vtkSQLQuery.cxx:88:1, virtual at voffset 39/57 {_ZN11vtkSQLQuery13BindParameterEih} - 'method virtual bool vtkSQLQuery::BindParameter(int, unsigned int)' at vtkSQLQuery.cxx:113:1, virtual at voffset 41/57 {_ZN11vtkSQLQuery13BindParameterEij} - 'method virtual bool vtkSQLQuery::BindParameter(int, unsigned long int)' at vtkSQLQuery.cxx:125:1, virtual at voffset 42/57 {_ZN11vtkSQLQuery13BindParameterEim} - 'method virtual bool vtkSQLQuery::BindParameter(int, unsigned short int)' at vtkSQLQuery.cxx:101:1, virtual at voffset 40/57 {_ZN11vtkSQLQuery13BindParameterEit} - 'method virtual bool vtkSQLQuery::BindParameter(int, void*, size_t)' at vtkSQLQuery.cxx:180:1, virtual at voffset 55/57 {_ZN11vtkSQLQuery13BindParameterEiPKvm} - 'method virtual bool vtkSQLQuery::BindParameter(int, vtkTypeInt64)' at vtkSQLQuery.cxx:143:1, virtual at voffset 48/57 {_ZN11vtkSQLQuery13BindParameterEix} - 'method virtual bool vtkSQLQuery::BindParameter(int, vtkTypeUInt64)' at vtkSQLQuery.cxx:137:1, virtual at voffset 47/57 {_ZN11vtkSQLQuery13BindParameterEiy} - 'method virtual bool vtkSQLQuery::BindParameter(int, vtkVariant)' at vtkSQLQuery.cxx:192:1, virtual at voffset 54/57 {_ZN11vtkSQLQuery13BindParameterEi10vtkVariant} - 'method virtual bool vtkSQLQuery::ClearParameterBindings()' at vtkSQLQuery.cxx:186:1, virtual at voffset 56/57 {_ZN11vtkSQLQuery22ClearParameterBindingsEv} - 'method virtual bool vtkSQLQuery::CommitTransaction()' at vtkSQLQuery.h:95:1, virtual at voffset 36/57 - 'method virtual vtkStdString vtkSQLQuery::EscapeString(vtkStdString, bool)' at vtkSQLQuery.cxx:59:1, virtual at voffset 57/57 {_ZN11vtkSQLQuery12EscapeStringE12vtkStdStringb} - 'method virtual bool vtkSQLQuery::Execute()' at vtkSQLQuery.h:88:1, virtual at voffset 20/57 - 'method virtual const char* vtkSQLQuery::GetClassNameInternal()' at vtkSQLQuery.h:68:1, virtual at voffset 0/57 - 'method virtual vtkSQLDatabase* vtkSQLQuery::GetDatabase()' at vtkSQLQuery.h:100:1, virtual at voffset 38/57 - 'method virtual const char* vtkSQLQuery::GetQuery()' at vtkSQLQuery.cxx:274:1, virtual at voffset 34/57 {_ZN11vtkSQLQuery8GetQueryEv} - 'method virtual int vtkSQLQuery::IsA(const char*)' at vtkSQLQuery.h:68:1, virtual at voffset 1/57 - 'method virtual bool vtkSQLQuery::IsActive()' at vtkSQLQuery.h:82:1, virtual at voffset 25/57 - 'method virtual vtkObjectBase* vtkSQLQuery::NewInstanceInternal()' at vtkSQLQuery.h:68:1, virtual at voffset 15/57 - 'method virtual void vtkSQLQuery::PrintSelf(std::ostream&, vtkIndent)' at vtkSQLQuery.cxx:48:1, virtual at voffset 4/57 {_ZN11vtkSQLQuery9PrintSelfERSo9vtkIndent} - 'method virtual bool vtkSQLQuery::RollbackTransaction()' at vtkSQLQuery.h:96:1, virtual at voffset 37/57 - 'method virtual bool vtkSQLQuery::SetQuery(const char*)' at vtkSQLQuery.cxx:236:1, virtual at voffset 33/57 {_ZN11vtkSQLQuery8SetQueryEPKc} - 'method virtual vtkSQLQuery::~vtkSQLQuery(int)' at vtkSQLQuery.cxx:36:1 {_ZN11vtkSQLQueryD1Ev} - 1 member function changes (31 filtered): - 'method virtual vtkStdString vtkSQLQuery::EscapeString(vtkStdString, bool)' has some sub-type changes: - parameter 1 of type 'class vtkStdString' has sub-type changes: - details were reported earlier - no data member change (1 filtered); - no member function changes (36 filtered); - - [C] 'method virtual void vtkSQLiteToTableReader::PrintSelf(std::ostream&, vtkIndent)' at vtkSQLiteToTableReader.cxx:157:1 has some indirect sub-type changes: - implicit parameter 0 of type 'vtkSQLiteToTableReader*' has sub-type changes: - in pointed to type 'class vtkSQLiteToTableReader' at vtkSQLiteToTableReader.h:30:1: - type size hasn't changed - 1 base class change: - 'class vtkDatabaseToTableReader' at vtkDatabaseToTableReader.h:31:1 changed: - details were reported earlier - no member function changes (6 filtered); - - [C] 'method virtual int vtkTableToDatabaseWriter::FillInputPortInformation(int, vtkInformation*)' at vtkTableToDatabaseWriter.cxx:104:1 has some indirect sub-type changes: - implicit parameter 0 of type 'vtkTableToDatabaseWriter*' has sub-type changes: - in pointed to type 'class vtkTableToDatabaseWriter' at vtkTableToDatabaseWriter.h:33:1: - type size hasn't changed - no member function changes (7 filtered); - no data member changes (2 filtered); - - [C] 'method virtual int vtkTableToSQLiteWriter::FillInputPortInformation(int, vtkInformation*)' at vtkTableToSQLiteWriter.cxx:148:1 has some indirect sub-type changes: - implicit parameter 0 of type 'vtkTableToSQLiteWriter*' has sub-type changes: - in pointed to type 'class vtkTableToSQLiteWriter' at vtkTableToSQLiteWriter.h:29:1: - type size hasn't changed - 1 base class change: - 'class vtkTableToDatabaseWriter' at vtkTableToDatabaseWriter.h:33:1 changed: - details were reported earlier - no member function changes (7 filtered); - -1 Changed variable: - - [C] 'static vtkSQLDatabase::vtkCallbackVector* vtkSQLDatabase::Callbacks' was changed at vtkSQLDatabase.cxx:56:1: - type of variable changed: - in pointed to type 'class vtkSQLDatabase::vtkCallbackVector' at vtkSQLDatabase.cxx:40:1: - type size hasn't changed - 1 base class change: - 'class std::vector >' at stl_vector.h:171:1 changed: - details were reported earlier - diff --git a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi index 1f15252f..6d948b87 100644 --- a/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi +++ b/tests/data/test-diff-dwarf-abixml/test0-pr19026-libvtkIOSQL-6.1.so.1.abi @@ -1,4 +1,4 @@ - + @@ -325,6757 +325,6034 @@ - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + - - - - - + + + + - - - - + + + + - - - + + - + - - - - - + + + + - - - - - + + + + + - - - + + + - + - - - - - + + + + + - - - - - + + + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + - + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - + + + - - - + + + - - + + - + - + - - - - + + + + - + - - + + - + - - + + - + - - - + + + - - - + + - - + + - - - + + + - + - + - - + + - - - + + + - - + + - + - + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - - + + + - - + + - - + + - + - + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - + + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - + - + - + - + - - + + - - - + + + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - - - - + + + + + - - + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - + + - + - - - - - + + + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - + - + - + - + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - - - - + + + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - - - - + + + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + + - - - - - - - - - + + + - + - - - - + - - + - + - - - - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - - - + + + + + - - + + - - + + - - - - + + + + - - + + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - - + + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - + - + - + - - - + + + - + - - - - + + + + - - - + + + - - - - - + + + + + - - + + - + - + - + - - + + - + - - - - + + + + - - - + + + - - - - + + + + - - + + - - + + - + - - - + + + - - - + + + - - + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + - - - + + + - - - + + - - - + + + - - + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - + - + - + - - + + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - + + + - - - - + + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - - + + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + + - - - + + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - - + + + - - - - - - - - - + + + + + + + + + + + + + - - - + + - - + + - - - + + + - - - - - + + + + + - - - + + + - - + + - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - + - + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + - - + + - - - - - - - - - + + + - - - - + + + + - - - + + + - - + + - - + + - + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + + + + + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - + + - - - + + + - - + + - - + + + + - + - - - - - - - - - - - - - - - - - + + - - + + - - - + + + - + - + - - + + - - - + + + - - + + - + - + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - - + + + - - + + - - + + - + - + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7083,8 +6360,8 @@ - - + + @@ -7095,1961 +6372,2273 @@ - + - + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - + + - + - - - - + + + + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - + + + + - - - - + - - + - + - - + + + - + + + - - - + - - + - - + + + - - - - - + + + + + - - - - - + + + + + - + + + - - - - + + - - + - - - - + + + + + - + + - - - + + - - - - - + + + + + - - - + + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - - + + + - - + + - + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - + - + - - + + - - + + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + - - + + - - + - - - + + + - - - + + + - - - - + + + + - + - - + + - + - + - - + + - - - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - - - + + + + + + - - - - - - + + + + + - - - - - - + + + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + - + - - + + - + - + - + - - + + - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - - + + - - + + - + - - + + - + - + - + - - + + - + - + - + - - + + - - - + + + - - + + - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - - + + - - + + - + - - + + - + - + - - + + - - - + + + - + - - + + - - - + + + - - - - - - + + + + + + + - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + - - - - - + + + + + + - - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - + + + + + - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + + + + + - - - - - - + + - - + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + + - + - + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - - + + + - - - - + + + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - + + - + - - + + - - - + + + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - - - + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + @@ -9059,8 +8648,8 @@ - - + + @@ -9071,4793 +8660,5216 @@ - + - + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - + + - + - - - - + + + + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - - + + + - + - - + - - + - + - - + + + - + + + - - - + - - + - - + + + - - - - - + + + + + - - - - - + + + + + - + + + - - - - + + - - + - - - - + + + + + - + + - - - + + - - - - - + + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - + + + + + - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + - - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + - - - - - + + + + + - - - - - - + + + - - - - + + + - - - - - + + + + - - - - - - + + + + + + + + + + + - - - - + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + - - - - - - + + + + + + + - - - - - - + + + + + - - - - - + + + + + + - - - - - - + + + + + - - - - - - + + + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + + + - - - - - - + + + + - - - - - - + + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + - - - - - - + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + - - - - - - + + + + + + + - - - - - - + + + + + - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + - - - - - - + + + + + - - - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + - - - + + + - - + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + - - - + + + - - + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + - + + - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - + + + - - - - - + + + + + - - - - + + + + + - - - - + + + - + + + - - - - + + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + - - - + + + + + + + + + + + + + + + - - + + - - - - - + + + + - - - - + + + + + - - - - + + + + + + + + + + + + - + + - - - - + + + + - - - + + + + - + + + + + + + + + - + + + - - + + - + - + - + - - + + - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - + + - + - + - - + + - + - + - + - - + + - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - + + - + - + - - + + - + - + - + - - + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - + + - - - - + + + + + - - - - + + + + + + + + + + - - + - - - - + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - + + - - - - - + + + + + - - - - - + + + + - - - + + + + - - - + - - - - + + + + - - - + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + + - - - - + + + + + - - - - - - + + + + - - - - + + + + + + - - - - - + + + + - - - - + + + - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + - - + + - - - - - + + + + + - - - - - - - + + + + - - - - - + + + + + + - - - + + + + + + + + + - - - + - - - - - + + + + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + + - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + - - - - - + + + + + + - - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + - - - + + + + + + + - - - - - - - - + + - - - - - + + + + + + - - - - + + + - - + + - - - + + + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - + + + + + + + - - - - - - - - - - - - - - + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - - + + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - + + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - - - + + + + - - - + + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - - - + + + + - - - + + + - + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - + + + + - + - - + + - - + + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + + - - - - - + + + + + - - - - - + + + + - - - - - + + + + - - - - + + + + - - - - - + + + + - - - - - - + + + + - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + - - - - + + + + + - - - - - + + + + + + - - - - + + + + + + + + - - - - + + + + + + - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + + + + + - - + + - + - + - - + + - - - + + + - - + + - - - + + + - - + + - + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - + - + - - + + - - + + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + - - + + - - + - - - + + + - - - + + + - - - - + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - + + + - - + + - - + + + - + - - + + - - + + - - + + @@ -13865,1627 +13877,2455 @@ - + - + - + - + - + - - + + - - - + + + - - + + - + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - - - + + + - - + + - - + + - - - - - + + + + + - - + + - - + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - + + - - - + + + - - + + - - + + + + - + - - + + - + - + - + - - + + - - - + + + - - + + - + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - + - - + + - - - + + + - - - + + + - + - - - + + + - + - - + + - - + + - + - + - + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + - - + + - - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - + + + + - + - - + + - - + + - - + + - - + + - - - + + + - - - - + + + + - + - - + + - - + + - - + + - - + + - - - + + + - - - - + + + + - + - - + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + + - - - - - - + + + + + + + - - - - + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - - + + + - - - + + + - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + - + - - + + - - - + + + - + - - + + - - - + + + - + - - + + - - - + + + - - + + - - + + - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - + + + + + + - - + + + + + + + - - + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + - + - + - - + + - - - + + + - - + + - - + + - + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - + - - - - + + + + - - - + + + - + + - - - + + + - - + + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - - + + + + + + + - - - - + + + + + + - - - - - + - - + + + + + + - - + + - - + + + + - - + + - + - - + + - - - + + + - - + + - - - + + + - - + + - + - - - + + + - - + + - - - + + + - - - - + + + + - - + + - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/data/test-read-btf/test0.o.abi b/tests/data/test-read-btf/test0.o.abi index 3323f053..123b14f5 100644 --- a/tests/data/test-read-btf/test0.o.abi +++ b/tests/data/test-read-btf/test0.o.abi @@ -21,10 +21,10 @@ - + - + diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi index 3d6a779e..463455c7 100644 --- a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi +++ b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi @@ -4,7 +4,7 @@ - + diff --git a/tests/data/test-read-ctf/test-array-mdimension.abi b/tests/data/test-read-ctf/test-array-mdimension.abi index b8aad7d5..88a36fca 100644 --- a/tests/data/test-read-ctf/test-array-mdimension.abi +++ b/tests/data/test-read-ctf/test-array-mdimension.abi @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/tests/data/test-read-ctf/test-array-of-pointers.abi b/tests/data/test-read-ctf/test-array-of-pointers.abi index 38f65f1f..ac67f98a 100644 --- a/tests/data/test-read-ctf/test-array-of-pointers.abi +++ b/tests/data/test-read-ctf/test-array-of-pointers.abi @@ -4,7 +4,7 @@ - + diff --git a/tests/data/test-read-ctf/test-array-size.abi b/tests/data/test-read-ctf/test-array-size.abi index d0a654a9..f47c8955 100644 --- a/tests/data/test-read-ctf/test-array-size.abi +++ b/tests/data/test-read-ctf/test-array-size.abi @@ -7,13 +7,13 @@ - + - + - + diff --git a/tests/data/test-read-ctf/test-const-array.abi b/tests/data/test-read-ctf/test-const-array.abi index 36fbeccc..4b2bc3d2 100644 --- a/tests/data/test-read-ctf/test-const-array.abi +++ b/tests/data/test-read-ctf/test-const-array.abi @@ -5,7 +5,7 @@ - + diff --git a/tests/data/test-read-ctf/test-dynamic-array.o.abi b/tests/data/test-read-ctf/test-dynamic-array.o.abi index 52f601ea..6cd00ad8 100644 --- a/tests/data/test-read-ctf/test-dynamic-array.o.abi +++ b/tests/data/test-read-ctf/test-dynamic-array.o.abi @@ -5,7 +5,7 @@ - + diff --git a/tests/data/test-read-ctf/test0.abi b/tests/data/test-read-ctf/test0.abi index 7903841c..0cc90924 100644 --- a/tests/data/test-read-ctf/test0.abi +++ b/tests/data/test-read-ctf/test0.abi @@ -24,7 +24,7 @@ - + diff --git a/tests/data/test-read-ctf/test0.hash.abi b/tests/data/test-read-ctf/test0.hash.abi index 36faacf2..e554f91d 100644 --- a/tests/data/test-read-ctf/test0.hash.abi +++ b/tests/data/test-read-ctf/test0.hash.abi @@ -24,7 +24,7 @@ - + diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ctf/test9.o.abi index ba175866..7f1e861b 100644 --- a/tests/data/test-read-ctf/test9.o.abi +++ b/tests/data/test-read-ctf/test9.o.abi @@ -5,25 +5,25 @@ - + - + - - + + - + - + - + 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 1d0664a1..721494a5 100644 --- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi +++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi @@ -139,7 +139,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi index 5d1ea873..f0437e51 100644 --- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi +++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi @@ -248,22 +248,22 @@ - + - + - + - + - + - + @@ -6136,16 +6136,16 @@ - + - + - + - + @@ -9193,10 +9193,10 @@ - + - + @@ -11683,22 +11683,22 @@ - + - + - + - + - + - + @@ -13647,10 +13647,10 @@ - + - + @@ -14628,25 +14628,25 @@ - + - + - + - + - + - + - + diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi index e242bc94..6357b13e 100644 --- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi +++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi @@ -40,66 +40,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -218,78 +218,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -8739,25 +8739,25 @@ - + - + - + - + - + - + - + @@ -9155,242 +9155,242 @@ - + - + - + - + - + - + - + - + - + - - + + - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + - - - + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - + + + - + - + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + @@ -9398,613 +9398,613 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - + + - - - - - - + + + + + + - + - - + + - - - - - + + + + + - + - - - - - - + + + + + + - - + + - + - - - - - - - - - + + + + + + + + + - + - + - - + + - + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - - - - - - + + + + + + + + + - + - + - - + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - + + - - + + - - + + - + - + @@ -10012,33 +10012,33 @@ - + - + - + - + - + - + - + @@ -10047,227 +10047,227 @@ - + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + - + + - - + - + + + + + + - + - + - + - + - + @@ -10275,80 +10275,80 @@ - + - + - - + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -10356,21 +10356,21 @@ - + - + - + - + @@ -10379,8 +10379,8 @@ - - + + @@ -10388,21 +10388,21 @@ - - + + - + - + - + @@ -10412,33 +10412,33 @@ - + - + - + - + - + - + - + - + @@ -10447,7 +10447,7 @@ - + @@ -10456,124 +10456,124 @@ - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + @@ -10581,7 +10581,7 @@ - + @@ -10589,182 +10589,182 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + @@ -10772,137 +10772,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + @@ -10910,7 +10910,7 @@ - + @@ -10918,85 +10918,85 @@ - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + @@ -11004,34 +11004,34 @@ - + - + - + - + - + - + - + - + @@ -11040,7 +11040,7 @@ - + @@ -11048,12 +11048,12 @@ - + - + - + @@ -11061,403 +11061,403 @@ - - - + + + - + - + - + - + - - + + - - + + - + + - - + - - + + - - + + - - + + - - - - - + - - + + - - - + + - - + + + - - + - - + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - - + + - - + + - - + - - + + - - + + + - - + + + + + + - + - - - - - + - - - - + + - - + + + + - - - + + - + + - - - + + - - + + + - - + - - + + - - + + - - + + - - + + - + + - - + + - - + - - + + + - - - + + + + + + + - + - - - - - + - - - + + - - - + + + - - - + + + - + + + + + + - + - - + + - + - - - + + + - + - + - + - + - - - - - + - - + + - - + + - - - - + + - - + + + + - - + - - + + - - + + + - - + + + - - - + + + + + + - + - + - + - + - + - + - - + + - + 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 df97dc1d..b2149efe 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 @@ -209,17 +209,17 @@ - + - + - + - + @@ -510,10 +510,10 @@ - + - + @@ -640,10 +640,10 @@ - + - + @@ -738,7 +738,7 @@ - + @@ -1079,7 +1079,7 @@ - + diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi index cf5a2258..6e4dedbd 100644 --- a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi +++ b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi @@ -15,7 +15,7 @@ - + @@ -178,7 +178,7 @@ - + diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi index cf5a2258..6e4dedbd 100644 --- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi +++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi @@ -15,7 +15,7 @@ - + @@ -178,7 +178,7 @@ - + diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi index beb00348..cc1cd046 100644 --- a/tests/data/test-read-dwarf/test-libaaudio.so.abi +++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi @@ -285,7 +285,7 @@ - + diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi index cb32d1fd..87c00c43 100644 --- a/tests/data/test-read-dwarf/test-libandroid.so.abi +++ b/tests/data/test-read-dwarf/test-libandroid.so.abi @@ -304,7 +304,7 @@ - + @@ -2044,7 +2044,7 @@ - + @@ -3288,33 +3288,33 @@ - + - + - + - + - + - + - + @@ -3327,7 +3327,7 @@ - + @@ -3335,10 +3335,10 @@ - + - + @@ -4263,25 +4263,25 @@ - + - + - + - + - + - + @@ -21257,10 +21257,10 @@ - + - + @@ -21433,13 +21433,13 @@ - + - + - + @@ -21713,7 +21713,7 @@ - + @@ -21888,19 +21888,19 @@ - + - + - + - + - + @@ -22169,10 +22169,10 @@ - + - + @@ -24148,7 +24148,7 @@ - + @@ -43293,7 +43293,7 @@ - + @@ -43368,7 +43368,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 ca521c2a..7c7f8375 100644 --- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi +++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi @@ -414,13 +414,13 @@ - + - + - + @@ -730,7 +730,7 @@ - + @@ -3181,10 +3181,10 @@ - + - + @@ -3203,7 +3203,7 @@ - + diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi index 7ca1b345..0c267ec7 100644 --- a/tests/data/test-read-dwarf/test11-pr18828.so.abi +++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi @@ -636,38 +636,38 @@ - + - + - + - + - + - + - + - + - + - + @@ -676,7 +676,7 @@ - + @@ -991,27 +991,27 @@ - + - + - + - + - + - + - + diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi index fc63f084..c8336b90 100644 --- a/tests/data/test-read-dwarf/test12-pr18844.so.abi +++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi @@ -1722,65 +1722,65 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2001,13 +2001,13 @@ - + - + - + diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi index 0f1f10d1..21a1150c 100644 --- a/tests/data/test-read-dwarf/test13-pr18894.so.abi +++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi @@ -574,7 +574,7 @@ - + @@ -1990,10 +1990,10 @@ - + - + diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi index 7a997b4b..5b75fd6e 100644 --- a/tests/data/test-read-dwarf/test14-pr18893.so.abi +++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi @@ -69,10 +69,10 @@ - + - + @@ -1322,7 +1322,7 @@ - + @@ -1753,23 +1753,23 @@ - + - + - + - - + + - + - + @@ -1819,7 +1819,7 @@ - + @@ -2783,7 +2783,7 @@ - + @@ -4339,15 +4339,15 @@ - + - - - + + + - + @@ -6528,8 +6528,8 @@ - - + + @@ -8203,17 +8203,17 @@ - + - + - + - - + + @@ -8301,10 +8301,10 @@ - + - + @@ -8975,7 +8975,7 @@ - + @@ -9966,7 +9966,7 @@ - + @@ -10140,7 +10140,7 @@ - + @@ -11362,14 +11362,14 @@ - + - + - - + + @@ -11577,7 +11577,7 @@ - + @@ -13048,7 +13048,7 @@ - + @@ -13113,7 +13113,7 @@ - + @@ -14230,13 +14230,13 @@ - + - + - + @@ -14247,7 +14247,7 @@ - + @@ -14592,7 +14592,7 @@ - + diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi index 353b394d..348d244a 100644 --- a/tests/data/test-read-dwarf/test15-pr18892.so.abi +++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi @@ -1894,16 +1894,16 @@ - + - + - + - + @@ -2521,10 +2521,10 @@ - + - + @@ -3454,7 +3454,7 @@ - + @@ -3884,7 +3884,7 @@ - + @@ -4620,7 +4620,7 @@ - + @@ -5156,7 +5156,7 @@ - + @@ -5688,7 +5688,7 @@ - + @@ -6193,19 +6193,19 @@ - + - + - + - + - + @@ -6304,7 +6304,7 @@ - + @@ -6800,25 +6800,25 @@ - + - + - + - + - + - + - + @@ -15671,7 +15671,7 @@ - + @@ -16087,36 +16087,36 @@ - + - + - + - + - + - + - + - + - + - + @@ -16170,28 +16170,28 @@ - + - + - + - + - + - + - + - + @@ -20986,7 +20986,7 @@ - + @@ -21029,16 +21029,16 @@ - + - + - + - + @@ -23263,7 +23263,7 @@ - + @@ -24349,16 +24349,16 @@ - + - + - + - + diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi index 8965b90a..116112d7 100644 --- a/tests/data/test-read-dwarf/test16-pr18904.so.abi +++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi @@ -1789,13 +1789,13 @@ - + - + - + @@ -2163,19 +2163,19 @@ - + - + - + - + - + @@ -2430,13 +2430,13 @@ - + - + - + @@ -4068,22 +4068,22 @@ - + - + - + - + - + - + @@ -12712,7 +12712,7 @@ - + @@ -12836,7 +12836,7 @@ - + @@ -17254,7 +17254,7 @@ - + @@ -19920,7 +19920,7 @@ - + @@ -20058,7 +20058,7 @@ - + @@ -20973,16 +20973,16 @@ - + - + - + - + @@ -21979,7 +21979,7 @@ - + diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi index cdf0f75c..56a56e8a 100644 --- a/tests/data/test-read-dwarf/test17-pr19027.so.abi +++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi @@ -269,7 +269,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -707,7 +707,7 @@ - + @@ -969,14 +969,14 @@ - - + + - + - + @@ -1597,13 +1597,13 @@ - + - + - + @@ -1627,7 +1627,7 @@ - + @@ -2338,10 +2338,10 @@ - + - + @@ -2447,10 +2447,10 @@ - + - + @@ -3100,7 +3100,7 @@ - + @@ -6804,34 +6804,34 @@ - + - + - + - + - + - + - + - + - + - + @@ -6907,7 +6907,7 @@ - + @@ -8203,103 +8203,103 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -8310,22 +8310,22 @@ - + - + - + - + - + - + @@ -9080,7 +9080,7 @@ - + @@ -19059,13 +19059,13 @@ - + - + - + @@ -19560,7 +19560,7 @@ - + @@ -19684,7 +19684,7 @@ - + @@ -19953,7 +19953,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 77dd7023..e9102931 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 @@ -454,13 +454,13 @@ - + - + - + @@ -3937,7 +3937,7 @@ - + @@ -7158,7 +7158,7 @@ - + @@ -8352,17 +8352,17 @@ - + - + - + - + @@ -15566,12 +15566,12 @@ - + - + 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 d6284965..d64171ab 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 @@ -1238,7 +1238,7 @@ - + @@ -1560,7 +1560,7 @@ - + @@ -1731,10 +1731,10 @@ - + - + @@ -2375,10 +2375,10 @@ - + - + @@ -4883,7 +4883,7 @@ - + @@ -4952,7 +4952,7 @@ - + @@ -10835,7 +10835,7 @@ - + @@ -11933,7 +11933,7 @@ - + @@ -12018,8 +12018,8 @@ - - + + @@ -13260,13 +13260,13 @@ - + - + - + @@ -13568,7 +13568,7 @@ - + @@ -15055,10 +15055,10 @@ - + - + @@ -15154,7 +15154,7 @@ - + @@ -15242,21 +15242,21 @@ - + - + - + - + - + @@ -16553,22 +16553,22 @@ - + - + - + - + @@ -16885,16 +16885,16 @@ - + - + - + - + @@ -16926,20 +16926,20 @@ - + - + - + - + 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 4a852943..86bfb69e 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 @@ -390,13 +390,13 @@ - + - + - + @@ -2209,7 +2209,7 @@ - + @@ -13279,7 +13279,7 @@ - + @@ -18632,7 +18632,7 @@ - + diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi index 98745b4f..d2c1bccf 100644 --- a/tests/data/test-read-dwarf/test21-pr19092.so.abi +++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi @@ -475,19 +475,19 @@ - + - + - + - + - + @@ -528,11 +528,11 @@ - + - + @@ -1036,7 +1036,7 @@ - + @@ -3107,22 +3107,22 @@ - + - + - + - + - + - + @@ -3711,7 +3711,7 @@ - + @@ -4068,10 +4068,10 @@ - + - + @@ -4303,7 +4303,7 @@ - + @@ -6139,16 +6139,16 @@ - + - + - + - + @@ -6563,10 +6563,10 @@ - + - + @@ -6790,7 +6790,7 @@ - + @@ -7220,10 +7220,10 @@ - + - + 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 38e9e997..1a6747ba 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 @@ -6345,7 +6345,7 @@ - + @@ -6661,7 +6661,7 @@ - + @@ -8074,7 +8074,7 @@ - + @@ -10555,13 +10555,13 @@ - + - + - + @@ -10840,7 +10840,7 @@ - + @@ -23248,7 +23248,7 @@ - + @@ -23511,10 +23511,10 @@ - + - + @@ -27338,7 +27338,7 @@ - + @@ -31977,7 +31977,7 @@ - + @@ -33416,10 +33416,10 @@ - + - + @@ -37744,10 +37744,10 @@ - + - + @@ -40268,19 +40268,19 @@ - + - + - + - + - + @@ -40725,10 +40725,10 @@ - + - + @@ -41426,16 +41426,16 @@ - + - + - + - + @@ -41683,10 +41683,10 @@ - + - + @@ -43586,7 +43586,7 @@ - + @@ -46413,16 +46413,16 @@ - + - + - + - + @@ -49910,10 +49910,10 @@ - + - + @@ -54204,10 +54204,10 @@ - + - + @@ -58504,16 +58504,16 @@ - + - + - + - + @@ -62033,7 +62033,7 @@ - + diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi index a9657f9a..7de73cb8 100644 --- a/tests/data/test-read-dwarf/test7.so.abi +++ b/tests/data/test-read-dwarf/test7.so.abi @@ -5,28 +5,28 @@ - + - + - + - - + + - + - + - + diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi index dda3d9ae..8451151d 100644 --- a/tests/data/test-read-dwarf/test7.so.hash.abi +++ b/tests/data/test-read-dwarf/test7.so.hash.abi @@ -5,28 +5,28 @@ - + - + - + - - + + - + - + - + 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 05129ee2..9cb9d70f 100644 --- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi +++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi @@ -350,7 +350,7 @@ - + @@ -1807,10 +1807,10 @@ - + - + diff --git a/tests/data/test-read-write/test25.xml b/tests/data/test-read-write/test25.xml index 04a3cb29..f8b0abbb 100644 --- a/tests/data/test-read-write/test25.xml +++ b/tests/data/test-read-write/test25.xml @@ -1,10 +1,10 @@ - + - + @@ -25,18 +25,18 @@ - - + + - + - + - +