From patchwork Mon Feb 1 13:34:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 41884 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 1D0D8385783A; Mon, 1 Feb 2021 13:35:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D0D8385783A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1612186553; bh=Us5c4h5ToKmeXV5voskCzMamy4tPoxseohX0Ho1d+04=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=t8ajnUTt0iqHTYSko9bSQPPYb/DEFTalwd82blCdhvd0JYV1CuWD9QvMScdAb+0Pm lzEAli5O2jziZwciz6h1gO5n619nzLlYqUpEg16G7Eio8g0c2FAuGLuGqn6ddMSQ7t Rskln7WOTiEzBZCiIxwlQa7tYEmg5h9eEt5Pobbo= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id C2D9C385783A for ; Mon, 1 Feb 2021 13:34:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C2D9C385783A Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-273-u9TvcAXUPR2e3Xp4tlV-Rg-1; Mon, 01 Feb 2021 08:34:47 -0500 X-MC-Unique: u9TvcAXUPR2e3Xp4tlV-Rg-1 Received: by mail-wr1-f69.google.com with SMTP id z9so10363220wro.11 for ; Mon, 01 Feb 2021 05:34:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:organization:date:message-id :user-agent:mime-version; bh=Us5c4h5ToKmeXV5voskCzMamy4tPoxseohX0Ho1d+04=; b=HpzNOHkTPuOk4Rv9pjmRNTa4E7TYMV3wZ1XL5EmRGHNuFAMloG2NBX3ph+xSw9XW6v TkcKGi+GdQqCcP+/cbolxO1iV69rHNvgYY1iVWAKBZezyQxpOzhDptDMdM7LpGpHBECL Uk5TyleP9+1sclhg/1Z+AnzEgsM/0Fp+sHYLJ+ERLriCRGqxG1m6hwPLXgY8wJh13ghU kV4wYOJGE4I/1tGK4ksbqI9sEVjRRVBth4pwJF6GK5977Q/MlijaKmUkJ30MSJjp6744 KNJUO2Mfqv3kqxltmQCzm3V6HmGRroD4/B8E1CGpTK+4VtAqsrq8AQcPsHfg+U7igbt3 9p9A== X-Gm-Message-State: AOAM5332eLH0pCIwOSEpEB1ibx4ahHCfu3nN4fBdpB2llADWeR7azZGE GdDfunHyg2rDK2f/qIqN+qHmwpWLOnUaG92IZZ3MDb4hJNnYWM+WR0uNIO/CW3+oqJ15Itc4d3c OXdmMoOQTPcivC1CObMkzjukM4+r1WjQ7bHQlfn3hkfOo8mS7pZYOHoAQxI3zJ9lpQn0x X-Received: by 2002:adf:fcc7:: with SMTP id f7mr17994127wrs.420.1612186485254; Mon, 01 Feb 2021 05:34:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPo7VXLVPdxjZqttUgFFEBnWBgCMUFcJT+cffY214lY3GrvdHPE5BXC1vzvDSglz8OOxTEsQ== X-Received: by 2002:adf:fcc7:: with SMTP id f7mr17994063wrs.420.1612186484546; Mon, 01 Feb 2021 05:34:44 -0800 (PST) Received: from localhost (91-166-131-65.subs.proxad.net. [91.166.131.65]) by smtp.gmail.com with ESMTPSA id a6sm20616100wmj.27.2021.02.01.05.34.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 05:34:40 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id E3428581C93; Mon, 1 Feb 2021 14:34:20 +0100 (CET) To: libabigail@sourceware.org Subject: [PATCH] Bump ABIXML format version to 2.0 Organization: Red Hat / France X-Operating-System: Fedora 34 X-URL: http://www.redhat.com Date: Mon, 01 Feb 2021 14:34:20 +0100 Message-ID: <87y2g7gbdv.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=-9.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SCC_10_SHORT_WORD_LINES, SCC_20_SHORT_WORD_LINES, SCC_35_SHORT_WORD_LINES, SCC_5_SHORT_WORD_LINES, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" Hello, After fixing the interpretation of the DW_AT_bit_offset attribute for offset of bit field data members, serialized abixml might now be incompatible with versions of Libabigail that use the previous interpretation. That means that comparing an abixml file generated with previous versions of Libabigail against a corpus resulting from an analysis performed with the current version of libabigail might yield spurious changes due to the differences in the way we now interpret the DW_AT_bit_offset. Hence, this patch bumps the version of abixml files emitted from now on to "2.0". This version is deemed incompatible with the previous "1.0" version. Subsequently, an abixml file of the "1.0" format cannot be compared against an abixml file of the "2.0" format, or against a binary analyzed with a current version of Libabigail. It's thus advised that abixml files of the "1.0" format version should be re-generated with a current version of Libabigail, bumping their format version number to the new "2.0". * include/abg-corpus.h (corpus::init_format_version): Declare new private method. (corpus::set_environment): Make this non-const. (corpus::{get,set}_format_{major,minor}_version_number): Declare new accessors. * src/abg-corpus.cc (corpus::init_format_version): Define new method. (corpus::set_environment): By default, initialize the format version number of the corpus to the one supported by Libabigail. (corpus::{get,set}_format_{major,minor}_version_number): Define new accessors. * include/abg-ir.h: Include abg-config.h to use the abigail::config. (environment::get_config): Declare new accessor. * src/abg-ir.cc (environment::priv::config_): Add new data member. (environment::get_config): Define new accessor. * src/abg-config.cc (config::config): Bump the format version number to "2.0". * src/abg-corpus-priv.h (corpus::priv::format_{major,minor}_version_number_): Add new data members. * src/abg-reader.cc (handle_version_attribute): Define new static function. (read_corpus_from_input, read_corpus_group_from_input): Use it to read the value of the "version" attribute and set the format version number of the corpus and corpus group accordingly. * src/abg-writer.cc (write_context::m_config): Remove the config object because we can now get it from the environment. (write_context::get_config): Get the config object from the environment. (write_translation_unit): Do not emit the version attribute on the translation unit element anymore. (write_version_info): Define static function. (write_corpus, write_corpus_group): Use it to emit version attribute on both the corpus and corpus group elements. * tools/abidiff.cc (emit_incomptatible_format_version_error_message): Define new static function. (main): Ensure that corpora and corpus groups being compared have the same major version number. * tests/update-test-output.py: Adjust syntax for python3. * tests/data/test-annotate/libtest23.so.abi: Adjust. * tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Likewise. * tests/data/test-annotate/libtest24-drop-fns.so.abi: Likewise. * tests/data/test-annotate/test-anonymous-members-0.o.abi: Likewise. * tests/data/test-annotate/test0.abi: Likewise. * tests/data/test-annotate/test1.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/test2.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/test3.so.abi: Likewise. * tests/data/test-annotate/test4.so.abi: Likewise. * tests/data/test-annotate/test5.o.abi: Likewise. * tests/data/test-annotate/test6.so.abi: Likewise. * tests/data/test-annotate/test7.so.abi: Likewise. * tests/data/test-annotate/test8-qualified-this-pointer.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-diff-suppr/libtest48-soname-abixml-v0.so.abi: Likewise. * tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi: Likewise. * tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi: Likewise. * tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise. * tests/data/test-read-dwarf/PR24378-fn-is-not-scope.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/PR26261/PR26261-exe.abi: Likewise. * tests/data/test-read-dwarf/libtest23.so.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-PR26568-1.o.abi: Likewise. * tests/data/test-read-dwarf/test-PR26568-2.o.abi: Likewise. * tests/data/test-read-dwarf/test0.abi: Likewise. * tests/data/test-read-dwarf/test0.hash.abi: Likewise. * tests/data/test-read-dwarf/test1.abi: Likewise. * tests/data/test-read-dwarf/test1.hash.abi: Likewise. * tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise. * tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise. * tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise. * tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise. * tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise. * tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise. * tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise. * tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise. * tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: Likewise. * tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise. * tests/data/test-read-dwarf/test2.so.abi: Likewise. * tests/data/test-read-dwarf/test2.so.hash.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/test3.so.abi: Likewise. * tests/data/test-read-dwarf/test3.so.hash.abi: Likewise. * tests/data/test-read-dwarf/test4.so.abi: Likewise. * tests/data/test-read-dwarf/test4.so.hash.abi: Likewise. * tests/data/test-read-dwarf/test5.o.abi: Likewise. * tests/data/test-read-dwarf/test5.o.hash.abi: Likewise. * tests/data/test-read-dwarf/test6.so.abi: Likewise. * tests/data/test-read-dwarf/test6.so.hash.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/test8-qualified-this-pointer.so.abi: Likewise. * tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi: Likewise. * tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise. * tests/data/test-read-write/test0.xml: Likewise. * tests/data/test-read-write/test1.xml: Likewise. * tests/data/test-read-write/test10.xml: Likewise. * tests/data/test-read-write/test11.xml: Likewise. * tests/data/test-read-write/test12.xml: Likewise. * tests/data/test-read-write/test13.xml: Likewise. * tests/data/test-read-write/test14.xml: Likewise. * tests/data/test-read-write/test15.xml: Likewise. * tests/data/test-read-write/test16.xml: Likewise. * tests/data/test-read-write/test17.xml: Likewise. * tests/data/test-read-write/test18.xml: Likewise. * tests/data/test-read-write/test19.xml: Likewise. * tests/data/test-read-write/test2.xml: Likewise. * tests/data/test-read-write/test20.xml: Likewise. * tests/data/test-read-write/test21.xml: Likewise. * tests/data/test-read-write/test22.xml: Likewise. * tests/data/test-read-write/test23.xml: Likewise. * tests/data/test-read-write/test24.xml: Likewise. * tests/data/test-read-write/test25.xml: Likewise. * tests/data/test-read-write/test26.xml: Likewise. * tests/data/test-read-write/test27.xml: Likewise. * tests/data/test-read-write/test28-without-std-fns-ref.xml: Likewise. * tests/data/test-read-write/test28-without-std-vars-ref.xml: Likewise. * tests/data/test-read-write/test3.xml: Likewise. * tests/data/test-read-write/test4.xml: Likewise. * tests/data/test-read-write/test5.xml: Likewise. * tests/data/test-read-write/test6.xml: Likewise. * tests/data/test-read-write/test7.xml: Likewise. * tests/data/test-read-write/test8.xml: Likewise. * tests/data/test-read-write/test9.xml: Likewise. Signed-off-by: Dodji Seketeli --- include/abg-corpus.h | 15 +- include/abg-ir.h | 4 + src/abg-config.cc | 2 +- src/abg-corpus-priv.h | 3 + src/abg-corpus.cc | 63 ++++- src/abg-ir.cc | 8 + src/abg-reader.cc | 37 +++ src/abg-writer.cc | 33 ++- tests/data/test-annotate/libtest23.so.abi | 6 +- .../test-annotate/libtest24-drop-fns-2.so.abi | 4 +- .../test-annotate/libtest24-drop-fns.so.abi | 4 +- .../test-anonymous-members-0.o.abi | 4 +- tests/data/test-annotate/test0.abi | 4 +- tests/data/test-annotate/test1.abi | 4 +- .../data/test-annotate/test13-pr18894.so.abi | 34 +-- .../data/test-annotate/test14-pr18893.so.abi | 118 ++++---- .../data/test-annotate/test15-pr18892.so.abi | 120 ++++---- .../data/test-annotate/test17-pr19027.so.abi | 60 ++-- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 48 ++-- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 74 ++--- tests/data/test-annotate/test2.so.abi | 6 +- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 26 +- .../data/test-annotate/test21-pr19092.so.abi | 86 +++--- tests/data/test-annotate/test3.so.abi | 4 +- tests/data/test-annotate/test4.so.abi | 4 +- tests/data/test-annotate/test5.o.abi | 4 +- tests/data/test-annotate/test6.so.abi | 4 +- tests/data/test-annotate/test7.so.abi | 4 +- .../test8-qualified-this-pointer.so.abi | 4 +- .../PR25409-librte_bus_dpaa.so.20.0.abi | 20 +- .../test0-pr19026-libvtkIOSQL-6.1.so.1.abi | 26 +- .../libtest48-soname-abixml-v0.so.abi | 4 +- .../libtest48-soname-abixml-v1.so.abi | 4 +- .../PR22015-libboost_iostreams.so.abi | 6 +- .../test-read-dwarf/PR22122-libftdc.so.abi | 22 +- .../PR24378-fn-is-not-scope.abi | 4 +- .../data/test-read-dwarf/PR25007-sdhci.ko.abi | 6 +- .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi | 58 ++-- .../test-read-dwarf/PR26261/PR26261-exe.abi | 8 +- tests/data/test-read-dwarf/libtest23.so.abi | 6 +- .../libtest24-drop-fns-2.so.abi | 4 +- .../test-read-dwarf/libtest24-drop-fns.so.abi | 4 +- .../data/test-read-dwarf/test-PR26568-1.o.abi | 4 +- .../data/test-read-dwarf/test-PR26568-2.o.abi | 4 +- .../test-read-dwarf/test-libandroid.so.abi | 46 ++-- tests/data/test-read-dwarf/test0.abi | 4 +- tests/data/test-read-dwarf/test0.hash.abi | 4 +- tests/data/test-read-dwarf/test1.abi | 4 +- tests/data/test-read-dwarf/test1.hash.abi | 4 +- .../test-read-dwarf/test10-pr18818-gcc.so.abi | 18 +- .../test-read-dwarf/test11-pr18828.so.abi | 4 +- .../test-read-dwarf/test12-pr18844.so.abi | 8 +- .../test-read-dwarf/test13-pr18894.so.abi | 34 +-- .../test-read-dwarf/test14-pr18893.so.abi | 118 ++++---- .../test-read-dwarf/test15-pr18892.so.abi | 120 ++++---- .../test-read-dwarf/test16-pr18904.so.abi | 32 +-- .../test-read-dwarf/test17-pr19027.so.abi | 60 ++-- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 48 ++-- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 74 ++--- tests/data/test-read-dwarf/test2.so.abi | 6 +- tests/data/test-read-dwarf/test2.so.hash.abi | 6 +- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 26 +- .../test-read-dwarf/test21-pr19092.so.abi | 86 +++--- .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 256 +++++++++--------- tests/data/test-read-dwarf/test3.so.abi | 4 +- tests/data/test-read-dwarf/test3.so.hash.abi | 4 +- tests/data/test-read-dwarf/test4.so.abi | 4 +- tests/data/test-read-dwarf/test4.so.hash.abi | 4 +- tests/data/test-read-dwarf/test5.o.abi | 4 +- tests/data/test-read-dwarf/test5.o.hash.abi | 4 +- tests/data/test-read-dwarf/test6.so.abi | 4 +- tests/data/test-read-dwarf/test6.so.hash.abi | 4 +- tests/data/test-read-dwarf/test7.so.abi | 4 +- tests/data/test-read-dwarf/test7.so.hash.abi | 4 +- .../test8-qualified-this-pointer.so.abi | 4 +- .../test8-qualified-this-pointer.so.hash.abi | 4 +- .../test9-pr18818-clang.so.abi | 18 +- tests/data/test-read-write/test0.xml | 2 +- tests/data/test-read-write/test1.xml | 2 +- tests/data/test-read-write/test10.xml | 2 +- tests/data/test-read-write/test11.xml | 2 +- tests/data/test-read-write/test12.xml | 2 +- tests/data/test-read-write/test13.xml | 2 +- tests/data/test-read-write/test14.xml | 2 +- tests/data/test-read-write/test15.xml | 2 +- tests/data/test-read-write/test16.xml | 2 +- tests/data/test-read-write/test17.xml | 2 +- tests/data/test-read-write/test18.xml | 2 +- tests/data/test-read-write/test19.xml | 2 +- tests/data/test-read-write/test2.xml | 2 +- tests/data/test-read-write/test20.xml | 2 +- tests/data/test-read-write/test21.xml | 2 +- tests/data/test-read-write/test22.xml | 2 +- tests/data/test-read-write/test23.xml | 2 +- tests/data/test-read-write/test24.xml | 2 +- tests/data/test-read-write/test25.xml | 2 +- tests/data/test-read-write/test26.xml | 4 +- tests/data/test-read-write/test27.xml | 4 +- .../test28-without-std-fns-ref.xml | 4 +- .../test28-without-std-vars-ref.xml | 4 +- tests/data/test-read-write/test3.xml | 2 +- tests/data/test-read-write/test4.xml | 2 +- tests/data/test-read-write/test5.xml | 2 +- tests/data/test-read-write/test6.xml | 2 +- tests/data/test-read-write/test7.xml | 2 +- tests/data/test-read-write/test8.xml | 2 +- tests/data/test-read-write/test9.xml | 2 +- tools/abidiff.cc | 38 +++ 108 files changed, 1137 insertions(+), 960 deletions(-) diff --git a/include/abg-corpus.h b/include/abg-corpus.h index e60b5013..1f5c994e 100644 --- a/include/abg-corpus.h +++ b/include/abg-corpus.h @@ -57,6 +57,7 @@ private: corpus(); void set_group(corpus_group*); + void init_format_version(); public: shared_ptr priv_; @@ -72,7 +73,7 @@ public: get_environment(); void - set_environment(environment*) const; + set_environment(environment*); void add(const translation_unit_sptr); @@ -122,6 +123,18 @@ public: void set_origin(origin); + string& + get_format_major_version_number() const; + + void + set_format_major_version_number(const string&); + + string& + get_format_minor_version_number() const; + + void + set_format_minor_version_number(const string&); + string& get_path() const; diff --git a/include/abg-ir.h b/include/abg-ir.h index c32b2f7f..5a2aa6e3 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -24,6 +24,7 @@ #include "abg-fwd.h" #include "abg-hash.h" #include "abg-traverse.h" +#include "abg-config.h" /// @file /// @@ -196,6 +197,9 @@ public: interned_string intern(const string&) const; + const config& + get_config() const; + friend class class_or_union; friend class class_decl; friend class function_type; diff --git a/src/abg-config.cc b/src/abg-config.cc index ac64c767..4063a79f 100644 --- a/src/abg-config.cc +++ b/src/abg-config.cc @@ -19,7 +19,7 @@ namespace abigail { config::config() : m_format_minor("0"), - m_format_major("1"), + m_format_major("2"), m_xml_element_indent(2), m_tu_instr_suffix(".bi"), m_tu_instr_archive_suffix(".abi") diff --git a/src/abg-corpus-priv.h b/src/abg-corpus-priv.h index a4a97adf..582c05ba 100644 --- a/src/abg-corpus-priv.h +++ b/src/abg-corpus-priv.h @@ -662,6 +662,9 @@ public: /// The private data of the @ref corpus type. struct corpus::priv { + mutable unordered_map canonical_types_; + string format_major_version_number_; + string format_minor_version_number_; environment* env; corpus_group* group; corpus::exported_decls_builder_sptr exported_decls_builder; diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc index 2c37e253..4e445e88 100644 --- a/src/abg-corpus.cc +++ b/src/abg-corpus.cc @@ -466,7 +466,10 @@ corpus::priv::~priv() /// /// @param path the path to the file containing the ABI corpus. corpus::corpus(ir::environment* env, const string& path) -{priv_.reset(new priv(path, env));} +{ + priv_.reset(new priv(path, env)); + init_format_version(); +} /// Getter of the enviroment of the corpus. /// @@ -486,8 +489,11 @@ corpus::get_environment() /// /// @param e the new environment. void -corpus::set_environment(environment* e) const -{priv_->env = e;} +corpus::set_environment(environment* e) +{ + priv_->env = e; + init_format_version(); +} /// Add a translation unit to the current ABI Corpus. Next time /// corpus::save is called, all the translation unit that got added to @@ -692,6 +698,23 @@ void corpus::set_group(corpus_group* g) {priv_->group = g;} +/// Initialize the abixml serialization format version number of the +/// corpus. +/// +/// This function sets the format version number ot the default one +/// supported by the current version of Libabigail. +void +corpus::init_format_version() +{ + if (priv_->env) + { + set_format_major_version_number + (priv_->env->get_config().get_format_major_version_number()); + set_format_minor_version_number + (priv_->env->get_config().get_format_minor_version_number()); + } +} + /// Getter for the origin of the corpus. /// /// @return the origin of the corpus. @@ -706,6 +729,40 @@ void corpus::set_origin(origin o) {priv_->origin_ = o;} +/// Getter of the major version number of the abixml serialization +/// format. +/// +/// @return the major version number of the abixml format. +string& +corpus::get_format_major_version_number() const +{return priv_->format_major_version_number_;} + +/// Setter of the major version number of the abixml serialization +/// format. +/// +/// @param maj the new major version numberof the abixml format. +void +corpus::set_format_major_version_number(const string& maj) +{priv_->format_major_version_number_ = maj;} + +/// Getter of the minor version number of the abixml serialization +/// format. +/// +/// @return the minor version number of the abixml serialization +/// format. +string& +corpus::get_format_minor_version_number() const +{return priv_->format_minor_version_number_;} + +/// Setter of the minor version number of the abixml serialization +/// format. +/// +/// @param min the new minor version number of the abixml +/// serialization format. +void +corpus::set_format_minor_version_number(const string& min) +{priv_->format_minor_version_number_ = min;} + /// Get the file path associated to the corpus file. /// /// A subsequent call to corpus::read will deserialize the content of diff --git a/src/abg-ir.cc b/src/abg-ir.cc index d1d02f3a..02f3cc24 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -2641,6 +2641,7 @@ typedef unordered_map sorted_canonical_types_; type_base_sptr void_type_; @@ -3043,6 +3044,13 @@ interned_string environment::intern(const string& s) const {return const_cast(this)->priv_->string_pool_.create_string(s);} +/// Getter of the general configuration object. +/// +/// @return the configuration object. +const config& +environment::get_config() const +{return priv_->config_;} + // // diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 1fb0cf7d..3e552864 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -1768,6 +1768,38 @@ consider_types_not_reachable_from_public_interfaces(read_context& ctxt, bool flag) {ctxt.tracking_non_reachable_types(flag);} +/// Read the "version" attribute from the current XML element which is +/// supposed to be a corpus or a corpus group and set the format +/// version to the corpus object accordingly. +/// +/// Note that this is a subroutine of read_corpus_from_input and +/// read_corpus_group_from_input. +/// +/// @param reader the XML reader to consider. That reader must be +/// set to an XML element representing a corpus or a corpus group. +/// +/// @param corp output parameter. The corpus object which format +/// version string is going to be set according to the value of the +/// "version" attribute found on the current XML element. +static void +handle_version_attribute(xml::reader_sptr& reader, corpus& corp) +{ + string version_string; + if (xml_char_sptr s = XML_READER_GET_ATTRIBUTE(reader, "version")) + xml::xml_char_sptr_to_string(s, version_string); + + vector v; + if (version_string.empty()) + { + v.push_back("1"); + v.push_back("0"); + } + else + tools_utils::split_string(version_string, ".", v); + corp.set_format_major_version_number(v[0]); + corp.set_format_minor_version_number(v[1]); +} + /// Parse the input XML document containing an ABI corpus, represented /// by an 'abi-corpus' element node, associated to the current /// context. @@ -1811,6 +1843,8 @@ read_corpus_from_input(read_context& ctxt) corpus& corp = *ctxt.get_corpus(); ctxt.set_exported_decls_builder(corp.get_exported_decls_builder().get()); + handle_version_attribute(reader, corp); + xml::xml_char_sptr path_str = XML_READER_GET_ATTRIBUTE(reader, "path"); string path; @@ -2001,6 +2035,9 @@ read_corpus_group_from_input(read_context& ctxt) } corpus_group_sptr group = ctxt.get_corpus_group(); + + handle_version_attribute(reader, *group); + xml::xml_char_sptr path_str = XML_READER_GET_ATTRIBUTE(reader, "path"); if (path_str) group->set_path(reinterpret_cast(path_str.get())); diff --git a/src/abg-writer.cc b/src/abg-writer.cc index d55bbbc1..4900703f 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -154,7 +154,6 @@ class write_context { const environment* m_env; id_manager m_id_manager; - config m_config; ostream* m_ostream; bool m_annotate; bool m_show_locs; @@ -217,7 +216,10 @@ public: const config& get_config() const - {return m_config;} + { + ABG_ASSERT(get_environment()); + return get_environment()->get_config(); + } /// Getter for the current ostream /// @@ -2209,10 +2211,7 @@ write_translation_unit(write_context& ctxt, do_indent(o, indent); - o << "get_path().empty() && ctxt.get_write_corpus_path()) out << " path='" << xml::escape_xml_string(group->get_path()) << "'"; diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi index 6b6dcbba..3b5c6035 100644 --- a/tests/data/test-annotate/libtest23.so.abi +++ b/tests/data/test-annotate/libtest23.so.abi @@ -1,4 +1,4 @@ - + @@ -15,7 +15,7 @@ - + @@ -1198,7 +1198,7 @@ - + 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 7cae766a..33e45f16 100644 --- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi +++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi @@ -1,4 +1,4 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi index 7cae766a..33e45f16 100644 --- a/tests/data/test-annotate/libtest24-drop-fns.so.abi +++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi @@ -1,4 +1,4 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi index 51d01dfc..3893c85f 100644 --- a/tests/data/test-annotate/test-anonymous-members-0.o.abi +++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi @@ -1,9 +1,9 @@ - + - + diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi index c441710f..97aa4a2a 100644 --- a/tests/data/test-annotate/test0.abi +++ b/tests/data/test-annotate/test0.abi @@ -1,4 +1,4 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi index d1481c65..8562fa74 100644 --- a/tests/data/test-annotate/test1.abi +++ b/tests/data/test-annotate/test1.abi @@ -1,4 +1,4 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi index cad84c9b..ae62b7ac 100644 --- a/tests/data/test-annotate/test13-pr18894.so.abi +++ b/tests/data/test-annotate/test13-pr18894.so.abi @@ -1,4 +1,4 @@ - + @@ -474,7 +474,7 @@ - + @@ -664,7 +664,7 @@ - + @@ -1197,7 +1197,7 @@ - + @@ -2386,7 +2386,7 @@ - + @@ -2456,7 +2456,7 @@ - + @@ -2502,7 +2502,7 @@ - + @@ -3236,7 +3236,7 @@ - + @@ -3254,7 +3254,7 @@ - + @@ -3360,7 +3360,7 @@ - + @@ -3646,7 +3646,7 @@ - + @@ -3771,7 +3771,7 @@ - + @@ -3827,7 +3827,7 @@ - + @@ -3838,7 +3838,7 @@ - + @@ -4043,7 +4043,7 @@ - + @@ -4095,7 +4095,7 @@ - + @@ -4117,7 +4117,7 @@ - + diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi index 89929ba2..f9eed018 100644 --- a/tests/data/test-annotate/test14-pr18893.so.abi +++ b/tests/data/test-annotate/test14-pr18893.so.abi @@ -1,4 +1,4 @@ - + @@ -126,7 +126,7 @@ - + @@ -780,7 +780,7 @@ - + @@ -4641,7 +4641,7 @@ - + @@ -4856,7 +4856,7 @@ - + @@ -5551,9 +5551,9 @@ - + - + @@ -5825,7 +5825,7 @@ - + @@ -6985,13 +6985,13 @@ - + - + @@ -7077,17 +7077,17 @@ - + - + - + - + @@ -7322,7 +7322,7 @@ - + @@ -7661,7 +7661,7 @@ - + @@ -7672,11 +7672,11 @@ - + - + @@ -7789,17 +7789,17 @@ - + - + - + @@ -7875,21 +7875,21 @@ - + - + - + - + - + @@ -7929,7 +7929,7 @@ - + @@ -8011,7 +8011,7 @@ - + @@ -8196,9 +8196,9 @@ - + - + @@ -8531,7 +8531,7 @@ - + @@ -8673,7 +8673,7 @@ - + @@ -8684,17 +8684,17 @@ - + - + - + @@ -8949,15 +8949,15 @@ - + - + - + @@ -9138,19 +9138,19 @@ - + - + - + - + @@ -9211,7 +9211,7 @@ - + @@ -9371,11 +9371,11 @@ - + - + @@ -9462,23 +9462,23 @@ - + - + - + - + - + - + - + - + - + @@ -10289,7 +10289,7 @@ - + @@ -10310,7 +10310,7 @@ - + @@ -10477,7 +10477,7 @@ - + @@ -10638,7 +10638,7 @@ - + @@ -10810,7 +10810,7 @@ - + diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi index 274aceb9..62a94355 100644 --- a/tests/data/test-annotate/test15-pr18892.so.abi +++ b/tests/data/test-annotate/test15-pr18892.so.abi @@ -1,4 +1,4 @@ - + @@ -3035,7 +3035,7 @@ - + @@ -3058,9 +3058,9 @@ - + - + @@ -3401,7 +3401,7 @@ - + @@ -3425,7 +3425,7 @@ - + @@ -3487,7 +3487,7 @@ - + @@ -3545,7 +3545,7 @@ - + @@ -3633,7 +3633,7 @@ - + @@ -3678,7 +3678,7 @@ - + @@ -3693,7 +3693,7 @@ - + @@ -4376,9 +4376,9 @@ - + - + @@ -4868,7 +4868,7 @@ - + @@ -5174,9 +5174,9 @@ - + - + @@ -5331,9 +5331,9 @@ - + - + @@ -5419,7 +5419,7 @@ - + @@ -5723,7 +5723,7 @@ - + @@ -6256,7 +6256,7 @@ - + @@ -6395,14 +6395,14 @@ - + - + @@ -7479,7 +7479,7 @@ - + @@ -7500,7 +7500,7 @@ - + @@ -7592,7 +7592,7 @@ - + @@ -7617,7 +7617,7 @@ - + @@ -7845,11 +7845,11 @@ - + - + - + @@ -8119,7 +8119,7 @@ - + @@ -8157,7 +8157,7 @@ - + @@ -8423,7 +8423,7 @@ - + @@ -8480,9 +8480,9 @@ - + - + @@ -8817,7 +8817,7 @@ - + @@ -9017,7 +9017,7 @@ - + @@ -9231,7 +9231,7 @@ - + @@ -11396,7 +11396,7 @@ - + @@ -11420,7 +11420,7 @@ - + @@ -11430,7 +11430,7 @@ - + @@ -27089,7 +27089,7 @@ - + @@ -27232,7 +27232,7 @@ - + @@ -27867,7 +27867,7 @@ - + @@ -31730,7 +31730,7 @@ - + @@ -31924,7 +31924,7 @@ - + @@ -31984,7 +31984,7 @@ - + @@ -32421,7 +32421,7 @@ - + @@ -32570,13 +32570,13 @@ - + - + @@ -32918,7 +32918,7 @@ - + @@ -33702,7 +33702,7 @@ - + @@ -34474,7 +34474,7 @@ - + @@ -34514,7 +34514,7 @@ - + @@ -34781,7 +34781,7 @@ - + @@ -35262,9 +35262,9 @@ - + - + @@ -35294,7 +35294,7 @@ - + @@ -35645,7 +35645,7 @@ - + @@ -35792,7 +35792,7 @@ - + diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi index a0bce9e2..cf85ca0f 100644 --- a/tests/data/test-annotate/test17-pr19027.so.abi +++ b/tests/data/test-annotate/test17-pr19027.so.abi @@ -1,4 +1,4 @@ - + @@ -518,7 +518,7 @@ - + @@ -996,7 +996,7 @@ - + @@ -2341,7 +2341,7 @@ - + @@ -2730,7 +2730,7 @@ - + @@ -2883,7 +2883,7 @@ - + @@ -13738,7 +13738,7 @@ - + @@ -14366,7 +14366,7 @@ - + @@ -15179,7 +15179,7 @@ - + @@ -15331,7 +15331,7 @@ - + @@ -16650,7 +16650,7 @@ - + @@ -26174,7 +26174,7 @@ - + @@ -26381,7 +26381,7 @@ - + @@ -26447,15 +26447,15 @@ - + - + - + - + - + @@ -26605,19 +26605,19 @@ - + - + - + - + - + - + - + @@ -26887,7 +26887,7 @@ - + @@ -26923,7 +26923,7 @@ - + @@ -27207,7 +27207,7 @@ - + @@ -27308,7 +27308,7 @@ - + @@ -27369,7 +27369,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 1dcf4c97..11d0c845 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 @@ -1,4 +1,4 @@ - + @@ -866,7 +866,7 @@ - + @@ -5564,7 +5564,7 @@ - + @@ -5690,7 +5690,7 @@ - + @@ -8330,11 +8330,11 @@ - + - + @@ -8744,7 +8744,7 @@ - + @@ -10014,7 +10014,7 @@ - + @@ -12511,7 +12511,7 @@ - + @@ -13860,7 +13860,7 @@ - + @@ -13895,59 +13895,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 0c5063b8..7cc6f1a8 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 @@ -1,4 +1,4 @@ - + @@ -1576,9 +1576,9 @@ - + - + @@ -1594,7 +1594,7 @@ - + @@ -2194,7 +2194,7 @@ - + @@ -2259,7 +2259,7 @@ - + @@ -2299,7 +2299,7 @@ - + @@ -2533,7 +2533,7 @@ - + @@ -2549,7 +2549,7 @@ - + @@ -2623,7 +2623,7 @@ - + @@ -2938,7 +2938,7 @@ - + @@ -3058,7 +3058,7 @@ - + @@ -3174,7 +3174,7 @@ - + @@ -3198,7 +3198,7 @@ - + @@ -3231,7 +3231,7 @@ - + @@ -11970,7 +11970,7 @@ - + @@ -13501,7 +13501,7 @@ - + @@ -13597,7 +13597,7 @@ - + @@ -13902,7 +13902,7 @@ - + @@ -14024,7 +14024,7 @@ - + @@ -14725,7 +14725,7 @@ - + @@ -14776,7 +14776,7 @@ - + @@ -14901,7 +14901,7 @@ - + @@ -15425,7 +15425,7 @@ - + @@ -15508,7 +15508,7 @@ - + @@ -16488,7 +16488,7 @@ - + @@ -16784,7 +16784,7 @@ - + @@ -17529,7 +17529,7 @@ - + @@ -17595,7 +17595,7 @@ - + @@ -17622,7 +17622,7 @@ - + @@ -17702,7 +17702,7 @@ - + @@ -17883,7 +17883,7 @@ - + @@ -17952,7 +17952,7 @@ - + @@ -17969,7 +17969,7 @@ - + @@ -18688,7 +18688,7 @@ - + @@ -18933,7 +18933,7 @@ - + @@ -24766,7 +24766,7 @@ - + diff --git a/tests/data/test-annotate/test2.so.abi b/tests/data/test-annotate/test2.so.abi index cc40ccd0..e22fa04b 100644 --- a/tests/data/test-annotate/test2.so.abi +++ b/tests/data/test-annotate/test2.so.abi @@ -1,4 +1,4 @@ - + @@ -23,7 +23,7 @@ - + @@ -74,7 +74,7 @@ - + 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 637253f2..25f3707c 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 @@ -1,4 +1,4 @@ - + @@ -752,7 +752,7 @@ - + @@ -7873,7 +7873,7 @@ - + @@ -8006,7 +8006,7 @@ - + @@ -11319,7 +11319,7 @@ - + @@ -11596,7 +11596,7 @@ - + @@ -17835,7 +17835,7 @@ - + @@ -19213,7 +19213,7 @@ - + @@ -19223,7 +19223,7 @@ - + @@ -19271,7 +19271,7 @@ - + @@ -22262,7 +22262,7 @@ - + @@ -22509,7 +22509,7 @@ - + @@ -22666,7 +22666,7 @@ - + diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi index 4bf3a6c8..460bed11 100644 --- a/tests/data/test-annotate/test21-pr19092.so.abi +++ b/tests/data/test-annotate/test21-pr19092.so.abi @@ -1,4 +1,4 @@ - + @@ -889,9 +889,9 @@ - + - + @@ -2994,7 +2994,7 @@ - + @@ -3474,7 +3474,7 @@ - + @@ -4214,7 +4214,7 @@ - + @@ -4281,7 +4281,7 @@ - + @@ -4392,7 +4392,7 @@ - + @@ -4661,7 +4661,7 @@ - + @@ -4993,7 +4993,7 @@ - + @@ -5157,7 +5157,7 @@ - + @@ -5195,7 +5195,7 @@ - + @@ -6764,7 +6764,7 @@ - + @@ -7094,7 +7094,7 @@ - + @@ -7228,7 +7228,7 @@ - + @@ -7360,7 +7360,7 @@ - + @@ -7812,7 +7812,7 @@ - + @@ -7882,7 +7882,7 @@ - + @@ -7973,7 +7973,7 @@ - + @@ -8196,7 +8196,7 @@ - + @@ -8770,7 +8770,7 @@ - + @@ -10782,7 +10782,7 @@ - + @@ -10878,7 +10878,7 @@ - + @@ -10979,7 +10979,7 @@ - + @@ -11077,7 +11077,7 @@ - + @@ -11164,7 +11164,7 @@ - + @@ -11188,7 +11188,7 @@ - + @@ -11779,7 +11779,7 @@ - + @@ -11906,9 +11906,9 @@ - + - + @@ -11957,7 +11957,7 @@ - + @@ -11968,7 +11968,7 @@ - + @@ -12138,7 +12138,7 @@ - + @@ -12147,7 +12147,7 @@ - + @@ -12163,7 +12163,7 @@ - + @@ -12179,7 +12179,7 @@ - + @@ -12294,7 +12294,7 @@ - + @@ -12628,7 +12628,7 @@ - + @@ -12877,7 +12877,7 @@ - + @@ -12897,7 +12897,7 @@ - + @@ -12910,11 +12910,11 @@ - + - + @@ -12943,6 +12943,6 @@ - + diff --git a/tests/data/test-annotate/test3.so.abi b/tests/data/test-annotate/test3.so.abi index cbcb456d..ce8d4da5 100644 --- a/tests/data/test-annotate/test3.so.abi +++ b/tests/data/test-annotate/test3.so.abi @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/tests/data/test-annotate/test4.so.abi b/tests/data/test-annotate/test4.so.abi index f631f3b8..bc77a28f 100644 --- a/tests/data/test-annotate/test4.so.abi +++ b/tests/data/test-annotate/test4.so.abi @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + diff --git a/tests/data/test-annotate/test5.o.abi b/tests/data/test-annotate/test5.o.abi index d042f206..3d958da4 100644 --- a/tests/data/test-annotate/test5.o.abi +++ b/tests/data/test-annotate/test5.o.abi @@ -1,9 +1,9 @@ - + - + diff --git a/tests/data/test-annotate/test6.so.abi b/tests/data/test-annotate/test6.so.abi index 99fe07be..d74b1736 100644 --- a/tests/data/test-annotate/test6.so.abi +++ b/tests/data/test-annotate/test6.so.abi @@ -1,4 +1,4 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi index 014e7d2b..d37db76f 100644 --- a/tests/data/test-annotate/test7.so.abi +++ b/tests/data/test-annotate/test7.so.abi @@ -1,9 +1,9 @@ - + - + diff --git a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi index ff994fdf..927fa3e7 100644 --- a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi +++ b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ - + 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 c9a7bc08..7e533391 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 @@ - + @@ -114,7 +114,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -775,12 +775,12 @@ - + - + @@ -807,7 +807,7 @@ - + @@ -3037,7 +3037,7 @@ - + @@ -3056,7 +3056,7 @@ - + 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 ba6f1b06..c44ddde9 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 @@ - + @@ -321,7 +321,7 @@ - + @@ -5253,7 +5253,7 @@ - + @@ -6001,7 +6001,7 @@ - + @@ -6204,7 +6204,7 @@ - + @@ -7916,7 +7916,7 @@ - + @@ -10508,7 +10508,7 @@ - + @@ -10789,14 +10789,14 @@ - + - + @@ -11002,7 +11002,7 @@ - + @@ -11359,7 +11359,7 @@ - + @@ -11795,7 +11795,7 @@ - + @@ -11909,7 +11909,7 @@ - + diff --git a/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi b/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi index f9fa8e5a..17cdfaca 100644 --- a/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi +++ b/tests/data/test-diff-suppr/libtest48-soname-abixml-v0.so.abi @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi b/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi index 060ceb4c..fd035400 100644 --- a/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi +++ b/tests/data/test-diff-suppr/libtest48-soname-abixml-v1.so.abi @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + 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 1fc1578e..8e8178a9 100644 --- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi +++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi @@ -1,4 +1,4 @@ - + @@ -135,7 +135,7 @@ - + @@ -3515,7 +3515,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi index a90c17df..d5d9ecf1 100644 --- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi +++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi @@ -1,4 +1,4 @@ - + @@ -244,7 +244,7 @@ - + @@ -2440,7 +2440,7 @@ - + @@ -2912,7 +2912,7 @@ - + @@ -3289,7 +3289,7 @@ - + @@ -3920,7 +3920,7 @@ - + @@ -4215,7 +4215,7 @@ - + @@ -4958,7 +4958,7 @@ - + @@ -5274,7 +5274,7 @@ - + @@ -5492,7 +5492,7 @@ - + @@ -5885,7 +5885,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi index 5271d003..0c948194 100644 --- a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi +++ b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi index 254c3678..ed68bf68 100644 --- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi +++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi @@ -1,4 +1,4 @@ - + @@ -42,7 +42,7 @@ - + @@ -11483,7 +11483,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi index 24e7feff..75280788 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 @@ -1,4 +1,4 @@ - + @@ -90,7 +90,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -413,7 +413,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -483,7 +483,7 @@ - + @@ -759,7 +759,7 @@ - + @@ -769,7 +769,7 @@ - + @@ -785,7 +785,7 @@ - + @@ -915,7 +915,7 @@ - + @@ -955,14 +955,14 @@ - + - + @@ -976,20 +976,20 @@ - + - + - + @@ -1003,7 +1003,7 @@ - + @@ -1100,7 +1100,7 @@ - + @@ -1150,13 +1150,13 @@ - + - + @@ -1167,7 +1167,7 @@ - + @@ -1176,7 +1176,7 @@ - + @@ -1185,13 +1185,13 @@ - + - + @@ -1210,7 +1210,7 @@ - + @@ -1220,7 +1220,7 @@ - + @@ -1270,7 +1270,7 @@ - + @@ -1333,7 +1333,7 @@ - + @@ -1344,7 +1344,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi index 5e0ae2a7..a0b7a819 100644 --- a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi +++ b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi index 29e70595..ec22d3dd 100644 --- a/tests/data/test-read-dwarf/libtest23.so.abi +++ b/tests/data/test-read-dwarf/libtest23.so.abi @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + @@ -730,7 +730,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 ec67f013..f684a988 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 @@ -1,4 +1,4 @@ - + @@ -11,7 +11,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 98b691bb..e39813a6 100644 --- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi +++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o.abi b/tests/data/test-read-dwarf/test-PR26568-1.o.abi index 867fe229..6bb57df6 100644 --- a/tests/data/test-read-dwarf/test-PR26568-1.o.abi +++ b/tests/data/test-read-dwarf/test-PR26568-1.o.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o.abi b/tests/data/test-read-dwarf/test-PR26568-2.o.abi index c6eda38e..86ba8826 100644 --- a/tests/data/test-read-dwarf/test-PR26568-2.o.abi +++ b/tests/data/test-read-dwarf/test-PR26568-2.o.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi index 776260b1..0ee423dc 100644 --- a/tests/data/test-read-dwarf/test-libandroid.so.abi +++ b/tests/data/test-read-dwarf/test-libandroid.so.abi @@ -1,4 +1,4 @@ - + @@ -302,7 +302,7 @@ - + @@ -2407,7 +2407,7 @@ - + @@ -2582,11 +2582,11 @@ - + - + @@ -17011,7 +17011,7 @@ - + @@ -18100,13 +18100,13 @@ - + - + - + @@ -18140,13 +18140,13 @@ - + - + - + @@ -18457,7 +18457,7 @@ - + @@ -18479,7 +18479,7 @@ - + @@ -18489,7 +18489,7 @@ - + @@ -18540,7 +18540,7 @@ - + @@ -18756,7 +18756,7 @@ - + @@ -19921,7 +19921,7 @@ - + @@ -33093,7 +33093,7 @@ - + @@ -33199,7 +33199,7 @@ - + @@ -36950,7 +36950,7 @@ - + @@ -36974,7 +36974,7 @@ - + @@ -37478,6 +37478,6 @@ - + diff --git a/tests/data/test-read-dwarf/test0.abi b/tests/data/test-read-dwarf/test0.abi index 1204139e..d708d8c1 100644 --- a/tests/data/test-read-dwarf/test0.abi +++ b/tests/data/test-read-dwarf/test0.abi @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/tests/data/test-read-dwarf/test0.hash.abi b/tests/data/test-read-dwarf/test0.hash.abi index c380c80b..2dfdf314 100644 --- a/tests/data/test-read-dwarf/test0.hash.abi +++ b/tests/data/test-read-dwarf/test0.hash.abi @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi index 6ca36ea6..1dd31730 100644 --- a/tests/data/test-read-dwarf/test1.abi +++ b/tests/data/test-read-dwarf/test1.abi @@ -1,4 +1,4 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/tests/data/test-read-dwarf/test1.hash.abi b/tests/data/test-read-dwarf/test1.hash.abi index aa344d4d..b13336a0 100644 --- a/tests/data/test-read-dwarf/test1.hash.abi +++ b/tests/data/test-read-dwarf/test1.hash.abi @@ -1,4 +1,4 @@ - + @@ -34,7 +34,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 c6fa1034..d4c24a87 100644 --- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi +++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi @@ -1,4 +1,4 @@ - + @@ -410,7 +410,7 @@ - + @@ -2376,7 +2376,7 @@ - + @@ -5532,7 +5532,7 @@ - + @@ -5657,7 +5657,7 @@ - + @@ -5828,7 +5828,7 @@ - + @@ -5865,7 +5865,7 @@ - + @@ -5895,7 +5895,7 @@ - + @@ -6114,6 +6114,6 @@ - + diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi index 1aa056ef..a3edbd1b 100644 --- a/tests/data/test-read-dwarf/test11-pr18828.so.abi +++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi @@ -1,4 +1,4 @@ - + @@ -633,7 +633,7 @@ - + diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi index 81dac4ee..409993e3 100644 --- a/tests/data/test-read-dwarf/test12-pr18844.so.abi +++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi @@ -1,4 +1,4 @@ - + @@ -1719,7 +1719,7 @@ - + @@ -25428,7 +25428,7 @@ - + @@ -25587,7 +25587,7 @@ - + diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi index 5efa92d3..d078079b 100644 --- a/tests/data/test-read-dwarf/test13-pr18894.so.abi +++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi @@ -1,4 +1,4 @@ - + @@ -240,7 +240,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -1414,7 +1414,7 @@ - + @@ -1454,7 +1454,7 @@ - + @@ -1481,7 +1481,7 @@ - + @@ -1906,7 +1906,7 @@ - + @@ -1917,7 +1917,7 @@ - + @@ -1977,7 +1977,7 @@ - + @@ -2153,7 +2153,7 @@ - + @@ -2228,7 +2228,7 @@ - + @@ -2260,14 +2260,14 @@ - + - + @@ -2395,7 +2395,7 @@ - + @@ -2425,7 +2425,7 @@ - + @@ -2438,7 +2438,7 @@ - + diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi index b16f72dd..58a3a0d5 100644 --- a/tests/data/test-read-dwarf/test14-pr18893.so.abi +++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi @@ -1,4 +1,4 @@ - + @@ -67,7 +67,7 @@ - + @@ -488,7 +488,7 @@ - + @@ -3055,7 +3055,7 @@ - + @@ -3207,7 +3207,7 @@ - + @@ -3657,9 +3657,9 @@ - + - + @@ -3842,7 +3842,7 @@ - + @@ -4610,11 +4610,11 @@ - + - + @@ -4669,15 +4669,15 @@ - + - + - + - + @@ -4837,7 +4837,7 @@ - + @@ -5068,17 +5068,17 @@ - + - + - + @@ -5152,14 +5152,14 @@ - + - + - + @@ -5211,18 +5211,18 @@ - + - + - + - + - + @@ -5249,7 +5249,7 @@ - + @@ -5303,7 +5303,7 @@ - + @@ -5424,9 +5424,9 @@ - + - + @@ -5653,7 +5653,7 @@ - + @@ -5748,21 +5748,21 @@ - + - + - + - + @@ -5928,13 +5928,13 @@ - + - + - + @@ -6061,16 +6061,16 @@ - + - + - + - + @@ -6111,7 +6111,7 @@ - + @@ -6215,10 +6215,10 @@ - + - + @@ -6279,23 +6279,23 @@ - + - + - + - + - + - + - + - + - + @@ -6823,7 +6823,7 @@ - + @@ -6835,7 +6835,7 @@ - + @@ -6923,7 +6923,7 @@ - + @@ -7008,7 +7008,7 @@ - + @@ -7107,7 +7107,7 @@ - + diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi index dd370815..42dd9331 100644 --- a/tests/data/test-read-dwarf/test15-pr18892.so.abi +++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi @@ -1,4 +1,4 @@ - + @@ -1524,7 +1524,7 @@ - + @@ -1537,9 +1537,9 @@ - + - + @@ -1735,7 +1735,7 @@ - + @@ -1749,7 +1749,7 @@ - + @@ -1783,7 +1783,7 @@ - + @@ -1824,7 +1824,7 @@ - + @@ -1875,7 +1875,7 @@ - + @@ -1902,7 +1902,7 @@ - + @@ -1911,7 +1911,7 @@ - + @@ -2387,9 +2387,9 @@ - + - + @@ -2737,7 +2737,7 @@ - + @@ -2926,9 +2926,9 @@ - + - + @@ -3024,9 +3024,9 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3287,7 +3287,7 @@ - + @@ -3637,7 +3637,7 @@ - + @@ -3722,12 +3722,12 @@ - + - + @@ -4267,7 +4267,7 @@ - + @@ -4280,7 +4280,7 @@ - + @@ -4334,7 +4334,7 @@ - + @@ -4349,7 +4349,7 @@ - + @@ -4493,11 +4493,11 @@ - + - + - + @@ -4672,7 +4672,7 @@ - + @@ -4693,7 +4693,7 @@ - + @@ -4875,7 +4875,7 @@ - + @@ -4909,9 +4909,9 @@ - + - + @@ -5124,7 +5124,7 @@ - + @@ -5261,7 +5261,7 @@ - + @@ -5403,7 +5403,7 @@ - + @@ -7046,7 +7046,7 @@ - + @@ -7061,13 +7061,13 @@ - + - + @@ -15713,7 +15713,7 @@ - + @@ -15793,7 +15793,7 @@ - + @@ -16162,7 +16162,7 @@ - + @@ -18812,7 +18812,7 @@ - + @@ -18932,7 +18932,7 @@ - + @@ -18973,7 +18973,7 @@ - + @@ -19256,7 +19256,7 @@ - + @@ -19346,11 +19346,11 @@ - + - + @@ -19568,7 +19568,7 @@ - + @@ -20084,7 +20084,7 @@ - + @@ -20551,7 +20551,7 @@ - + @@ -20574,7 +20574,7 @@ - + @@ -20737,7 +20737,7 @@ - + @@ -21046,9 +21046,9 @@ - + - + @@ -21065,7 +21065,7 @@ - + @@ -21295,7 +21295,7 @@ - + @@ -21390,7 +21390,7 @@ - + diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi index 47b20541..f4e98b80 100644 --- a/tests/data/test-read-dwarf/test16-pr18904.so.abi +++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi @@ -1,4 +1,4 @@ - + @@ -1615,9 +1615,9 @@ - + - + @@ -2177,7 +2177,7 @@ - + @@ -12098,9 +12098,9 @@ - + - + @@ -12185,7 +12185,7 @@ - + @@ -14260,7 +14260,7 @@ - + @@ -15714,7 +15714,7 @@ - + @@ -16935,7 +16935,7 @@ - + @@ -18235,7 +18235,7 @@ - + @@ -18397,9 +18397,9 @@ - + - + @@ -19059,7 +19059,7 @@ - + @@ -19370,7 +19370,7 @@ - + @@ -20970,7 +20970,7 @@ - + diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi index f98624d8..4f5bddd1 100644 --- a/tests/data/test-read-dwarf/test17-pr19027.so.abi +++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi @@ -1,4 +1,4 @@ - + @@ -265,7 +265,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1760,7 +1760,7 @@ - + @@ -1848,7 +1848,7 @@ - + @@ -9110,7 +9110,7 @@ - + @@ -9453,7 +9453,7 @@ - + @@ -10013,7 +10013,7 @@ - + @@ -10156,7 +10156,7 @@ - + @@ -11011,7 +11011,7 @@ - + @@ -17071,7 +17071,7 @@ - + @@ -17211,7 +17211,7 @@ - + @@ -17245,15 +17245,15 @@ - + - + - + - + - + @@ -17364,19 +17364,19 @@ - + - + - + - + - + - + - + @@ -17551,7 +17551,7 @@ - + @@ -17572,7 +17572,7 @@ - + @@ -17739,7 +17739,7 @@ - + @@ -17795,7 +17795,7 @@ - + @@ -17829,7 +17829,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 926490b3..f7a467a9 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 @@ -1,4 +1,4 @@ - + @@ -450,7 +450,7 @@ - + @@ -3381,7 +3381,7 @@ - + @@ -3456,7 +3456,7 @@ - + @@ -5113,10 +5113,10 @@ - + - + @@ -5376,7 +5376,7 @@ - + @@ -6111,7 +6111,7 @@ - + @@ -7743,7 +7743,7 @@ - + @@ -8555,7 +8555,7 @@ - + @@ -8577,46 +8577,46 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 71f8a129..6a31ea43 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 @@ -1,4 +1,4 @@ - + @@ -794,9 +794,9 @@ - + - + @@ -806,7 +806,7 @@ - + @@ -1201,7 +1201,7 @@ - + @@ -1241,7 +1241,7 @@ - + @@ -1264,7 +1264,7 @@ - + @@ -1426,7 +1426,7 @@ - + @@ -1436,7 +1436,7 @@ - + @@ -1481,7 +1481,7 @@ - + @@ -1673,7 +1673,7 @@ - + @@ -1750,7 +1750,7 @@ - + @@ -1826,7 +1826,7 @@ - + @@ -1841,7 +1841,7 @@ - + @@ -1863,7 +1863,7 @@ - + @@ -7343,7 +7343,7 @@ - + @@ -8243,7 +8243,7 @@ - + @@ -8299,7 +8299,7 @@ - + @@ -8500,7 +8500,7 @@ - + @@ -8572,7 +8572,7 @@ - + @@ -8982,7 +8982,7 @@ - + @@ -9011,7 +9011,7 @@ - + @@ -9089,7 +9089,7 @@ - + @@ -9405,7 +9405,7 @@ - + @@ -9460,7 +9460,7 @@ - + @@ -10101,7 +10101,7 @@ - + @@ -10299,7 +10299,7 @@ - + @@ -10802,7 +10802,7 @@ - + @@ -10845,7 +10845,7 @@ - + @@ -10861,7 +10861,7 @@ - + @@ -10912,7 +10912,7 @@ - + @@ -11034,7 +11034,7 @@ - + @@ -11073,7 +11073,7 @@ - + @@ -11084,7 +11084,7 @@ - + @@ -11530,7 +11530,7 @@ - + @@ -11678,7 +11678,7 @@ - + @@ -15385,7 +15385,7 @@ - + diff --git a/tests/data/test-read-dwarf/test2.so.abi b/tests/data/test-read-dwarf/test2.so.abi index 98dd9a60..3c18f234 100644 --- a/tests/data/test-read-dwarf/test2.so.abi +++ b/tests/data/test-read-dwarf/test2.so.abi @@ -1,4 +1,4 @@ - + @@ -15,7 +15,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/tests/data/test-read-dwarf/test2.so.hash.abi b/tests/data/test-read-dwarf/test2.so.hash.abi index bb814f73..c49e9a82 100644 --- a/tests/data/test-read-dwarf/test2.so.hash.abi +++ b/tests/data/test-read-dwarf/test2.so.hash.abi @@ -1,4 +1,4 @@ - + @@ -15,7 +15,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi index f769ac40..9a00f6fe 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 @@ -1,4 +1,4 @@ - + @@ -386,7 +386,7 @@ - + @@ -4771,7 +4771,7 @@ - + @@ -4854,7 +4854,7 @@ - + @@ -6984,7 +6984,7 @@ - + @@ -7153,7 +7153,7 @@ - + @@ -10900,7 +10900,7 @@ - + @@ -11700,13 +11700,13 @@ - + - + @@ -11733,7 +11733,7 @@ - + @@ -13543,7 +13543,7 @@ - + @@ -13702,7 +13702,7 @@ - + @@ -13801,7 +13801,7 @@ - + diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi index cf635351..988e4cf8 100644 --- a/tests/data/test-read-dwarf/test21-pr19092.so.abi +++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi @@ -1,4 +1,4 @@ - + @@ -449,9 +449,9 @@ - + - + @@ -1861,7 +1861,7 @@ - + @@ -2158,7 +2158,7 @@ - + @@ -2872,7 +2872,7 @@ - + @@ -2919,7 +2919,7 @@ - + @@ -2981,7 +2981,7 @@ - + @@ -3133,7 +3133,7 @@ - + @@ -3342,7 +3342,7 @@ - + @@ -3433,7 +3433,7 @@ - + @@ -3456,7 +3456,7 @@ - + @@ -4570,7 +4570,7 @@ - + @@ -4755,7 +4755,7 @@ - + @@ -4832,7 +4832,7 @@ - + @@ -4910,7 +4910,7 @@ - + @@ -5164,7 +5164,7 @@ - + @@ -5203,7 +5203,7 @@ - + @@ -5255,7 +5255,7 @@ - + @@ -5386,7 +5386,7 @@ - + @@ -5785,7 +5785,7 @@ - + @@ -7148,7 +7148,7 @@ - + @@ -7202,7 +7202,7 @@ - + @@ -7260,7 +7260,7 @@ - + @@ -7317,7 +7317,7 @@ - + @@ -7367,7 +7367,7 @@ - + @@ -7382,7 +7382,7 @@ - + @@ -7802,7 +7802,7 @@ - + @@ -7882,9 +7882,9 @@ - + - + @@ -7912,14 +7912,14 @@ - + - + @@ -8012,13 +8012,13 @@ - + - + @@ -8028,7 +8028,7 @@ - + @@ -8038,7 +8038,7 @@ - + @@ -8108,7 +8108,7 @@ - + @@ -8316,7 +8316,7 @@ - + @@ -8479,7 +8479,7 @@ - + @@ -8491,7 +8491,7 @@ - + @@ -8499,10 +8499,10 @@ - + - + @@ -8519,6 +8519,6 @@ - + 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 807cf30f..1ad996a5 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 @@ -1,4 +1,4 @@ - + @@ -3670,7 +3670,7 @@ - + @@ -3952,9 +3952,9 @@ - + - + @@ -4037,7 +4037,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4123,7 +4123,7 @@ - + @@ -4287,7 +4287,7 @@ - + @@ -4297,7 +4297,7 @@ - + @@ -4310,20 +4310,20 @@ - + - + - + @@ -4334,7 +4334,7 @@ - + @@ -4676,9 +4676,9 @@ - + - + @@ -4688,7 +4688,7 @@ - + @@ -4696,7 +4696,7 @@ - + @@ -4731,7 +4731,7 @@ - + @@ -4838,9 +4838,9 @@ - + - + @@ -4899,7 +4899,7 @@ - + @@ -5063,12 +5063,12 @@ - + - + @@ -5086,7 +5086,7 @@ - + @@ -5103,7 +5103,7 @@ - + @@ -5113,19 +5113,19 @@ - + - + - + @@ -5161,7 +5161,7 @@ - + @@ -5205,7 +5205,7 @@ - + @@ -5241,7 +5241,7 @@ - + @@ -5297,9 +5297,9 @@ - + - + @@ -5315,7 +5315,7 @@ - + @@ -5363,7 +5363,7 @@ - + @@ -5373,13 +5373,13 @@ - + - + @@ -5390,20 +5390,20 @@ - + - + - + @@ -5486,7 +5486,7 @@ - + @@ -5548,7 +5548,7 @@ - + @@ -5603,7 +5603,7 @@ - + @@ -5621,7 +5621,7 @@ - + @@ -5704,12 +5704,12 @@ - + - + - + @@ -5813,7 +5813,7 @@ - + @@ -5924,7 +5924,7 @@ - + @@ -6062,7 +6062,7 @@ - + @@ -6092,7 +6092,7 @@ - + @@ -6486,7 +6486,7 @@ - + @@ -11083,7 +11083,7 @@ - + @@ -13020,9 +13020,9 @@ - + - + @@ -13107,9 +13107,9 @@ - + - + @@ -13192,9 +13192,9 @@ - + - + @@ -13279,7 +13279,7 @@ - + @@ -30396,7 +30396,7 @@ - + @@ -30576,7 +30576,7 @@ - + @@ -30818,7 +30818,7 @@ - + @@ -31438,7 +31438,7 @@ - + @@ -32694,7 +32694,7 @@ - + @@ -34028,10 +34028,10 @@ - + - + @@ -34843,7 +34843,7 @@ - + @@ -34861,7 +34861,7 @@ - + @@ -34871,7 +34871,7 @@ - + @@ -36027,7 +36027,7 @@ - + @@ -36036,7 +36036,7 @@ - + @@ -36129,7 +36129,7 @@ - + @@ -36177,7 +36177,7 @@ - + @@ -36214,7 +36214,7 @@ - + @@ -36303,7 +36303,7 @@ - + @@ -36325,7 +36325,7 @@ - + @@ -36370,7 +36370,7 @@ - + @@ -36457,9 +36457,9 @@ - + - + @@ -37281,7 +37281,7 @@ - + @@ -38528,7 +38528,7 @@ - + @@ -40693,7 +40693,7 @@ - + @@ -41250,7 +41250,7 @@ - + @@ -41576,7 +41576,7 @@ - + @@ -42237,7 +42237,7 @@ - + @@ -42385,7 +42385,7 @@ - + @@ -42477,7 +42477,7 @@ - + @@ -42492,7 +42492,7 @@ - + @@ -42527,7 +42527,7 @@ - + @@ -42620,12 +42620,12 @@ - + - + @@ -42755,10 +42755,10 @@ - + - + @@ -42860,7 +42860,7 @@ - + @@ -43216,7 +43216,7 @@ - + @@ -43250,7 +43250,7 @@ - + @@ -43308,7 +43308,7 @@ - + @@ -44043,7 +44043,7 @@ - + @@ -44080,7 +44080,7 @@ - + @@ -44118,7 +44118,7 @@ - + @@ -49640,7 +49640,7 @@ - + @@ -49652,11 +49652,11 @@ - + - + - + @@ -49701,7 +49701,7 @@ - + @@ -50167,7 +50167,7 @@ - + @@ -50411,7 +50411,7 @@ - + @@ -50629,7 +50629,7 @@ - + @@ -50848,7 +50848,7 @@ - + @@ -51401,7 +51401,7 @@ - + @@ -51778,7 +51778,7 @@ - + @@ -51792,7 +51792,7 @@ - + @@ -51814,7 +51814,7 @@ - + @@ -52636,7 +52636,7 @@ - + @@ -52722,7 +52722,7 @@ - + @@ -53417,7 +53417,7 @@ - + @@ -53993,7 +53993,7 @@ - + @@ -54009,7 +54009,7 @@ - + @@ -54365,7 +54365,7 @@ - + @@ -54641,7 +54641,7 @@ - + @@ -54666,7 +54666,7 @@ - + @@ -54700,9 +54700,9 @@ - + - + @@ -54769,7 +54769,7 @@ - + @@ -54790,7 +54790,7 @@ - + @@ -54802,11 +54802,11 @@ - + - + diff --git a/tests/data/test-read-dwarf/test3.so.abi b/tests/data/test-read-dwarf/test3.so.abi index 7357a740..a8e4c9fb 100644 --- a/tests/data/test-read-dwarf/test3.so.abi +++ b/tests/data/test-read-dwarf/test3.so.abi @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/tests/data/test-read-dwarf/test3.so.hash.abi b/tests/data/test-read-dwarf/test3.so.hash.abi index e01f3959..bbb8ec20 100644 --- a/tests/data/test-read-dwarf/test3.so.hash.abi +++ b/tests/data/test-read-dwarf/test3.so.hash.abi @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/tests/data/test-read-dwarf/test4.so.abi b/tests/data/test-read-dwarf/test4.so.abi index f5907099..451e90b6 100644 --- a/tests/data/test-read-dwarf/test4.so.abi +++ b/tests/data/test-read-dwarf/test4.so.abi @@ -1,11 +1,11 @@ - + - + diff --git a/tests/data/test-read-dwarf/test4.so.hash.abi b/tests/data/test-read-dwarf/test4.so.hash.abi index 446df1da..52652bf7 100644 --- a/tests/data/test-read-dwarf/test4.so.hash.abi +++ b/tests/data/test-read-dwarf/test4.so.hash.abi @@ -1,11 +1,11 @@ - + - + diff --git a/tests/data/test-read-dwarf/test5.o.abi b/tests/data/test-read-dwarf/test5.o.abi index feee01ff..be33eb82 100644 --- a/tests/data/test-read-dwarf/test5.o.abi +++ b/tests/data/test-read-dwarf/test5.o.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/test5.o.hash.abi b/tests/data/test-read-dwarf/test5.o.hash.abi index 9ed9932a..e7dd68a1 100644 --- a/tests/data/test-read-dwarf/test5.o.hash.abi +++ b/tests/data/test-read-dwarf/test5.o.hash.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/test6.so.abi b/tests/data/test-read-dwarf/test6.so.abi index 65b32b2a..6b3d0460 100644 --- a/tests/data/test-read-dwarf/test6.so.abi +++ b/tests/data/test-read-dwarf/test6.so.abi @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/tests/data/test-read-dwarf/test6.so.hash.abi b/tests/data/test-read-dwarf/test6.so.hash.abi index 376e5912..d7cb3b27 100644 --- a/tests/data/test-read-dwarf/test6.so.hash.abi +++ b/tests/data/test-read-dwarf/test6.so.hash.abi @@ -1,4 +1,4 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi index a5f3ff6c..845c7b9d 100644 --- a/tests/data/test-read-dwarf/test7.so.abi +++ b/tests/data/test-read-dwarf/test7.so.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi index a21810fe..7f3167d1 100644 --- a/tests/data/test-read-dwarf/test7.so.hash.abi +++ b/tests/data/test-read-dwarf/test7.so.hash.abi @@ -1,8 +1,8 @@ - + - + diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi index 5822e79e..b3ce70af 100644 --- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi +++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi index d9af5bc1..87243ada 100644 --- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi +++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi index 88844186..edc136b4 100644 --- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi +++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi @@ -1,4 +1,4 @@ - + @@ -346,7 +346,7 @@ - + @@ -1840,7 +1840,7 @@ - + @@ -4788,7 +4788,7 @@ - + @@ -5006,7 +5006,7 @@ - + @@ -5138,7 +5138,7 @@ - + @@ -5175,7 +5175,7 @@ - + @@ -5265,7 +5265,7 @@ - + @@ -5492,6 +5492,6 @@ - + diff --git a/tests/data/test-read-write/test0.xml b/tests/data/test-read-write/test0.xml index 6f431114..397bf24a 100644 --- a/tests/data/test-read-write/test0.xml +++ b/tests/data/test-read-write/test0.xml @@ -1,3 +1,3 @@ - + diff --git a/tests/data/test-read-write/test1.xml b/tests/data/test-read-write/test1.xml index cf91c295..f0523a0a 100644 --- a/tests/data/test-read-write/test1.xml +++ b/tests/data/test-read-write/test1.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test10.xml b/tests/data/test-read-write/test10.xml index e539b7e7..838c9d63 100644 --- a/tests/data/test-read-write/test10.xml +++ b/tests/data/test-read-write/test10.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test11.xml b/tests/data/test-read-write/test11.xml index 4720f4c4..5f4b0583 100644 --- a/tests/data/test-read-write/test11.xml +++ b/tests/data/test-read-write/test11.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test12.xml b/tests/data/test-read-write/test12.xml index 76e1cfa0..b075b81f 100644 --- a/tests/data/test-read-write/test12.xml +++ b/tests/data/test-read-write/test12.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test13.xml b/tests/data/test-read-write/test13.xml index 42cad52b..c605100d 100644 --- a/tests/data/test-read-write/test13.xml +++ b/tests/data/test-read-write/test13.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test14.xml b/tests/data/test-read-write/test14.xml index 248f203b..1a406e29 100644 --- a/tests/data/test-read-write/test14.xml +++ b/tests/data/test-read-write/test14.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test15.xml b/tests/data/test-read-write/test15.xml index 8e7230d8..47cd508d 100644 --- a/tests/data/test-read-write/test15.xml +++ b/tests/data/test-read-write/test15.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test16.xml b/tests/data/test-read-write/test16.xml index 2141db43..7218c5a3 100644 --- a/tests/data/test-read-write/test16.xml +++ b/tests/data/test-read-write/test16.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test17.xml b/tests/data/test-read-write/test17.xml index 9e3bcd63..2b4344ea 100644 --- a/tests/data/test-read-write/test17.xml +++ b/tests/data/test-read-write/test17.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test18.xml b/tests/data/test-read-write/test18.xml index 7e80d81a..01a535a8 100644 --- a/tests/data/test-read-write/test18.xml +++ b/tests/data/test-read-write/test18.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test19.xml b/tests/data/test-read-write/test19.xml index 25823a7e..a502addd 100644 --- a/tests/data/test-read-write/test19.xml +++ b/tests/data/test-read-write/test19.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test2.xml b/tests/data/test-read-write/test2.xml index ab768241..1c7251bf 100644 --- a/tests/data/test-read-write/test2.xml +++ b/tests/data/test-read-write/test2.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test20.xml b/tests/data/test-read-write/test20.xml index acd23e68..be98cae6 100644 --- a/tests/data/test-read-write/test20.xml +++ b/tests/data/test-read-write/test20.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test21.xml b/tests/data/test-read-write/test21.xml index bf3a53f3..a8ac9ded 100644 --- a/tests/data/test-read-write/test21.xml +++ b/tests/data/test-read-write/test21.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test22.xml b/tests/data/test-read-write/test22.xml index 3831ec2e..36549ff2 100644 --- a/tests/data/test-read-write/test22.xml +++ b/tests/data/test-read-write/test22.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test23.xml b/tests/data/test-read-write/test23.xml index 6fa9f166..59c22bee 100644 --- a/tests/data/test-read-write/test23.xml +++ b/tests/data/test-read-write/test23.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test24.xml b/tests/data/test-read-write/test24.xml index 9de704fb..bbeed98d 100644 --- a/tests/data/test-read-write/test24.xml +++ b/tests/data/test-read-write/test24.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test25.xml b/tests/data/test-read-write/test25.xml index ab842011..8f6ad94f 100644 --- a/tests/data/test-read-write/test25.xml +++ b/tests/data/test-read-write/test25.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test26.xml b/tests/data/test-read-write/test26.xml index b99e92c9..27f8acd2 100644 --- a/tests/data/test-read-write/test26.xml +++ b/tests/data/test-read-write/test26.xml @@ -1,10 +1,10 @@ - + - + diff --git a/tests/data/test-read-write/test27.xml b/tests/data/test-read-write/test27.xml index 0cb65c29..92d0e043 100644 --- a/tests/data/test-read-write/test27.xml +++ b/tests/data/test-read-write/test27.xml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + diff --git a/tests/data/test-read-write/test28-without-std-fns-ref.xml b/tests/data/test-read-write/test28-without-std-fns-ref.xml index b46f688f..8ca08e21 100644 --- a/tests/data/test-read-write/test28-without-std-fns-ref.xml +++ b/tests/data/test-read-write/test28-without-std-fns-ref.xml @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/tests/data/test-read-write/test28-without-std-vars-ref.xml b/tests/data/test-read-write/test28-without-std-vars-ref.xml index 2871a057..b92d9c3f 100644 --- a/tests/data/test-read-write/test28-without-std-vars-ref.xml +++ b/tests/data/test-read-write/test28-without-std-vars-ref.xml @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/tests/data/test-read-write/test3.xml b/tests/data/test-read-write/test3.xml index 8a07ce29..0436bf70 100644 --- a/tests/data/test-read-write/test3.xml +++ b/tests/data/test-read-write/test3.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test4.xml b/tests/data/test-read-write/test4.xml index 943dca5d..17324289 100644 --- a/tests/data/test-read-write/test4.xml +++ b/tests/data/test-read-write/test4.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test5.xml b/tests/data/test-read-write/test5.xml index 9ea75fbf..4c07fa06 100644 --- a/tests/data/test-read-write/test5.xml +++ b/tests/data/test-read-write/test5.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test6.xml b/tests/data/test-read-write/test6.xml index c3d53cea..b0fd6634 100644 --- a/tests/data/test-read-write/test6.xml +++ b/tests/data/test-read-write/test6.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test7.xml b/tests/data/test-read-write/test7.xml index 0497126b..6b2d4eea 100644 --- a/tests/data/test-read-write/test7.xml +++ b/tests/data/test-read-write/test7.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test8.xml b/tests/data/test-read-write/test8.xml index 09c335d9..4e18e813 100644 --- a/tests/data/test-read-write/test8.xml +++ b/tests/data/test-read-write/test8.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-read-write/test9.xml b/tests/data/test-read-write/test9.xml index acf0cf25..70356f6d 100644 --- a/tests/data/test-read-write/test9.xml +++ b/tests/data/test-read-write/test9.xml @@ -1,4 +1,4 @@ - + diff --git a/tools/abidiff.cc b/tools/abidiff.cc index 666f8d57..f0820de2 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -1005,6 +1005,26 @@ handle_error(abigail::dwarf_reader::status status_code, return abigail::tools_utils::ABIDIFF_OK; } +/// Emit an error message saying that the two files have incompatible +/// format versions. +/// +/// @param file_path1 the first file path to consider. +/// +/// @param file_path2 the second file path to consider. +/// +/// @param prog_name the name of the current program. +static void +emit_incompatible_format_version_error_message(const string& file_path1, + const string& file_path2, + const string& prog_name) +{ + emit_prefix(prog_name, cerr) + << "incompatible format version between the two input files:\n" + << "'" << file_path1 << "'\n" + << "and\n" + << "'" << file_path2 << "'\n" ; +} + int main(int argc, char* argv[]) { @@ -1286,6 +1306,15 @@ main(int argc, char* argv[]) return abigail::tools_utils::ABIDIFF_OK; } + if (c1->get_format_major_version_number() + != c2->get_format_major_version_number()) + { + emit_incompatible_format_version_error_message(opts.file1, + opts.file2, + argv[0]); + return abigail::tools_utils::ABIDIFF_ERROR; + } + set_corpus_keep_drop_regex_patterns(opts, c1); set_corpus_keep_drop_regex_patterns(opts, c2); @@ -1308,6 +1337,15 @@ main(int argc, char* argv[]) return abigail::tools_utils::ABIDIFF_OK; } + if (g1->get_format_major_version_number() + != g2->get_format_major_version_number()) + { + emit_incompatible_format_version_error_message(opts.file1, + opts.file2, + argv[0]); + return abigail::tools_utils::ABIDIFF_ERROR; + } + adjust_diff_context_for_kmidiff(*ctxt); corpus_diff_sptr diff = compute_diff(g1, g2, ctxt);