From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 64B103858415 for ; Fri, 1 Dec 2023 15:55:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 64B103858415 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 64B103858415 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701446123; cv=none; b=Yd61cci/eWlHtErxJN7CGRZw4Q7N2awEIXfEAxJQkPDy3m4nCM/EXTYSiUF3gWtJmoksalGCUB5Or+9QDHAGw4ktpp3vY6Zb7oyGeTVtqyMeLMcEIWzGJzkl0q2k7fjC/GlUJqJLlzTKpMkLk9+Zzas8AjDKQ1X6FIS8FJJ4K2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701446123; c=relaxed/simple; bh=GurEu8dr7h2aJ13vE9Rle0597v/DmxvKFusO8L7T0hk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sQ6iCOsGTXlmn0nOW4a7eyhoQAYEiSYGn4UyOWCQzX9RJg6BCuYXA8t3i9KQ5mfBLmOFFSG0z8UvdcN5kp4EJzN98rrCbIhfg6qaW6tfT2L+tHEQFHf6nHbMrzjhOni7/nogz9gAeb8Bwm+ArkRRtsnzQPiPyRV9cwWN14kgu8E= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701446113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GVHQJWUVzspGyEWBAOcUN+FB6f5HbbUo5wRthPH9ynA=; b=F8OzRA7PmihXwF43nNAIZQZuXTXU+55scRTHpLJc7SWCtA16CW1BaiZtio1/skk6tMXoVT EUtSG6ePisg8An3x0om2kXtYu4LfoqIxiTQnlDO1KiLIRZAq2bCCZnIkJQD3FKEQvzkQK8 9eQChz4ZxWiiM/1ECdwEIXxbGoTSESE= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-130-qXDKrHwzO8Cq1Ls9ixvadQ-1; Fri, 01 Dec 2023 10:54:47 -0500 X-MC-Unique: qXDKrHwzO8Cq1Ls9ixvadQ-1 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2c9b18161b6so25671371fa.3 for ; Fri, 01 Dec 2023 07:54:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701446084; x=1702050884; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:organization:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5OVnZ6tv7qDurX4UBOSXhZRHN3WNAsZjp1TJ7dWD2bA=; b=Y7DyGHxPP5UQXavEC73px5mwFLDNhn+iW34/APwEZZc0GYr5x2jtGtChVwhzqMoRcb H1ZGV/HY2jlBjLkn/Ng0dJ5vYrOXTnz8Sx0GVk9W+JBqlacA/lxQ/2/+4p9eUXmlQTl6 9a/B1GDapZr5i4HImDLVymrdNZqhVNUG7tCxLJOrHN2Wj/seWseaass6UQQdVacK6Cta IgnAmy9Al+a+HDBI3Nck7HjD8zMVLWveG0pVP5N+ocfGuBUXwBPplP+FKaJJrv8f20ma D+WMFLN+HP5XJ1ZUSLD4JwCLdIyJj0G12gu8P7pCvarzl8KqfT9+yIxEOxwXK+LbzXiR fwMw== X-Gm-Message-State: AOJu0YweCknexDYKVluPJEB6C4h94sfUjjpTeTw4qnAaXUFPvVTYL9Br +OcCY+r5y4/Nhbp4McjGLP6zCeFkYoNjQZrBO9lWPQTFbLqjg66E35cg2UNKGXYp7f3idIaN5wp idw/60R3SO6SarOgpIXv6ZbOgI+l/J/pMIUgdxtaBawiYgAhWBWGU1BuJes5/QqxQXnCVHuHMFb /T X-Received: by 2002:a05:6512:1250:b0:50b:c541:bcd7 with SMTP id fb16-20020a056512125000b0050bc541bcd7mr1344680lfb.60.1701446082699; Fri, 01 Dec 2023 07:54:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IEb03YZ6vtf9rXH2t+xG0ysE5GSjyRHEh2LSdWfH/5VNx1KCRoVd0723sL8FvbzNL/7IFs9sg== X-Received: by 2002:a05:6512:1250:b0:50b:c541:bcd7 with SMTP id fb16-20020a056512125000b0050bc541bcd7mr1344594lfb.60.1701446078731; Fri, 01 Dec 2023 07:54:38 -0800 (PST) Received: from localhost ([37.169.169.39]) by smtp.gmail.com with ESMTPSA id d9-20020a05600c34c900b0040b2c195523sm9645258wmq.31.2023.12.01.07.54.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 07:54:36 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 88B355077C43; Fri, 1 Dec 2023 16:54:04 +0100 (CET) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH 1/4, applied] Improve type naming Organization: Red Hat / France References: <87v89hncoo.fsf@redhat.com> X-Operating-System: AlmaLinux 9.2 X-URL: http://www.redhat.com Date: Fri, 01 Dec 2023 16:54:04 +0100 In-Reply-To: <87v89hncoo.fsf@redhat.com> (Dodji Seketeli's message of "Fri, 01 Dec 2023 16:51:35 +0100") Message-ID: <87r0k5nckj.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: quoted-printable List-Id: Hello, There are a number of glitches when pretty-printing type names. This is particularly true for derived types like pointer to functions, array of pointer to functions and the likes. For instance, we can see in tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt that a function N that takes no parameter and returns a pointer to an array of 7 int is pretty-printed as: int[7]* N() That obviously doesn't respect the type naming rules of C or C++. With this patch, function N is declared as: int(*N(void))[7] To learn more about the impact of the patch on how types are pretty-printed, you can look at the parts of the patch that are adjustments to the expected output of the regression tests. For instance, here is how the expected output of type pretty-printing in tests/data/test-abidiff-exit/PR30048-test-2 is modified by this patch: diff --git a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt b= /tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt index 2650b5a0..7bbbc2e2 100644 --- a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt +++ b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt @@ -3,22 +3,22 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Ad= ded variable 7 functions with some indirect sub-type change: - [C] 'function int[7]* N()' at PR30048-test-2-v0.cc:62:1 has some ind= irect sub-type changes: + [C] 'function int(*N(void))[7]' at PR30048-test-2-v0.cc:62:1 has som= e indirect sub-type changes: =09 return type changed: - entity changed from 'int[7]*' to 'int' + entity changed from 'int(*)[7]' to 'int' =09 type size changed from 64 to 32 (in bits) - [C] 'function int* O()' at PR30048-test-2-v0.cc:64:1 has some indire= ct sub-type changes: + [C] 'function int* O(void)' at PR30048-test-2-v0.cc:64:1 has some in= direct sub-type changes: =09 return type changed: =09 entity changed from 'int*' to 'int' =09 type size changed from 64 to 32 (in bits) - [C] 'function int ()* P()' at PR30048-test-2-v0.cc:67:1 has some ind= irect sub-type changes: + [C] 'function int (*P(void))(void)' at PR30048-test-2-v0.cc:67:1 has= some indirect sub-type changes: =09 return type changed: - entity changed from 'int ()*' to 'int' + entity changed from 'int (*)(void)' to 'int' =09 type size changed from 64 to 32 (in bits) Note that the change to the CTF test tests/data/test-read-ctf/test9.o.abi is triggered by a change in the sorting of types because types are sorted alphabetically. All in all, this is clearly an overdue improvement to the type name pretty-printing. =09* include/abg-fwd.h (is_npaf_type, is_pointer_to_function_type) =09(is_pointer_to_array_type, is_pointer_to_npaf_type): Declare new =09functions. =09(is_pointer_type, is_reference_type, is_array_type): Take a =09boolean parameter to look through qualifiers. =09* include/abg-ir.h (is_pointer_type): Do not make this function a =09friend of the type_or_decl_base class anymore. =09* src/abg-ir.cc (pointer_declaration_name, array_declaration_name) =09(stream_pretty_representation_of_fn_parms) =09(add_outer_pointer_to_fn_type_expr) =09(add_outer_pointer_to_array_type_expr): Define new static =09functions. =09(is_npaf_type, is_pointer_to_function_type) =09(is_pointer_to_array_type, is_pointer_to_npaf_type): Define new =09functions. =09(get_type_representation): Remove the overload for array_type_def. =09(get_function_type_name, get_method_type_name) =09(function_decl::get_pretty_representation_of_declarator): Use the =09new stream_pretty_representation_of_fn_parms. This actually =09factorizes parameters pretty-printing by reusing =09stream_pretty_representation_of_fn_parms. =09(is_pointer_type, is_reference_type, is_array_type): Take a =09boolean parameter to look through qualifiers. =09(is_void_pointer_type): Use const where it's due. =09(pointer_type_def::get_qualified_name): Use the new =09pointer_declaration_name in lieu of the old and removed =09get_name_of_pointer_to_type. =09(array_type_def::{get_pretty_representation, get_qualified_name}): =09Use the new array_declaration_name instead of the old and removed =09get_type_representation. =09(var_decl::get_pretty_representation): Use the new =09array_declaration_name and pointer_declaration_name. =09(function_decl::get_pretty_representation): Use the new =09add_outer_pointer_to_array_type_expr, and =09add_outer_pointer_to_array_type_expr function to support the =09proper syntax for function returning pointers and arrays. =09(function_decl::parameter::get_pretty_representation): Fix the =09pretty-printing of each function parameter. =09* tests/data/test-abicompat/test0-fn-changed-report-0.txt: Adjust. =09* tests/data/test-abicompat/test0-fn-changed-report-2.txt: =09Likewise. =09* tests/data/test-abicompat/test1-fn-removed-report-0.txt: =09Likewise. =09* tests/data/test-abicompat/test3-fn-removed-report-0.txt: =09Likewise. =09* tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt: Likewise. =09* tests/data/test-abidiff-exit/PR30048-test-report-0.txt: Likewise. =09* tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt: Likewise. =09* tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-repor= t.txt: Likewise. =09* tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada= -subrange-report-1.txt: Likewise. =09* tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ada= -subrange-report-2.txt: Likewise. =09* tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-fun-param-report.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-leaf-more-report.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-leaf-peeling-report.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-leaf-stats-report.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-net-change-report0.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test-net-change-report2.txt: =09Likewise. =09* tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt: =09Likewise. =09* tests/data/test-abidiff/test-PR18791-report0.txt: Likewise. =09* tests/data/test-abidiff/test-crc-report-0-1.txt: Likewise. =09* tests/data/test-abidiff/test-crc-report-1-0.txt: Likewise. =09* tests/data/test-abidiff/test-crc-report-1-2.txt: Likewise. =09* tests/data/test-annotate/test13-pr18894.so.abi: Likewise. =09* tests/data/test-annotate/test14-pr18893.so.abi: Likewise. =09* tests/data/test-annotate/test15-pr18892.so.abi: Likewise. =09* tests/data/test-annotate/test17-pr19027.so.abi: Likewise. =09* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: =09Likewise. =09* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.ab= i: =09Likewise. =09* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi: =09Likewise. =09* tests/data/test-annotate/test21-pr19092.so.abi: Likewise. =09* tests/data/test-annotate/test7.so.abi: Likewise. =09* tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test19-soname-report-0.txt: Likewise. =09* tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt: =09Likewise. =09* tests/data/test-diff-dwarf/test5-report.txt: Likewise. =09* tests/data/test-diff-filter/test-PR26739-2-report-0.txt: =09Likewise. =09* tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.t= xt: =09Likewise. =09* tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.t= xt: =09Likewise. =09* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt: =09Likewise. =09* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt: =09Likewise. =09* tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt: =09Likewise. =09* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt: =09Likewise. =09* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt: =09Likewise. =09* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt: =09Likewise. =09* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt: =09Likewise. =09* tests/data/test-diff-filter/test41-report-0.txt: Likewise. =09* tests/data/test-diff-filter/test6-report.txt: Likewise. =09* tests/data/test-diff-filter/test7-report.txt: Likewise. =09* tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc= 30.x86_64-report-0.txt: =09Likewise. =09* tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt: Likewise. =09* tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2= .0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt: =09Likewise. =09* tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-compa= t-4.4.18-3.el9.x86_64-report-1.txt: =09Likewise. =09* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el= 7.x86_64-report-2.txt: =09Likewise. =09* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el= 7.x86_64-report-3.txt: =09Likewise. =09* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.201= 41204.fc23.x86_64-report-0.txt: =09Likewise. =09* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.201= 41204.fc23.x86_64-report-1.txt: =09Likewise. =09* tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt: =09Likewise. =09* tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt: Likewise. =09* tests/data/test-diff-suppr/test0-type-suppr-report-0.txt: =09Likewise. =09* tests/data/test-diff-suppr/test0-type-suppr-report-3.txt: =09Likewise. =09* tests/data/test-diff-suppr/test0-type-suppr-report-5.txt: =09Likewise. =09* tests/data/test-diff-suppr/test0-type-suppr-report-7.txt: =09Likewise. =09* tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt: =09Likewise. =09* tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt: =09Likewise. =09* tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt: =09Likewise. =09* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt: =09Likewise. =09* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt: =09Likewise. =09* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt: =09Likewise. =09* tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt: =09Likewise. =09* tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt: =09Likewise. =09* tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt: =09Likewise. =09* tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt: =09Likewise. =09* tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt: =09Likewise. =09* tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt: =09Likewise. =09* tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt: =09Likewise. =09* tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt: =09Likewise. =09* tests/data/test-diff-suppr/test30-report-0.txt: Likewise. =09* tests/data/test-diff-suppr/test32-report-0.txt: Likewise. =09* tests/data/test-diff-suppr/test32-report-1.txt: Likewise. =09* tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.t= xt: =09Likewise. =09* tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39= .90-1.fc22.x86_64-report-0.txt: =09Likewise. =09* tests/data/test-read-ctf/test9.o.abi: Likewise. =09* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise. =09* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise. =09* tests/data/test-read-dwarf/test-libaaudio.so.abi: Likewise. =09* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise. =09* tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise. =09* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise. =09* tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise. =09* tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise. =09* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise. =09* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise. =09* tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise. =09* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.= abi: =09Likewise. =09* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise. =09* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi: =09Likewise. =09* tests/data/test-read-dwarf/test7.so.abi: Likewise. =09* tests/data/test-read-dwarf/test7.so.hash.abi: Likewise. Signed-off-by: Dodji Seketeli Applied to master. --- include/abg-fwd.h | 34 +- include/abg-ir.h | 3 - src/abg-ir.cc | 1017 ++- .../test0-fn-changed-report-0.txt | 4 +- .../test0-fn-changed-report-2.txt | 4 +- .../test1-fn-removed-report-0.txt | 2 +- .../test3-fn-removed-report-0.txt | 2 +- .../PR30048-test-2-report-1.txt | 78 +- .../PR30048-test-report-0.txt | 14 +- .../PR30329/PR30329-report-1.txt | 4 +- .../libsdl/libsdl-1.2.60-1.2.64-report.txt | 10 +- .../test1-ada-subrange-report-1.txt | 4 +- .../test1-ada-subrange-report-2.txt | 4 +- .../qualifier-typedef-array-report-1.txt | 8 +- .../test-fun-param-report.txt | 2 +- .../test-ld-2.28-210.so--ld-2.28-211.so.txt | 8 +- .../test-leaf-fun-type-report.txt | 4 +- .../test-leaf-more-report.txt | 6 +- .../test-leaf-peeling-report.txt | 4 +- .../test-leaf-stats-report.txt | 2 +- .../test-net-change-report0.txt | 6 +- .../test-net-change-report2.txt | 6 +- .../test2-filtered-removed-fns-report0.txt | 2 +- .../test-abidiff/test-PR18791-report0.txt | 8 +- .../data/test-abidiff/test-crc-report-0-1.txt | 2 +- .../data/test-abidiff/test-crc-report-1-0.txt | 2 +- .../data/test-abidiff/test-crc-report-1-2.txt | 2 +- .../data/test-annotate/test13-pr18894.so.abi | 306 +- .../data/test-annotate/test14-pr18893.so.abi | 320 +- .../data/test-annotate/test15-pr18892.so.abi | 2868 ++++----- .../data/test-annotate/test17-pr19027.so.abi | 3100 ++++----- ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi | 36 +- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 1616 ++--- ...st20-pr19025-libvtkParallelCore-6.1.so.abi | 74 +- .../data/test-annotate/test21-pr19092.so.abi | 274 +- tests/data/test-annotate/test7.so.abi | 24 +- .../PR25058-liblttng-ctl-report-1.txt | 40 +- .../test-23-diff-arch-report-0.txt | 2 +- .../test18-alias-sym-report-0.txt | 2 +- .../test19-soname-report-0.txt | 2 +- .../test24-added-fn-parms-report-0.txt | 2 +- .../test32-fnptr-changes-report-0.txt | 20 +- .../test33-fnref-changes-report-0.txt | 20 +- .../test41-PR20476-hidden-report-0.txt | 2 +- tests/data/test-diff-dwarf/test5-report.txt | 2 +- .../test-PR26739-2-report-0.txt | 2 +- ...st26-qualified-redundant-node-report-0.txt | 2 +- ...st26-qualified-redundant-node-report-1.txt | 4 +- .../test30-pr18904-rvalueref-report0.txt | 80 +- .../test30-pr18904-rvalueref-report1.txt | 80 +- .../test30-pr18904-rvalueref-report2.txt | 80 +- .../test31-pr18535-libstdc++-report-0.txt | 18 +- .../test31-pr18535-libstdc++-report-1.txt | 18 +- .../test35-pr18754-no-added-syms-report-0.txt | 62 +- .../test35-pr18754-no-added-syms-report-1.txt | 12 +- .../data/test-diff-filter/test41-report-0.txt | 2 +- tests/data/test-diff-filter/test6-report.txt | 2 +- tests/data/test-diff-filter/test7-report.txt | 2 +- .../gmp-6.x.x86_64-report-0.txt | 4 +- .../test-diff-pkg-ctf/test-rpm-report-0.txt | 2 +- ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt | 4 +- .../PR24690/PR24690-report-0.txt | 10 +- ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt | 6 +- ...pt-compat-4.4.18-3.el9.x86_64-report-1.txt | 2 +- ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 124 +- ...l7.x86_64-0.12.8-1.el7.x86_64-report-3.txt | 2 +- ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt | 32 +- ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt | 8 +- .../test0-type-suppr-report-0.txt | 2 +- .../test0-type-suppr-report-3.txt | 2 +- .../test0-type-suppr-report-5.txt | 2 +- .../test0-type-suppr-report-7.txt | 2 +- .../test15-suppr-added-fn-report-0.txt | 2 +- .../test15-suppr-added-fn-report-2.txt | 2 +- .../test15-suppr-added-fn-report-5.txt | 2 +- .../test16-suppr-removed-fn-report-0.txt | 2 +- .../test16-suppr-removed-fn-report-3.txt | 2 +- .../test16-suppr-removed-fn-report-5.txt | 2 +- .../test27-add-aliased-function-report-0.txt | 2 +- .../test27-add-aliased-function-report-3.txt | 2 +- .../test27-add-aliased-function-report-4.txt | 2 +- .../test28-add-aliased-function-report-0.txt | 2 +- .../test28-add-aliased-function-report-1.txt | 2 +- .../test28-add-aliased-function-report-2.txt | 2 +- .../test28-add-aliased-function-report-4.txt | 2 +- .../test28-add-aliased-function-report-5.txt | 2 +- .../data/test-diff-suppr/test30-report-0.txt | 2 +- .../data/test-diff-suppr/test32-report-0.txt | 4 +- .../data/test-diff-suppr/test32-report-1.txt | 2 +- ...t44-suppr-sym-name-not-regexp-report-1.txt | 2 +- ...-vte291-0.39.90-1.fc22.x86_64-report-0.txt | 2 +- tests/data/test-read-ctf/test9.o.abi | 14 +- .../test-read-dwarf/PR22122-libftdc.so.abi | 330 +- .../data/test-read-dwarf/PR25007-sdhci.ko.abi | 1366 ++-- .../test-read-dwarf/test-libaaudio.so.abi | 26 +- .../test-read-dwarf/test-libandroid.so.abi | 1220 ++-- .../test-read-dwarf/test11-pr18828.so.abi | 5560 ++++++++--------- .../test-read-dwarf/test12-pr18844.so.abi | 1842 +++--- .../test-read-dwarf/test13-pr18894.so.abi | 164 +- .../test-read-dwarf/test14-pr18893.so.abi | 20 +- .../test-read-dwarf/test15-pr18892.so.abi | 1606 ++--- .../test-read-dwarf/test16-pr18904.so.abi | 644 +- .../test-read-dwarf/test17-pr19027.so.abi | 2790 ++++----- ...19-pr19023-libtcmalloc_and_profiler.so.abi | 950 +-- .../test-read-dwarf/test21-pr19092.so.abi | 48 +- .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 562 +- tests/data/test-read-dwarf/test7.so.abi | 14 +- tests/data/test-read-dwarf/test7.so.hash.abi | 10 +- 108 files changed, 14188 insertions(+), 13536 deletions(-) diff --git a/include/abg-fwd.h b/include/abg-fwd.h index de5b72b0..3687d346 100644 --- a/include/abg-fwd.h +++ b/include/abg-fwd.h @@ -436,6 +436,9 @@ is_anonymous_type(const type_base*); bool is_anonymous_type(const type_base_sptr&); =20 +bool +is_npaf_type(const type_base_sptr&); + const type_decl* is_type_decl(const type_or_decl_base*); =20 @@ -536,26 +539,35 @@ is_compatible_with_class_type(const type_base_sptr&); class_decl_sptr is_compatible_with_class_type(const decl_base_sptr&); =20 -pointer_type_def* -is_pointer_type(type_or_decl_base*); - const pointer_type_def* -is_pointer_type(const type_or_decl_base*); +is_pointer_type(const type_or_decl_base*, +=09=09bool look_through_qualifiers=3Dfalse); + +pointer_type_def_sptr +is_pointer_type(const type_or_decl_base_sptr&, +=09=09bool look_through_qualifiers=3Dfalse); + +pointer_type_def_sptr +is_pointer_to_function_type(const type_base_sptr&); + +pointer_type_def_sptr +is_pointer_to_array_type(const type_base_sptr&); =20 pointer_type_def_sptr -is_pointer_type(const type_or_decl_base_sptr&); +is_pointer_to_npaf_type(const type_base_sptr&); =20 bool is_typedef_ptr_or_ref_to_decl_only_class_or_union_type(const type_base* t)= ; =20 reference_type_def* -is_reference_type(type_or_decl_base*); +is_reference_type(type_or_decl_base*, bool look_through_qualifiers=3Dfalse= ); =20 const reference_type_def* -is_reference_type(const type_or_decl_base*); +is_reference_type(const type_or_decl_base*, bool look_through_qualifiers= =3Dfalse); =20 reference_type_def_sptr -is_reference_type(const type_or_decl_base_sptr&); +is_reference_type(const type_or_decl_base_sptr&, +=09=09 bool look_through_qualifiers=3Dfalse); =20 const type_base* is_void_pointer_type(const type_base*); @@ -799,10 +811,12 @@ const class_or_union_sptr data_member_has_anonymous_type(const var_decl_sptr& d); =20 array_type_def* -is_array_type(const type_or_decl_base* decl); +is_array_type(const type_or_decl_base* decl, +=09 bool look_through_qualifiers =3D false); =20 array_type_def_sptr -is_array_type(const type_or_decl_base_sptr& decl); +is_array_type(const type_or_decl_base_sptr& decl, +=09 bool look_through_qualifiers =3D false); =20 array_type_def_sptr is_array_of_qualified_element(const type_base_sptr&); diff --git a/include/abg-ir.h b/include/abg-ir.h index 0cb378ad..8ed8d734 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -1485,9 +1485,6 @@ public: friend class_decl* is_class_type(const type_or_decl_base*); =20 - friend pointer_type_def* - is_pointer_type(type_or_decl_base*); - friend type_base* is_type(const type_or_decl_base*); =20 diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 78a4dfe0..06cfe558 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -221,6 +221,49 @@ update_qualified_name(decl_base * d); static void update_qualified_name(decl_base_sptr d); =20 +static interned_string +pointer_declaration_name(const type_base* ptr, +=09=09=09 const string& variable_name, +=09=09=09 bool qualified, bool internal); + +static interned_string +pointer_declaration_name(const type_base_sptr& ptr, +=09=09=09 const string& variable_name, +=09=09=09 bool qualified, bool internal); + +static interned_string +array_declaration_name(const array_type_def* array, +=09=09 const string& variable_name, +=09=09 bool qualified, bool internal); + +static interned_string +array_declaration_name(const array_type_def_sptr& array, +=09=09 const string& variable_name, +=09=09 bool qualified, bool internal); + +static void +stream_pretty_representation_of_fn_parms(const function_type& fn_type, +=09=09=09=09=09 ostream& o, bool qualified, +=09=09=09=09=09 bool internal); +static string +add_outer_pointer_to_fn_type_expr(const type_base* pointer_to_fn, +=09=09=09=09 const string& input, bool qualified, +=09=09=09=09 bool internal); + +static string +add_outer_pointer_to_fn_type_expr(const type_base_sptr& pointer_to_fn, +=09=09=09=09 const string& input, bool qualified, +=09=09=09=09 bool internal); + +static string +add_outer_pointer_to_array_type_expr(const type_base* pointer_to_ar, +=09=09=09=09 const string& input, bool qualified, +=09=09=09=09 bool internal); + +static string +add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar, +=09=09=09=09 const string& input, bool qualified, +=09=09=09=09 bool internal); void push_composite_type_comparison_operands(const type_base& left, =09=09=09=09=09const type_base& right); @@ -9121,24 +9164,10 @@ get_function_type_name(const function_type& fn_type= , : fn_type.get_return_type(); const environment& env =3D fn_type.get_environment(); =20 - o << get_pretty_representation(return_type, internal); - - o << " ("; - type_base_sptr type; - for (function_type::parameters::const_iterator i =3D -=09 fn_type.get_parameters().begin(); - i !=3D fn_type.get_parameters().end(); - ++i) - { - if (i !=3D fn_type.get_parameters().begin()) -=09o << ", "; - type =3D (*i)->get_type(); - if (internal) -=09type =3D peel_typedef_type(type); - o << get_pretty_representation(type, internal); - } - o <<")"; - + o << get_pretty_representation(return_type, internal) << " "; + stream_pretty_representation_of_fn_parms(fn_type, o, +=09=09=09=09=09 /*qualified=3D*/true, +=09=09=09=09=09 internal); return env.intern(o.str()); } =20 @@ -9236,28 +9265,10 @@ get_method_type_name(const method_type& fn_type, class_or_union_sptr class_type =3D fn_type.get_class_type(); ABG_ASSERT(class_type); =20 - o << " (" << class_type->get_qualified_name(internal) << "::*)" - << " ("; - - type_base_sptr type; - for (function_type::parameters::const_iterator i =3D -=09 fn_type.get_parameters().begin(); - i !=3D fn_type.get_parameters().end(); - ++i) - { - if (i !=3D fn_type.get_parameters().begin()) -=09o << ", "; - type =3D (*i)->get_type(); - if (internal) -=09type =3D peel_typedef_type(type); - if (*i) -=09o << type->get_cached_pretty_representation(internal); - else -=09// There are still some abixml files out there in which "void" -=09// can be expressed as an empty type. -=09o << "void"; - } - o <<")"; + o << " (" << class_type->get_qualified_name(internal) << "::*) "; + stream_pretty_representation_of_fn_parms(fn_type, o, +=09=09=09=09=09 /*qualified=3D*/true, +=09=09=09=09=09 internal); =20 return env.intern(o.str()); } @@ -10563,6 +10574,21 @@ bool is_anonymous_type(const type_base_sptr& t) {return is_anonymous_type(t.get());} =20 +/// Test if a type is a neither a pointer, an array nor a function +/// type. +/// +/// @param t the type to consider. +/// +/// @return true if the @p t is NOT a pointer, an array nor a +/// function. +bool +is_npaf_type(const type_base_sptr& t) +{ + if (!(is_pointer_type(t) || is_array_type(t) || is_function_type(t))) + return true; + return false; +} + /// Test whether a type is a type_decl (a builtin type). /// /// @return the type_decl* for @t if it's type_decl, otherwise, return @@ -11055,43 +11081,97 @@ is_union_type(const shared_ptr= & t) /// /// @param t the type to test. /// +/// @param look_through_decl_only if this is true, then look through +/// qualified types to see if the underlying type is a +/// pointer_type_def. +/// /// @return the @ref pointer_type_def_sptr if @p t is a /// pointer_type_def, null otherwise. -pointer_type_def* -is_pointer_type(type_or_decl_base* t) +const pointer_type_def* +is_pointer_type(const type_or_decl_base* t, +=09=09bool look_through_qualifiers) { if (!t) return 0; =20 - if (t->kind() & type_or_decl_base::POINTER_TYPE) - return reinterpret_cast - (const_cast(t)->runtime_type_instance()); + const type_base* type =3D is_type(t); + if (look_through_qualifiers) + type =3D peel_qualified_type(is_type(t)); =20 - return 0; + return dynamic_cast(const_cast(type)); } =20 /// Test whether a type is a pointer_type_def. /// /// @param t the type to test. /// +/// @param look_through_decl_only if this is true, then look through +/// qualified types to see if the underlying type is a +/// pointer_type_def. +/// /// @return the @ref pointer_type_def_sptr if @p t is a /// pointer_type_def, null otherwise. -const pointer_type_def* -is_pointer_type(const type_or_decl_base* t) +pointer_type_def_sptr +is_pointer_type(const type_or_decl_base_sptr &t, +=09=09bool look_through_qualifiers) { - return is_pointer_type(const_cast(t)); + type_base_sptr type =3D is_type(t); + if (look_through_qualifiers) + type =3D peel_qualified_type(type); + return dynamic_pointer_cast(type); } =20 -/// Test whether a type is a pointer_type_def. +/// Test if a type is a pointer to function type. /// -/// @param t the type to test. +/// @param t the type to consider. /// -/// @return the @ref pointer_type_def_sptr if @p t is a -/// pointer_type_def, null otherwise. +/// @return the @ref pointer_type_def_sptr iff @p t is a pointer to +/// function type. pointer_type_def_sptr -is_pointer_type(const type_or_decl_base_sptr &t) -{return dynamic_pointer_cast(t);} +is_pointer_to_function_type(const type_base_sptr& t) +{ + if (pointer_type_def_sptr p =3D is_pointer_type(t)) + { + if (is_function_type(p->get_pointed_to_type())) +=09return p; + } + return pointer_type_def_sptr(); +} + +/// Test if a type is a pointer to array type. +/// +/// @param t the type to consider. +/// +/// @return the pointer_type_def_sptr iff @p t is a pointer to array +/// type. +pointer_type_def_sptr +is_pointer_to_array_type(const type_base_sptr& t) +{ + if (pointer_type_def_sptr p =3D is_pointer_type(t)) + { + if (is_array_type(p->get_pointed_to_type())) +=09return p; + } + return pointer_type_def_sptr(); +} =20 +/// Test if we are looking at a pointer to a +/// neither-a-pointer-to-an-array-nor-a-function type. +/// +/// @param t the type to consider. +/// +/// @return the @ref pointer_type_def_sptr type iff @p t is a +/// neither-a-pointer-an-array-nor-a-function type. +pointer_type_def_sptr +is_pointer_to_npaf_type(const type_base_sptr& t) +{ + if (pointer_type_def_sptr p =3D is_pointer_type(t)) + { + if (is_npaf_type(p->get_pointed_to_type())) +=09return p; + } + return pointer_type_def_sptr(); +} =20 /// Test if a type is a typedef, pointer or reference to a decl-only /// class/union. @@ -11119,31 +11199,65 @@ is_typedef_ptr_or_ref_to_decl_only_class_or_union= _type(const type_base* t) /// /// @param t the type to test. /// +/// @param look_through_decl_only if this is true, then look through +/// qualified types to see if the underlying type is a +/// reference_type_def. +/// /// @return the @ref reference_type_def_sptr if @p t is a /// reference_type_def, null otherwise. reference_type_def* -is_reference_type(type_or_decl_base* t) -{return dynamic_cast(t);} +is_reference_type(type_or_decl_base* t, +=09=09 bool look_through_qualifiers) +{ + const type_base* type =3D is_type(t); + if (!type) + return nullptr; + + if (look_through_qualifiers) + type =3D peel_qualified_type(type); + return dynamic_cast(const_cast(type)); +} =20 /// Test whether a type is a reference_type_def. /// /// @param t the type to test. /// +/// @param look_through_decl_only if this is true, then look through +/// qualified types to see if the underlying type is a +/// reference_type_def. +/// /// @return the @ref reference_type_def_sptr if @p t is a /// reference_type_def, null otherwise. const reference_type_def* -is_reference_type(const type_or_decl_base* t) -{return dynamic_cast(t);} +is_reference_type(const type_or_decl_base* t, +=09=09 bool look_through_qualifiers) +{ + const type_base* type =3D is_type(t); + + if (look_through_qualifiers) + type =3D peel_qualified_type(type); + return dynamic_cast(type); +} =20 /// Test whether a type is a reference_type_def. /// /// @param t the type to test. /// +/// @param look_through_decl_only if this is true, then look through +/// qualified types to see if the underlying type is a +/// reference_type_def. +/// /// @return the @ref reference_type_def_sptr if @p t is a /// reference_type_def, null otherwise. reference_type_def_sptr -is_reference_type(const type_or_decl_base_sptr& t) -{return dynamic_pointer_cast(t);} +is_reference_type(const type_or_decl_base_sptr& t, +=09=09 bool look_through_qualifiers) +{ + type_base_sptr type =3D is_type(t); + if (look_through_qualifiers) + type =3D peel_qualified_type(type); + return dynamic_pointer_cast(type); +} =20 /// Test if a type is equivalent to a pointer to void type. /// @@ -11226,7 +11340,7 @@ is_void_pointer_type(const type_base_sptr& t) if (t->get_environment().get_void_pointer_type().get() =3D=3D t.get()) return t; =20 - pointer_type_def* ptr =3D is_pointer_type(t.get()); + const pointer_type_def* ptr =3D is_pointer_type(t.get()); if (!ptr) return nil; =20 @@ -11528,8 +11642,15 @@ is_function_template_pattern(const shared_ptr decl) /// /// @return true iff @p type is an array_type_def. array_type_def* -is_array_type(const type_or_decl_base* type) -{return dynamic_cast(const_cast(type)= );} +is_array_type(const type_or_decl_base* type, +=09 bool look_through_qualifiers) +{ + const type_base* t =3D is_type(type); + + if (look_through_qualifiers) + t =3D peel_qualified_type(t); + return dynamic_cast(const_cast(t)); +} =20 /// Test if a type is an array_type_def. /// @@ -11537,8 +11658,15 @@ is_array_type(const type_or_decl_base* type) /// /// @return true iff @p type is an array_type_def. array_type_def_sptr -is_array_type(const type_or_decl_base_sptr& type) -{return dynamic_pointer_cast(type);} +is_array_type(const type_or_decl_base_sptr& type, +=09 bool look_through_qualifiers) +{ + type_base_sptr t =3D is_type(type); + + if (look_through_qualifiers) + t =3D peel_qualified_type(t); + return dynamic_pointer_cast(t); +} =20 /// Tests if the element of a given array is a qualified type. /// @@ -17419,13 +17547,14 @@ pointer_type_def::get_qualified_name(bool interna= l) const =09 if (priv_->internal_qualified_name_.empty()) =09 if (pointed_to_type) =09 priv_->internal_qualified_name_ =3D -=09=09get_name_of_pointer_to_type(*pointed_to_type, -=09=09=09=09=09 /*qualified_name=3D*/ -=09=09=09=09=09 is_typedef(pointed_to_type) -=09=09=09=09=09 ? false -=09=09=09=09=09 : true, -=09=09=09=09=09 /*internal=3D*/true); -=09 return priv_->internal_qualified_name_; +=09=09pointer_declaration_name(this, +=09=09=09=09=09 /*variable_name=3D*/"", +=09=09=09=09=09 /*qualified_name=3D*/ +=09=09=09=09=09 is_typedef(pointed_to_type) +=09=09=09=09=09 ? false +=09=09=09=09=09 : true, +=09=09=09=09=09 /*internal=3D*/true); +=09=09return priv_->internal_qualified_name_; =09} else =09{ @@ -17435,12 +17564,13 @@ pointer_type_def::get_qualified_name(bool interna= l) const =09 // function. =09 if (pointed_to_type) =09 priv_->temp_internal_qualified_name_ =3D -=09 get_name_of_pointer_to_type(*pointed_to_type, -=09=09=09=09=09 /*qualified_name=3D*/ -=09=09=09=09=09 is_typedef(pointed_to_type) -=09=09=09=09=09 ? false -=09=09=09=09=09 : true, -=09=09=09=09=09 /*internal=3D*/true); +=09=09pointer_declaration_name(this, +=09=09=09=09=09 /*variable_name=3D*/"", +=09=09=09=09=09 /*qualified_name=3D*/ +=09=09=09=09=09 is_typedef(pointed_to_type) +=09=09=09=09=09 ? false +=09=09=09=09=09 : true, +=09=09=09=09=09 /*internal=3D*/true); =09 return priv_->temp_internal_qualified_name_; =09} } @@ -17450,9 +17580,10 @@ pointer_type_def::get_qualified_name(bool internal= ) const =09{ =09 if (decl_base::peek_qualified_name().empty()) =09 set_qualified_name -=09 (get_name_of_pointer_to_type(*pointed_to_type, -=09=09=09=09=09 /*qualified_name=3D*/true, -=09=09=09=09=09 /*internal=3D*/false)); +=09 (pointer_declaration_name(this, +=09=09=09=09=09/*variable_name=3D*/"", +=09=09=09=09=09/*qualified_name=3D*/true, +=09=09=09=09=09/*internal=3D*/false)); =09 return decl_base::peek_qualified_name(); =09} else @@ -17463,9 +17594,10 @@ pointer_type_def::get_qualified_name(bool internal= ) const =09 // function. =09 if (pointed_to_type) =09 set_qualified_name -=09 (get_name_of_pointer_to_type(*pointed_to_type, -=09=09=09=09=09 /*qualified_name=3D*/true, -=09=09=09=09=09 /*internal=3D*/false)); +=09 (pointer_declaration_name(this, +=09=09=09=09=09/*variable_name=3D*/"", +=09=09=09=09=09/*qualified_name=3D*/true, +=09=09=09=09=09/*internal=3D*/false)); =09 return decl_base::peek_qualified_name(); =09} } @@ -18598,48 +18730,6 @@ array_type_def::get_subrange_representation() cons= t return r; } =20 -/// Get the string representation of an @ref array_type_def. -/// -/// @param a the array type to consider. -/// -/// @param internal set to true if the call is intended for an -/// internal use (for technical use inside the library itself), false -/// otherwise. If you don't know what this is for, then set it to -/// false. -static string -get_type_representation(const array_type_def& a, bool internal) -{ - type_base_sptr e_type =3D a.get_element_type(); - decl_base_sptr d =3D get_type_declaration(e_type); - string r; - - if (is_ada_language(a.get_language())) - { - std::ostringstream o; - o << "array (" -=09<< a.get_subrange_representation() -=09<< ") of " -=09<< e_type ? e_type->get_pretty_representation(internal):string("void")= ; - } - else - { - if (internal) -=09r =3D (e_type -=09 ? get_type_name(e_type, -=09=09=09 /*qualified=3D*/true, -=09=09=09 /*internal=3D*/true) -=09 : string("void")) -=09 + a.get_subrange_representation(); - else -=09r =3D (e_type -=09 ? get_type_name(e_type, /*qualified=3D*/true, /*internal=3D*/false= ) -=09 : string("void")) -=09 + a.get_subrange_representation(); - } - - return r; -} - /// Get the pretty representation of the current instance of @ref /// array_type_def. /// @@ -18660,8 +18750,11 @@ get_type_representation(const array_type_def& a, b= ool internal) /// @return the pretty representation of the ABI artifact. string array_type_def::get_pretty_representation(bool internal, -=09=09=09=09=09 bool /*qualified_name*/) const -{return get_type_representation(*this, internal);} +=09=09=09=09=09 bool qualified_name) const +{ + return array_declaration_name(this, /*variable_name=3D*/"", +=09=09=09=09qualified_name, internal); +} =20 /// Compares two instances of @ref array_type_def. /// @@ -18891,22 +18984,22 @@ array_type_def::get_qualified_name(interned_strin= g& qn, bool internal) const const interned_string& array_type_def::get_qualified_name(bool internal) const { - const environment& env =3D get_environment(); - - if (internal) { if (get_canonical_type()) =09{ =09 if (priv_->internal_qualified_name_.empty()) =09 priv_->internal_qualified_name_ =3D -=09 env.intern(get_type_representation(*this, /*internal=3D*/true)); +=09 array_declaration_name(this, /*variable_name=3D*/"", +=09=09=09=09 /*qualified=3D*/false, +=09=09=09=09 /*internal=3D*/true); =09 return priv_->internal_qualified_name_; =09} else =09{ =09 priv_->temp_internal_qualified_name_ =3D -=09 env.intern(get_type_representation(*this, /*internal=3D*/true)); +=09 array_declaration_name(this, /*variable_name=3D*/"", +=09=09=09=09 /*qualified*/false, /*internal*/true); =09 return priv_->temp_internal_qualified_name_; =09} } @@ -18915,15 +19008,18 @@ array_type_def::get_qualified_name(bool internal)= const if (get_canonical_type()) =09{ =09 if (decl_base::peek_qualified_name().empty()) -=09 set_qualified_name(env.intern(get_type_representation -=09=09=09=09=09 (*this, /*internal=3D*/false))); +=09 set_qualified_name(array_declaration_name(this, +=09=09=09=09=09=09 /*variable_name=3D*/"", +=09=09=09=09=09=09 /*qualified=3D*/false, +=09=09=09=09=09=09 /*internal=3D*/false)); =09 return decl_base::peek_qualified_name(); =09} else =09{ -=09 set_temporary_qualified_name(env.intern(get_type_representation -=09=09=09=09=09=09 (*this, -=09=09=09=09=09=09 /*internal=3D*/false))); +=09 set_temporary_qualified_name +=09 (array_declaration_name(this, /*variable_name=3D*/"", +=09=09=09=09 /*qualified=3D*/false, +=09=09=09=09 /*internal=3D*/false)); =09 return decl_base::peek_temporary_qualified_name(); =09} } @@ -20433,7 +20529,10 @@ var_decl::get_pretty_representation(bool internal,= bool qualified_name) const if (scope->get_is_anonymous()) member_of_anonymous_class =3D true; =20 - if (array_type_def_sptr t =3D is_array_type(get_type())) + type_base_sptr type =3D get_type(); + if (is_array_type(type, /*look_through_qualifiers=3D*/true) + || is_pointer_type(type, /*look_through_qualifiers=3D*/true) + || is_reference_type(type, /*look_through_qualifiers=3D*/true)) { string name; if (member_of_anonymous_class || !qualified_name) @@ -20441,12 +20540,22 @@ var_decl::get_pretty_representation(bool internal= , bool qualified_name) const else =09name =3D get_qualified_name(internal); =20 - type_base_sptr et =3D t->get_element_type(); - ABG_ASSERT(et); - decl_base_sptr decl =3D get_type_declaration(et); - ABG_ASSERT(decl); - result +=3D decl->get_qualified_name(internal) -=09+ " " + name + t->get_subrange_representation(); + if (qualified_type_def_sptr q =3D is_qualified_type(type)) +=09{ +=09 string quals_repr =3D +=09 get_string_representation_of_cv_quals(q->get_cv_quals()); +=09 if (!quals_repr.empty()) +=09 name =3D quals_repr + " " + name; +=09 type =3D peel_qualified_type(type); +=09} + + name =3D string(" ") + name; + if (array_type_def_sptr t =3D is_array_type(type)) +=09result +=3D array_declaration_name(t, name, qualified_name, internal); + else if (pointer_type_def_sptr t =3D is_pointer_type(type)) +=09result +=3D pointer_declaration_name(t, name, qualified_name, internal)= ; + else if (reference_type_def_sptr t =3D is_reference_type(type)) +=09result +=3D pointer_declaration_name(t, name, qualified_name, internal)= ; } else { @@ -21425,32 +21534,48 @@ function_decl::get_pretty_representation(bool int= ernal, const method_decl* mem_fn =3D dynamic_cast(this); =20 - string result =3D mem_fn ? "method ": "function "; + string fn_prefix =3D mem_fn ? "method ": "function "; + string result; =20 if (mem_fn && is_member_function(mem_fn) && get_member_function_is_virtual(mem_fn)) - result +=3D "virtual "; + fn_prefix +=3D "virtual "; =20 - decl_base_sptr type; + decl_base_sptr return_type; if ((mem_fn && is_member_function(mem_fn) && (get_member_function_is_dtor(*mem_fn) =09 || get_member_function_is_ctor(*mem_fn)))) /*cdtors do not have return types. */; else - type =3D mem_fn + return_type =3D mem_fn ? get_type_declaration(mem_fn->get_type()->get_return_type()) : get_type_declaration(get_type()->get_return_type()); =20 - if (type) - result +=3D get_type_name(is_type(type).get(), -=09=09=09 qualified_name, -=09=09=09 internal) + " "; - - result +=3D get_pretty_representation_of_declarator(internal); + result =3D get_pretty_representation_of_declarator(internal); + if (return_type) + { + if (is_npaf_type(is_type(return_type)) +=09 || !(is_pointer_to_function_type(is_type(return_type)) +=09 || is_pointer_to_array_type(is_type(return_type)))) +=09result =3D get_type_name(is_type(return_type).get(), qualified_name, +=09=09=09 internal) + " " + result; + else if (pointer_type_def_sptr p =3D +=09 is_pointer_to_function_type(is_type(return_type))) +=09result =3D add_outer_pointer_to_fn_type_expr(p, result, +=09=09=09=09=09=09 /*qualified=3D*/true, +=09=09=09=09=09=09 internal); + else if(pointer_type_def_sptr p =3D +=09 is_pointer_to_array_type(is_type(return_type))) +=09result =3D add_outer_pointer_to_array_type_expr(p, result, +=09=09=09=09=09=09 qualified_name, +=09=09=09=09=09=09 internal); + else +=09ABG_ASSERT_NOT_REACHED; + } =20 - return result; + return fn_prefix + result; } =20 /// Compute and return the pretty representation for the part of the @@ -21486,35 +21611,12 @@ function_decl::get_pretty_representation_of_decla= rator (bool internal) const else result +=3D get_qualified_name(); =20 - result +=3D "("; - - parameters::const_iterator i =3D get_parameters().begin(), - end =3D get_parameters().end(); - - // Skip the first parameter if this is a method. - if (mem_fn && i !=3D end) - ++i; - parameter_sptr parm; - parameter_sptr first_parm; - if (i !=3D end) - first_parm =3D *i; - for (; i !=3D end; ++i) - { - parm =3D *i; - if (parm.get() !=3D first_parm.get()) -=09result +=3D ", "; - if (parm->get_variadic_marker() -=09 || get_environment().is_variadic_parameter_type(parm->get_type())) -=09result +=3D "..."; - else -=09{ -=09 type_base_sptr type =3D parm->get_type(); -=09 if (internal) -=09 type =3D peel_typedef_type(type); -=09 result +=3D get_type_name(type, /*qualified=3D*/true, internal); -=09} - } - result +=3D ")"; + std::ostringstream fn_parms; + stream_pretty_representation_of_fn_parms(*get_type(), +=09=09=09=09=09 fn_parms, +=09=09=09=09=09 /*qualified=3D*/true, +=09=09=09=09=09 internal); + result +=3D fn_parms.str(); =20 if (mem_fn &&((is_member_function(mem_fn) && get_member_function_is_const(*mem_= fn)) @@ -22326,7 +22428,7 @@ function_decl::parameter::get_qualified_name(intern= ed_string& qualified_name, /// function parameter. string function_decl::parameter::get_pretty_representation(bool internal, -=09=09=09=09=09=09 bool /*qualified_name*/) const +=09=09=09=09=09=09 bool qualified_name) const { const environment& env =3D get_environment(); =20 @@ -22337,7 +22439,7 @@ function_decl::parameter::get_pretty_representation= (bool internal, else if (env.is_variadic_parameter_type(t)) type_repr =3D "..."; else - type_repr =3D ir::get_pretty_representation(t, internal); + type_repr =3D ir::get_type_name(t, qualified_name, internal); =20 string result =3D type_repr; string parm_name =3D get_name_id(); @@ -27775,6 +27877,545 @@ find_last_data_member_matching_regexp(const class= _or_union& t, return var_decl_sptr(); } =20 +/// Emit the pretty representation of the parameters of a function +/// type. +/// +/// @param fn_type the function type to consider. +/// +/// @param o the output stream to emit the pretty representation to. +/// +/// @param qualified if true, emit fully qualified names. +/// +/// @param internal if true, then the result is to be used for the +/// purpose of type canonicalization. +static void +stream_pretty_representation_of_fn_parms(const function_type& fn_type, +=09=09=09=09=09 ostream& o, bool qualified, +=09=09=09=09=09 bool internal) +{ + o << "("; + if (fn_type.get_parameters().empty()) + o << "void"; + else + { + type_base_sptr type; + auto end =3D fn_type.get_parameters().end(); + auto first_parm =3D fn_type.get_first_non_implicit_parm(); + function_decl::parameter_sptr parm; + const environment& env =3D fn_type.get_environment(); + for (auto i =3D fn_type.get_first_non_implicit_parm(); i !=3D end; += +i) +=09{ +=09 if (i !=3D first_parm) +=09 o << ", "; +=09 parm =3D *i; +=09 type =3D parm->get_type(); +=09 if (env.is_variadic_parameter_type(type)) +=09 o << "..."; +=09 else +=09 { +=09 if (internal) +=09=09type =3D peel_typedef_type(type); +=09 o << get_type_name(type, qualified, internal); +=09 } +=09} + } + o << ")"; +} + +/// When constructing the name of a pointer to function type, add the +/// return type to the left of the existing type identifier, and the +/// parameters declarator to the right. +/// +/// This function considers the name of the type as an expression. +/// +/// The resulting type expr is going to be made of three parts: +/// left_expr inner_expr right_expr. +/// +/// Suppose we want to build the type expression representing: +/// +/// "an array of pointer to function taking a char parameter and +/// returning an int". +/// +/// It's going to look like: +/// +/// int(*a[])(char); +/// +/// Suppose the caller of this function started to emit the inner +/// "a[]" part of the expression already. It thus calls this +/// function with that input "a[]" part. We consider that "a[]" as +/// the "type identifier". +/// +/// So the inner_expr is going to be "(*a[])". +/// +/// The left_expr part is "int". The right_expr part is "(char)". +/// +/// In other words, this function adds the left_expr and right_expr to +/// the inner_expr. left_expr and right_expr are called "outer +/// pointer to function type expression". +/// +/// This is a sub-routine of @ref pointer_declaration_name() and @ref +/// array_declaration_name() +/// +/// @param p the pointer to function type to consider. +/// +/// @param input the type-id to use as the inner expression of the +/// overall pointer-to-function type expression +/// +/// @param qualified if true then use qualified names in the resulting +/// type name. +/// +/// @param internal if true then the resulting type name is going to +/// be used for type canonicalization purposes. +/// +/// @return the name of the pointer to function type. +static string +add_outer_pointer_to_fn_type_expr(const type_base* p, +=09=09=09=09 const string& input, +=09=09=09=09 bool qualified, bool internal) +{ + if (!p) + return ""; + + function_type_sptr pointed_to_fn; + string star_or_ref; + + if (const pointer_type_def* ptr =3D is_pointer_type(p)) + { + pointed_to_fn =3D is_function_type(ptr->get_pointed_to_type()); + star_or_ref=3D "*"; + } + else if (const reference_type_def* ref =3D is_reference_type(p)) + { + star_or_ref =3D "&"; + pointed_to_fn =3D is_function_type(ref->get_pointed_to_type()); + } + + if (!pointed_to_fn) + return ""; + + std::ostringstream left, right, inner; + + inner << "(" << star_or_ref << input << ")"; + + type_base_sptr type; + stream_pretty_representation_of_fn_parms(*pointed_to_fn, right, +=09=09=09=09=09 qualified, internal); + type_base_sptr return_type =3D + internal + ? peel_typedef_type(pointed_to_fn->get_return_type()) + : pointed_to_fn->get_return_type(); + + string result; + + if (is_npaf_type(return_type) + || !(is_pointer_to_function_type(return_type) +=09 || is_pointer_to_array_type(return_type))) + { + if (return_type) +=09left << get_type_name(return_type, qualified, internal); + result =3D left.str() + " " + inner.str() + right.str(); + } + else if (pointer_type_def_sptr p =3D is_pointer_to_function_type(return_= type)) + { + string inner_string =3D inner.str() + right.str(); + result =3D add_outer_pointer_to_fn_type_expr(p, inner_string, +=09=09=09=09=09=09 qualified, internal); + } + else if (pointer_type_def_sptr p =3D is_pointer_to_array_type(return_typ= e)) + { + string inner_string =3D inner.str() + right.str(); + result =3D add_outer_pointer_to_array_type_expr(p, inner_string, +=09=09=09=09=09=09 qualified, internal); + } + else + ABG_ASSERT_NOT_REACHED; + + return result; +} + +/// When constructing the name of a pointer to function type, add the +/// return type to the left of the existing type identifier, and the +/// parameters declarator to the right. +/// +/// This function considers the name of the type as an expression. +/// +/// The resulting type expr is going to be made of three parts: +/// left_expr inner_expr right_expr. +/// +/// Suppose we want to build the type expression representing: +/// +/// "an array of pointer to function taking a char parameter and +/// returning an int". +/// +/// It's going to look like: +/// +/// int(*a[])(char); +/// +/// Suppose the caller of this function started to emit the inner +/// "a[]" part of the expression already. It thus calls this +/// function with that input "a[]" part. We consider that "a[]" as +/// the "type identifier". +/// +/// So the inner_expr is going to be "(*a[])". +/// +/// The left_expr part is "int". The right_expr part is "(char)". +/// +/// In other words, this function adds the left_expr and right_expr to +/// the inner_expr. left_expr and right_expr are called "outer +/// pointer to function type expression". +/// +/// This is a sub-routine of @ref pointer_declaration_name() and @ref +/// array_declaration_name() +/// +/// @param p the pointer to function type to consider. +/// +/// @param input the type-id to use as the inner expression of the +/// overall pointer-to-function type expression +/// +/// @param qualified if true then use qualified names in the resulting +/// type name. +/// +/// @param internal if true then the resulting type name is going to +/// be used for type canonicalization purposes. +/// +/// @return the name of the pointer to function type. +static string +add_outer_pointer_to_fn_type_expr(const type_base_sptr& p, +=09=09=09=09 const string& input, +=09=09=09=09 bool qualified, bool internal) +{return add_outer_pointer_to_fn_type_expr(p.get(), input, qualified, inter= nal);} + +/// When constructing the name of a pointer to array type, add the +/// array element type type to the left of the existing type +/// identifier, and the array declarator part to the right. +/// +/// This function considers the name of the type as an expression. +/// +/// The resulting type expr is going to be made of three parts: +/// left_expr inner_expr right_expr. +/// +/// Suppose we want to build the type expression representing: +/// +/// "a pointer to an array of int". +/// +/// It's going to look like: +/// +/// int(*foo)[]; +/// +/// Suppose the caller of this function started to emit the inner +/// "foo" part of the expression already. It thus calls this function +/// with that input "foo" part. We consider that "foo" as the "type +/// identifier". +/// +/// So we are passed an input string that is "foo" and it's going to +/// be turned into the inner_expr part, which is going to be "(*foo)". +/// +/// The left_expr part is "int". The right_expr part is "[]". +/// +/// In other words, this function adds the left_expr and right_expr to +/// the inner_expr. left_expr and right_expr are called "outer +/// pointer to array type expression". +/// +/// The model of this function was taken from the article "Reading C +/// type declaration", from Steve Friedl at +/// http://unixwiz.net/techtips/reading-cdecl.html. +/// +/// This is a sub-routine of @ref pointer_declaration_name() and @ref +/// array_declaration_name() +/// +/// @param p the pointer to array type to consider. +/// +/// @param input the type-id to start from as the inner part of the +/// final type name. +/// +/// @param qualified if true then use qualified names in the resulting +/// type name. +/// +/// @param internal if true then the resulting type name is going to +/// be used for type canonicalization purposes. +/// +/// @return the name of the pointer to array type. +static string +add_outer_pointer_to_array_type_expr(const type_base* p, +=09=09=09=09 const string& input, bool qualified, +=09=09=09=09 bool internal) +{ + if (!p) + return ""; + + string star_or_ref; + type_base_sptr pointed_to_type; + + if (const pointer_type_def *ptr =3D is_pointer_type(p)) + { + pointed_to_type =3D ptr->get_pointed_to_type(); + star_or_ref =3D "*"; + } + else if (const reference_type_def *ref =3D is_reference_type(p)) + { + pointed_to_type =3D ref->get_pointed_to_type(); + star_or_ref =3D "&"; + } + + array_type_def_sptr array =3D is_array_type(pointed_to_type); + if (!array) + return ""; + + std::ostringstream left, right, inner; + inner << "(" << star_or_ref << input << ")"; + right << array->get_subrange_representation(); + string result; + + type_base_sptr array_element_type =3D array->get_element_type(); + + if (is_npaf_type(array_element_type) + || !(is_pointer_to_function_type(array_element_type) +=09 || is_pointer_to_array_type(array_element_type))) + { + left << get_type_name(array_element_type, qualified, internal); + result =3D left.str() + inner.str() + right.str(); + } + else if (pointer_type_def_sptr p =3D +=09 is_pointer_to_function_type(array_element_type)) + { + string r =3D inner.str() + right.str(); + result =3D add_outer_pointer_to_fn_type_expr(p, r, qualified, intern= al); + } + else if (pointer_type_def_sptr p =3D +=09 is_pointer_to_array_type(array_element_type)) + { + string inner_string =3D inner.str() + right.str(); + result =3D add_outer_pointer_to_array_type_expr(p, inner_string, +=09=09=09=09=09=09 qualified, internal); + } + else + ABG_ASSERT_NOT_REACHED; + + return result; +} + +/// When constructing the name of a pointer to array type, add the +/// array element type type to the left of the existing type +/// identifier, and the array declarator part to the right. +/// +/// This function considers the name of the type as an expression. +/// +/// The resulting type expr is going to be made of three parts: +/// left_expr inner_expr right_expr. +/// +/// Suppose we want to build the type expression representing: +/// +/// "a pointer to an array of int". +/// +/// It's going to look like: +/// +/// int(*foo)[]; +/// +/// Suppose the caller of this function started to emit the inner +/// "foo" part of the expression already. It thus calls this function +/// with that input "foo" part. We consider that "foo" as the "type +/// identifier". +/// +/// So we are passed an input string that is "foo" and it's going to +/// be turned into the inner_expr part, which is going to be "(*foo)". +/// +/// The left_expr part is "int". The right_expr part is "[]". +/// +/// In other words, this function adds the left_expr and right_expr to +/// the inner_expr. left_expr and right_expr are called "outer +/// pointer to array type expression". +/// +/// The model of this function was taken from the article "Reading C +/// type declaration", from Steve Friedl at +/// http://unixwiz.net/techtips/reading-cdecl.html. +/// +/// This is a sub-routine of @ref pointer_declaration_name() and @ref +/// array_declaration_name() +/// +/// @param p the pointer to array type to consider. +/// +/// @param input the type-id to start from as the inner part of the +/// final type name. +/// +/// @param qualified if true then use qualified names in the resulting +/// type name. +/// +/// @param internal if true then the resulting type name is going to +/// be used for type canonicalization purposes. +/// +/// @return the name of the pointer to array type. +static string +add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar, +=09=09=09=09 const string& input, bool qualified, +=09=09=09=09 bool internal) +{return add_outer_pointer_to_array_type_expr(pointer_to_ar.get(), +=09=09=09=09=09 input, qualified, internal);} + +/// Emit the name of a pointer declaration. +/// +/// @param the pointer to consider. +/// +/// @param idname the name of the variable that has @p as a type or +/// the id of the type. If it's empty then the resulting name is +/// going to be the abstract name of the type. +/// +/// @param qualified if true then the type name is going to be +/// fully qualified. +/// +/// @param internal if true then the type name is going to be used for +/// type canonicalization purposes. +static interned_string +pointer_declaration_name(const type_base* ptr, +=09=09=09 const string& idname, +=09=09=09 bool qualified, bool internal) +{ + if (!ptr) + return interned_string(); + + type_base_sptr pointed_to_type; + string star_or_ref; + if (const pointer_type_def* p =3D is_pointer_type(ptr)) + { + pointed_to_type =3D p->get_pointed_to_type(); + star_or_ref =3D "*"; + } + else if (const reference_type_def* p =3D is_reference_type(ptr)) + { + pointed_to_type =3D p->get_pointed_to_type(); + star_or_ref =3D "&"; + } + + if (!pointed_to_type) + return interned_string(); + + string result; + if (is_npaf_type(pointed_to_type) + || !(is_function_type(pointed_to_type) +=09 || is_array_type(pointed_to_type))) + { + result =3D get_type_name(pointed_to_type, +=09=09=09 qualified, +=09=09=09 internal) +=09+ star_or_ref; + + if (!idname.empty()) +=09result +=3D idname; + } + else + { + // derived type + if (is_function_type(pointed_to_type)) +=09result =3D add_outer_pointer_to_fn_type_expr(ptr, idname, +=09=09=09=09=09=09 qualified, internal); + else if (is_array_type(pointed_to_type)) +=09result =3D add_outer_pointer_to_array_type_expr(ptr, idname, +=09=09=09=09=09=09 qualified, internal); + else +=09ABG_ASSERT_NOT_REACHED; + } + return ptr->get_environment().intern(result); +} + + +/// Emit the name of a pointer declaration. +/// +/// @param the pointer to consider. +/// +/// @param the name of the variable that has @p as a type. If it's +/// empty then the resulting name is going to be the abstract name of +/// the type. +/// +/// @param qualified if true then the type name is going to be +/// fully qualified. +/// +/// @param internal if true then the type name is going to be used for +/// type canonicalization purposes. +static interned_string +pointer_declaration_name(const type_base_sptr& ptr, +=09=09=09 const string& variable_name, +=09=09=09 bool qualified, bool internal) +{return pointer_declaration_name(ptr.get(), variable_name, +=09=09=09=09 qualified, internal);} + +/// Emit the name of a array declaration. +/// +/// @param the array to consider. +/// +/// @param the name of the variable that has @p as a type. If it's +/// empty then the resulting name is going to be the abstract name of +/// the type. +/// +/// @param qualified if true then the type name is going to be +/// fully qualified. +/// +/// @param internal if true then the type name is going to be used for +/// type canonicalization purposes. +static interned_string +array_declaration_name(const array_type_def* array, +=09=09 const string& variable_name, +=09=09 bool qualified, bool internal) +{ + if (!array) + return interned_string(); + + type_base_sptr e_type =3D array->get_element_type(); + string e_type_repr =3D + (e_type + ? get_type_name(e_type, qualified, internal) + : string("void")); + + string result; + if (is_ada_language(array->get_language())) + { + std::ostringstream o; + if (!variable_name.empty()) +=09o << variable_name << " is "; + o << "array (" +=09<< array->get_subrange_representation() +=09<< ") of " << e_type_repr; + result =3D o.str(); + } + else + { + if (is_npaf_type(e_type) +=09 || !(is_pointer_to_function_type(e_type) +=09 || is_pointer_to_array_type(e_type))) +=09{ +=09 result =3D e_type_repr; +=09 if (!variable_name.empty()) +=09 result +=3D variable_name; +=09 result +=3D array->get_subrange_representation(); +=09} + else if (pointer_type_def_sptr p =3D is_pointer_type(e_type)) +=09{ +=09 string s =3D variable_name + array->get_subrange_representation(); +=09 result =3D pointer_declaration_name(p, s, qualified, internal); +=09} + else +=09ABG_ASSERT_NOT_REACHED; + } + return array->get_environment().intern(result); +} + +/// Emit the name of a array declaration. +/// +/// @param the array to consider. +/// +/// @param the name of the variable that has @p as a type. If it's +/// empty then the resulting name is going to be the abstract name of +/// the type. +/// +/// @param qualified if true then the type name is going to be +/// fully qualified. +/// +/// @param internal if true then the type name is going to be used for +/// type canonicalization purposes. +static interned_string +array_declaration_name(const array_type_def_sptr& array, +=09=09 const string& variable_name, +=09=09 bool qualified, bool internal) +{return array_declaration_name(array.get(), variable_name, +=09=09=09 qualified, internal);} bool ir_traversable_base::traverse(ir_node_visitor&) {return true;} diff --git a/tests/data/test-abicompat/test0-fn-changed-report-0.txt b/test= s/data/test-abicompat/test0-fn-changed-report-0.txt index 7e6286dc..f7ef97bb 100644 --- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt +++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt @@ -4,14 +4,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable =20 2 functions with some indirect sub-type change: =20 - [C] 'function libapp::S0* libapp::create_s0()' has some indirect sub-typ= e changes: + [C] 'function libapp::S0* libapp::create_s0(void)' has some indirect sub= -type changes: return type changed: in pointed to type 'struct libapp::S0': type size changed from 32 to 64 (in bits) 1 data member insertion: 'char m1', at offset 32 (in bits) =20 - [C] 'function libapp::S1* libapp::create_s1()' has some indirect sub-typ= e changes: + [C] 'function libapp::S1* libapp::create_s1(void)' has some indirect sub= -type changes: return type changed: in pointed to type 'struct libapp::S1': type size changed from 32 to 96 (in bits) diff --git a/tests/data/test-abicompat/test0-fn-changed-report-2.txt b/test= s/data/test-abicompat/test0-fn-changed-report-2.txt index e2e85b44..70fba89e 100644 --- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt +++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt @@ -4,14 +4,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable =20 2 functions with some indirect sub-type change: =20 - [C] 'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libap= p-v0.cc:47:1 has some indirect sub-type changes: + [C] 'function libapp::S0* libapp::create_s0(void)' at test0-fn-changed-l= ibapp-v0.cc:47:1 has some indirect sub-type changes: return type changed: in pointed to type 'struct libapp::S0' at test0-fn-changed-libapp-v1= .cc:10:1: type size changed from 32 to 64 (in bits) 1 data member insertion: 'char m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.= cc:13:1 =20 - [C] 'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libap= p-v0.cc:55:1 has some indirect sub-type changes: + [C] 'function libapp::S1* libapp::create_s1(void)' at test0-fn-changed-l= ibapp-v0.cc:55:1 has some indirect sub-type changes: return type changed: in pointed to type 'struct libapp::S1' at test0-fn-changed-libapp-v1= .cc:21:1: type size changed from 32 to 96 (in bits) diff --git a/tests/data/test-abicompat/test1-fn-removed-report-0.txt b/test= s/data/test-abicompat/test1-fn-removed-report-0.txt index e957129f..5165960f 100644 --- a/tests/data/test-abicompat/test1-fn-removed-report-0.txt +++ b/tests/data/test-abicompat/test1-fn-removed-report-0.txt @@ -4,5 +4,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void fun2()' {_Z4fun2v} + [D] 'function void fun2(void)' {_Z4fun2v} =20 diff --git a/tests/data/test-abicompat/test3-fn-removed-report-0.txt b/test= s/data/test-abicompat/test3-fn-removed-report-0.txt index e8eaf4b3..a58fef7b 100644 --- a/tests/data/test-abicompat/test3-fn-removed-report-0.txt +++ b/tests/data/test-abicompat/test3-fn-removed-report-0.txt @@ -4,5 +4,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void _internal_fun1()' {_Z4fun1v@@VERSION_1.0} + [D] 'function void _internal_fun1(void)' {_Z4fun1v@@VERSION_1.0} =20 diff --git a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt b/tes= ts/data/test-abidiff-exit/PR30048-test-2-report-1.txt index 2650b5a0..7bbbc2e2 100644 --- a/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt +++ b/tests/data/test-abidiff-exit/PR30048-test-2-report-1.txt @@ -3,22 +3,22 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable =20 7 functions with some indirect sub-type change: =20 - [C] 'function int[7]* N()' at PR30048-test-2-v0.cc:62:1 has some indirec= t sub-type changes: + [C] 'function int(*N(void))[7]' at PR30048-test-2-v0.cc:62:1 has some in= direct sub-type changes: return type changed: - entity changed from 'int[7]*' to 'int' + entity changed from 'int(*)[7]' to 'int' type size changed from 64 to 32 (in bits) =20 - [C] 'function int* O()' at PR30048-test-2-v0.cc:64:1 has some indirect s= ub-type changes: + [C] 'function int* O(void)' at PR30048-test-2-v0.cc:64:1 has some indire= ct sub-type changes: return type changed: entity changed from 'int*' to 'int' type size changed from 64 to 32 (in bits) =20 - [C] 'function int ()* P()' at PR30048-test-2-v0.cc:67:1 has some indirec= t sub-type changes: + [C] 'function int (*P(void))(void)' at PR30048-test-2-v0.cc:67:1 has som= e indirect sub-type changes: return type changed: - entity changed from 'int ()*' to 'int' + entity changed from 'int (*)(void)' to 'int' type size changed from 64 to 32 (in bits) =20 - [C] 'function amusement* fun()' at PR30048-test-2-v0.cc:57:1 has some in= direct sub-type changes: + [C] 'function amusement* fun(void)' at PR30048-test-2-v0.cc:57:1 has som= e indirect sub-type changes: return type changed: in pointed to type 'struct amusement' at PR30048-test-2-v1.cc:1:1: type size changed from 6528 to 768 (in bits) @@ -30,8 +30,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable entity changed from 'int*' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 256 to 32 (in bits) (by -224 bits) - type of 'int ()* C' changed: - entity changed from 'int ()*' to 'int' + type of 'int (* C)(void)' changed: + entity changed from 'int (*)(void)' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 320 to 64 (in bits) (by -256 bits) type of 'int D[7][7]' changed: @@ -42,32 +42,32 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable entity changed from 'int*[7]' to 'int' type size changed from 448 to 32 (in bits) and offset changed from 1984 to 128 (in bits) (by -1856 bits) - type of 'int ()* F[7]' changed: - entity changed from 'int ()*[7]' to 'int' + type of 'int (* F[7])(void)' changed: + entity changed from 'int (*[7])(void)' to 'int' type size changed from 448 to 32 (in bits) and offset changed from 2432 to 160 (in bits) (by -2272 bits) - type of 'int[7]* G' changed: - entity changed from 'int[7]*' to 'int' + type of 'int(* G)[7]' changed: + entity changed from 'int(*)[7]' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 2880 to 192 (in bits) (by -2688 bits) type of 'int** H' changed: entity changed from 'int**' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 2944 to 224 (in bits) (by -2720 bits) - type of 'int ()* I' changed: - entity changed from 'int ()*' to 'int' + type of 'int (* I)(void)' changed: + entity changed from 'int (*)(void)' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 3008 to 256 (in bits) (by -2752 bits) - type of 'int[7]* ()* J' changed: - entity changed from 'int[7]* ()*' to 'int' + type of 'int(*(* J)(void))[7]' changed: + entity changed from 'int(*(*)(void))[7]' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 3072 to 288 (in bits) (by -2784 bits) - type of 'int* ()* K' changed: - entity changed from 'int* ()*' to 'int' + type of 'int* (* K)(void)' changed: + entity changed from 'int* (*)(void)' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 3136 to 320 (in bits) (by -2816 bits) - type of 'int ()* ()* L' changed: - entity changed from 'int ()* ()*' to 'int' + type of 'int (*(* L)(void))(void)' changed: + entity changed from 'int (*(*)(void))(void)' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 3200 to 352 (in bits) (by -2848 bits) type of 'volatile int a[7]' changed: @@ -78,8 +78,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable entity changed from 'volatile int* const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 3520 to 416 (in bits) (by -3104 bits) - type of 'int ()* const c' changed: - entity changed from 'int ()* const' to 'int' + type of 'int (* const c)(void)' changed: + entity changed from 'int (*)(void) const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 3584 to 448 (in bits) (by -3136 bits) type of 'volatile int d[7][7]' changed: @@ -90,47 +90,47 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable entity changed from 'volatile int* const[7]' to 'int' type size changed from 448 to 32 (in bits) and offset changed from 5248 to 512 (in bits) (by -4736 bits) - type of 'int ()* const f[7]' changed: - entity changed from 'int ()* const[7]' to 'int' + type of 'void* const f[7]' changed: + entity changed from 'int (*)(void) const[7]' to 'int' type size changed from 448 to 32 (in bits) and offset changed from 5696 to 544 (in bits) (by -5152 bits) - type of 'volatile int[7]* const g' changed: - entity changed from 'volatile int[7]* const' to 'int' + type of 'volatile int(* const g)[7]' changed: + entity changed from 'volatile int(*)[7] const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 6144 to 576 (in bits) (by -5568 bits) type of 'volatile int* const* const h' changed: entity changed from 'volatile int* const* const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 6208 to 608 (in bits) (by -5600 bits) - type of 'int ()* const i' changed: - entity changed from 'int ()* const' to 'int' + type of 'int (* const i)(void)' changed: + entity changed from 'int (*)(void) const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 6272 to 640 (in bits) (by -5632 bits) - type of 'volatile int[7]* ()* const j' changed: - entity changed from 'volatile int[7]* ()* const' to 'int' + type of 'volatile int(*(* const j)(void))[7]' changed: + entity changed from 'volatile int(*(*)(void))[7] const' to 'in= t' type size changed from 64 to 32 (in bits) and offset changed from 6336 to 672 (in bits) (by -5664 bits) - type of 'volatile int* ()* const k' changed: - entity changed from 'volatile int* ()* const' to 'int' + type of 'volatile int* (* const k)(void)' changed: + entity changed from 'volatile int* (*)(void) const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 6400 to 704 (in bits) (by -5696 bits) - type of 'int ()* ()* const l' changed: - entity changed from 'int ()* ()* const' to 'int' + type of 'int (*(* const l)(void))(void)' changed: + entity changed from 'int (*(*)(void))(void) const' to 'int' type size changed from 64 to 32 (in bits) and offset changed from 6464 to 736 (in bits) (by -5728 bits) =20 - [C] 'function volatile int[7]* n()' at PR30048-test-2-v0.cc:72:1 has som= e indirect sub-type changes: + [C] 'function volatile int(*n(void))[7]' at PR30048-test-2-v0.cc:72:1 ha= s some indirect sub-type changes: return type changed: - entity changed from 'volatile int[7]*' to 'int' + entity changed from 'volatile int(*)[7]' to 'int' type size changed from 64 to 32 (in bits) =20 - [C] 'function volatile int* o()' at PR30048-test-2-v0.cc:74:1 has some i= ndirect sub-type changes: + [C] 'function volatile int* o(void)' at PR30048-test-2-v0.cc:74:1 has so= me indirect sub-type changes: return type changed: entity changed from 'volatile int*' to 'int' type size changed from 64 to 32 (in bits) =20 - [C] 'function int ()* p()' at PR30048-test-2-v0.cc:77:1 has some indirec= t sub-type changes: + [C] 'function int (*p(void))(void)' at PR30048-test-2-v0.cc:77:1 has som= e indirect sub-type changes: return type changed: - entity changed from 'int ()*' to 'int' + entity changed from 'int (*)(void)' to 'int' type size changed from 64 to 32 (in bits) =20 diff --git a/tests/data/test-abidiff-exit/PR30048-test-report-0.txt b/tests= /data/test-abidiff-exit/PR30048-test-report-0.txt index 23a4c10b..26c04c6d 100644 --- a/tests/data/test-abidiff-exit/PR30048-test-report-0.txt +++ b/tests/data/test-abidiff-exit/PR30048-test-report-0.txt @@ -8,12 +8,12 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added = variable type of variable changed: type size changed from 448 to 128 (in bits) 5 data member deletions: - 'int (int)* f01', at offset 0 (in bits) at PR30048-test-v0.c:2:1 - 'int (const int*)* f02', at offset 64 (in bits) at PR30048-test-v0= .c:3:1 - 'int (int* const)* f03', at offset 128 (in bits) at PR30048-test-v= 0.c:4:1 - 'int (int* restrict)* f04', at offset 192 (in bits) at PR30048-tes= t-v0.c:5:1 - 'int (const int* restrict)* f05', at offset 256 (in bits) at PR300= 48-test-v0.c:6:1 + 'int (* f01)(int)', at offset 0 (in bits) at PR30048-test-v0.c:2:1 + 'int (* f02)(const int*)', at offset 64 (in bits) at PR30048-test-= v0.c:3:1 + 'int (* f03)(int* const)', at offset 128 (in bits) at PR30048-test= -v0.c:4:1 + 'int (* f04)(int* restrict)', at offset 192 (in bits) at PR30048-t= est-v0.c:5:1 + 'int (* f05)(const int* restrict)', at offset 256 (in bits) at PR3= 0048-test-v0.c:6:1 2 data member changes: - 'int (int* restrict const)* f06' offset changed from 320 to 0 (in = bits) (by -320 bits) - 'int (int* restrict const)* f07' offset changed from 384 to 64 (in= bits) (by -320 bits) + 'int (* f06)(int* restrict const)' offset changed from 320 to 0 (i= n bits) (by -320 bits) + 'int (* f07)(int* restrict const)' offset changed from 384 to 64 (= in bits) (by -320 bits) =20 diff --git a/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt b/te= sts/data/test-abidiff-exit/PR30329/PR30329-report-1.txt index e5e40069..f83d9a11 100644 --- a/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt +++ b/tests/data/test-abidiff-exit/PR30329/PR30329-report-1.txt @@ -142,7 +142,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable 'void* pTrueEnd', at offset 704 (in bits= ) at sqlite3.c:16849:1 'sqlite3_xauth xAuth' offset changed from 3968= to 4032 (in bits) (by +64 bits) 'void* pAuthArg' offset changed from 4032 to 4= 096 (in bits) (by +64 bits) - 'int (void*)* xProgress' offset changed from 4= 096 to 4160 (in bits) (by +64 bits) + 'int (* xProgress)(void*)' offset changed from= 4096 to 4160 (in bits) (by +64 bits) 'void* pProgressArg' offset changed from 4160 = to 4224 (in bits) (by +64 bits) 'unsigned int nProgressOps' offset changed fro= m 4224 to 4288 (in bits) (by +64 bits) 'int nVTrans' offset changed from 4256 to 4320= (in bits) (by +64 bits) @@ -165,6 +165,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable 'sqlite3* pBlockingConnection' offset changed = from 6144 to 6208 (in bits) (by +64 bits) 'sqlite3* pUnlockConnection' offset changed fr= om 6208 to 6272 (in bits) (by +64 bits) 'void* pUnlockArg' offset changed from 6272 to= 6336 (in bits) (by +64 bits) - 'void (void**, int)* xUnlockNotify' offset cha= nged from 6336 to 6400 (in bits) (by +64 bits) + 'void (* xUnlockNotify)(void**, int)' offset c= hanged from 6336 to 6400 (in bits) (by +64 bits) 'sqlite3* pNextBlocked' offset changed from 64= 00 to 6464 (in bits) (by +64 bits) =20 diff --git a/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.= 64-report.txt b/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1= .2.64-report.txt index 2b451fb7..73a38f9f 100644 --- a/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-repo= rt.txt +++ b/tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-repo= rt.txt @@ -9,10 +9,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable underlying type 'struct SDL12_AudioCVT' at SDL12_compat.c:880:1 ch= anged: type size hasn't changed 1 data member change: - type of 'void (SDL_AudioCVT*, typedef Uint16)* filters[10]' ch= anged: - array element type 'void (SDL_AudioCVT*, typedef Uint16)*' c= hanged: - entity changed from 'void (SDL_AudioCVT*, typedef Uint16)*= ' to compatible type 'typedef SDL12_AudioCVTFilter' at SDL12_compat.c:903:1 - in pointed to type 'function type void (SDL_AudioCVT*, t= ypedef SDL_AudioFormat)': + type of 'void (* filters[10])(SDL_AudioCVT*, Uint16)' changed: + array element type 'void (*)(SDL_AudioCVT*, Uint16)' changed= : + entity changed from 'void (*)(SDL_AudioCVT*, Uint16)' to c= ompatible type 'typedef SDL12_AudioCVTFilter' at SDL12_compat.c:903:1 + in pointed to type 'function type void (SDL_AudioCVT*, S= DL_AudioFormat)': parameter 1 of type 'SDL_AudioCVT*' changed: in pointed to type 'struct SDL_AudioCVT' at SDL12_co= mpat.c:907:1: type name changed from 'SDL_AudioCVT' to 'SDL12_Au= dioCVT' @@ -21,6 +21,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable 'double len_ratio' offset changed from 288 to 32= 0 (in bits) (by +32 bits) name of 'SDL_AudioCVT::filters' changed to 'SDL1= 2_AudioCVT::filters' at SDL12_compat.c:918:1, offset changed from 352 to 38= 4 (in bits) (by +32 bits) 'int filter_index' offset changed from 992 to 10= 24 (in bits) (by +32 bits) - type name changed from 'void (SDL_AudioCVT*, typedef Uint16)= *[10]' to 'SDL12_AudioCVTFilter[10]' + type name changed from 'void (*[10])(SDL_AudioCVT*, Uint16)'= to 'SDL12_AudioCVTFilter[10]' type size hasn't changed =20 diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/t= est1-ada-subrange-report-1.txt b/tests/data/test-abidiff-exit/ada-subrange/= test1-ada-subrange/test1-ada-subrange-report-1.txt index 1233215e..69f3eb5f 100644 --- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ad= a-subrange-report-1.txt +++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ad= a-subrange-report-1.txt @@ -3,13 +3,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable =20 2 functions with some indirect sub-type change: =20 - [C] 'function test1__my_int[6] test1__first_function()' at test1.adb:6:1= has some indirect sub-type changes: + [C] 'function test1__my_int[6] test1__first_function(void)' at test1.adb= :6:1 has some indirect sub-type changes: return type changed: type name changed from 'test1__my_int[6]' to 'test1__my_int[7]' array type size changed from 6000 to 7000 array type subrange 1 changed length from 6 to 7 =20 - [C] 'function test1__my_index test1__second_function()' at test1.adb:14:= 1 has some indirect sub-type changes: + [C] 'function test1__my_index test1__second_function(void)' at test1.adb= :14:1 has some indirect sub-type changes: return type changed: upper bound of range 'test1__my_index' change from '5' to '6' =20 diff --git a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/t= est1-ada-subrange-report-2.txt b/tests/data/test-abidiff-exit/ada-subrange/= test1-ada-subrange/test1-ada-subrange-report-2.txt index 30d7488d..7c299ea9 100644 --- a/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ad= a-subrange-report-2.txt +++ b/tests/data/test-abidiff-exit/ada-subrange/test1-ada-subrange/test1-ad= a-subrange-report-2.txt @@ -5,13 +5,13 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Cha= nged, 0 Added variable =20 2 functions with some sub-type change: =20 - [C] 'function test1__my_int[6] test1__first_function()' at test1.adb:6:1= has some sub-type changes: + [C] 'function test1__my_int[6] test1__first_function(void)' at test1.adb= :6:1 has some sub-type changes: return type changed: type name changed from 'test1__my_int[6]' to 'test1__my_int[7]' array type size changed from 6000 to 7000 array type subrange 1 changed length from 6 to 7 =20 - [C] 'function test1__my_index test1__second_function()' at test1.adb:14:= 1 has some sub-type changes: + [C] 'function test1__my_index test1__second_function(void)' at test1.adb= :14:1 has some sub-type changes: return type changed: upper bound of range 'test1__my_index' change from '5' to '6' =20 diff --git a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.= txt b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt index 83b3e836..ac6ab3be 100644 --- a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt +++ b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt @@ -56,7 +56,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable entity changed from 'typedef C' to compatible type 'void* rest= rict const[7]' array element type 'void* const' changed: 'void* const' changed to 'void* restrict const' - type name changed from 'void* const[7]' to 'void* restrict c= onst[7]' + type name changed from 'void* const[7]' to 'void* const rest= rict[7]' type size hasn't changed type of 'D v_d' changed: entity changed from 'typedef D' to compatible type 'void* cons= t volatile[7]' @@ -68,18 +68,18 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable entity changed from 'typedef D' to compatible type 'void* rest= rict const[7]' array element type 'void* const' changed: 'void* const' changed to 'void* restrict const' - type name changed from 'void* const[7]' to 'void* restrict c= onst[7]' + type name changed from 'void* const[7]' to 'void* const rest= rict[7]' type size hasn't changed type of 'E r_e' changed: entity changed from 'typedef E' to compatible type 'void* rest= rict const volatile[7]' array element type 'void* const volatile' changed: 'void* const volatile' changed to 'void* restrict const vo= latile' - type name changed from 'void* const volatile[7]' to 'void* r= estrict const volatile[7]' + type name changed from 'void* const volatile[7]' to 'void* c= onst volatile restrict const[7]' type size hasn't changed type of 'F r_f' changed: entity changed from 'typedef F' to compatible type 'void* rest= rict const volatile[7]' array element type 'void* const volatile' changed: 'void* const volatile' changed to 'void* restrict const vo= latile' - type name changed from 'void* const volatile[7]' to 'void* r= estrict const volatile[7]' + type name changed from 'void* const volatile[7]' to 'void* c= onst volatile restrict const[7]' type size hasn't changed =20 diff --git a/tests/data/test-abidiff-exit/test-fun-param-report.txt b/tests= /data/test-abidiff-exit/test-fun-param-report.txt index 7e357483..e37bf0df 100644 --- a/tests/data/test-abidiff-exit/test-fun-param-report.txt +++ b/tests/data/test-abidiff-exit/test-fun-param-report.txt @@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable in pointed to type 'struct ops' at test-fun-param-v1.c:1:1: type size hasn't changed 1 data member change: - type of 'void (void*, unsigned int, unsigned long int)* bind_cla= ss' changed: + type of 'void (* bind_class)(void*, unsigned int, unsigned long = int)' changed: in pointed to type 'function type void (void*, unsigned int, u= nsigned long int)': parameter 4 of type 'void*' was added parameter 5 of type 'unsigned long int' was added diff --git a/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.= so.txt b/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.t= xt index 16d4dc97..365a8f88 100644 --- a/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt +++ b/tests/data/test-abidiff-exit/test-ld-2.28-210.so--ld-2.28-211.so.txt @@ -7,10 +7,10 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added = variable type of variable changed: type size hasn't changed 6 data member changes: - 'int (const char**, const char**, bool*, void (void*)*, void*)* _d= l_catch_error' offset changed from 5120 to 5376 (in bits) (by +256 bits) - 'void (void*)* _dl_error_free' offset changed from 5184 to 5440 (i= n bits) (by +256 bits) - 'void* (link_map*)* _dl_tls_get_addr_soft' offset changed from 524= 8 to 5120 (in bits) (by -128 bits) - 'int ()* _dl_discover_osversion' offset changed from 5312 to 5184 = (in bits) (by -128 bits) + 'int (* _dl_catch_error)(const char**, const char**, bool*, void*,= void*)' offset changed from 5120 to 5376 (in bits) (by +256 bits) + 'void (* _dl_error_free)(void*)' offset changed from 5184 to 5440 = (in bits) (by +256 bits) + 'void* (* _dl_tls_get_addr_soft)(link_map*)' offset changed from 5= 248 to 5120 (in bits) (by -128 bits) + 'int (* _dl_discover_osversion)(void)' offset changed from 5312 to= 5184 (in bits) (by -128 bits) 'audit_ifaces* _dl_audit' offset changed from 5376 to 5248 (in bit= s) (by -128 bits) 'unsigned int _dl_naudit' offset changed from 5440 to 5312 (in bit= s) (by -128 bits) =20 diff --git a/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt b/t= ests/data/test-abidiff-exit/test-leaf-fun-type-report.txt index 1caf2cba..38be69a9 100644 --- a/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt +++ b/tests/data/test-abidiff-exit/test-leaf-fun-type-report.txt @@ -6,5 +6,5 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Chang= ed, 0 Added variable 'struct ops' changed: type size hasn't changed there are data member changes: - type 'void (int)*' of 'ops::munge' changed: - pointer type changed from: 'void (int)*' to: 'char (long int, bool)*= ' + type 'void (*)(int)' of 'ops::munge' changed: + pointer type changed from: 'void (*)(int)' to: 'char (*)(long int, b= ool)' diff --git a/tests/data/test-abidiff-exit/test-leaf-more-report.txt b/tests= /data/test-abidiff-exit/test-leaf-more-report.txt index aea08b81..c0a692c6 100644 --- a/tests/data/test-abidiff-exit/test-leaf-more-report.txt +++ b/tests/data/test-abidiff-exit/test-leaf-more-report.txt @@ -5,15 +5,15 @@ Removed/Changed/Added variables summary: 1 Removed, 1 Cha= nged, 1 Added variable =20 1 Removed function: =20 - [D] 'function int deleted_fun()' {_Z11deleted_funv} + [D] 'function int deleted_fun(void)' {_Z11deleted_funv} =20 1 Added function: =20 - [A] 'function long int added_fun()' {_Z9added_funv} + [A] 'function long int added_fun(void)' {_Z9added_funv} =20 1 function with some sub-type change: =20 - [C] 'function int directly_changed_fun()' has some sub-type changes: + [C] 'function int directly_changed_fun(void)' has some sub-type changes: return type changed: type name changed from 'int' to 'long int' type size changed from 32 to 64 (in bits) diff --git a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt b/te= sts/data/test-abidiff-exit/test-leaf-peeling-report.txt index 7c51164b..a8eb1cd8 100644 --- a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt +++ b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt @@ -24,8 +24,8 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Cha= nged, 0 Added variable 'struct ops3 at test-leaf-peeling-v0.cc:14:1' changed: type size hasn't changed there are data member changes: - type 'void (int&)*' of 'ops3::spong' changed: - pointer type changed from: 'void (int&)*' to: 'void (int&&)*' + type 'void (*)(int&)' of 'ops3::spong' changed: + pointer type changed from: 'void (*)(int&)' to: 'void (*)(int&&)' =20 'struct ops4 at test-leaf-peeling-v0.cc:18:1' changed: type size hasn't changed diff --git a/tests/data/test-abidiff-exit/test-leaf-stats-report.txt b/test= s/data/test-abidiff-exit/test-leaf-stats-report.txt index 25ee8dc5..e17b461b 100644 --- a/tests/data/test-abidiff-exit/test-leaf-stats-report.txt +++ b/tests/data/test-abidiff-exit/test-leaf-stats-report.txt @@ -5,7 +5,7 @@ Removed/Changed/Added variables summary: 0 Removed, 1 Chang= ed, 0 Added variable =20 1 function with some sub-type change: =20 - [C] 'function int changed_fun()' has some sub-type changes: + [C] 'function int changed_fun(void)' has some sub-type changes: return type changed: type name changed from 'int' to 'long int' type size changed from 32 to 64 (in bits) diff --git a/tests/data/test-abidiff-exit/test-net-change-report0.txt b/tes= ts/data/test-abidiff-exit/test-net-change-report0.txt index 64ac3a83..e087c15f 100644 --- a/tests/data/test-abidiff-exit/test-net-change-report0.txt +++ b/tests/data/test-abidiff-exit/test-net-change-report0.txt @@ -3,15 +3,15 @@ Variables changes summary: 1 Removed, 1 Changed, 1 Added = variables =20 1 Removed function: =20 - [D] 'function int fun_removed()' {fun_removed} + [D] 'function int fun_removed(void)' {fun_removed} =20 1 Added function: =20 - [A] 'function long int fun_added()' {fun_added} + [A] 'function long int fun_added(void)' {fun_added} =20 2 functions with some indirect sub-type change: =20 - [C] 'function int fun_changed()' has some indirect sub-type changes: + [C] 'function int fun_changed(void)' has some indirect sub-type changes: return type changed: type name changed from 'int' to 'long int' type size changed from 32 to 64 (in bits) diff --git a/tests/data/test-abidiff-exit/test-net-change-report2.txt b/tes= ts/data/test-abidiff-exit/test-net-change-report2.txt index ca3b3e05..c6fd8079 100644 --- a/tests/data/test-abidiff-exit/test-net-change-report2.txt +++ b/tests/data/test-abidiff-exit/test-net-change-report2.txt @@ -5,15 +5,15 @@ Removed/Changed/Added variables summary: 1 Removed, 1 Cha= nged, 1 Added variable =20 1 Removed function: =20 - [D] 'function int fun_removed()' {fun_removed} + [D] 'function int fun_removed(void)' {fun_removed} =20 1 Added function: =20 - [A] 'function long int fun_added()' {fun_added} + [A] 'function long int fun_added(void)' {fun_added} =20 1 function with some sub-type change: =20 - [C] 'function int fun_changed()' has some sub-type changes: + [C] 'function int fun_changed(void)' has some sub-type changes: return type changed: type name changed from 'int' to 'long int' type size changed from 32 to 64 (in bits) diff --git a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report= 0.txt b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt index 6640a6dd..ecfcc70d 100644 --- a/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt +++ b/tests/data/test-abidiff-exit/test2-filtered-removed-fns-report0.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void to_erase()' {to_erase} + [D] 'function void to_erase(void)' {to_erase} =20 diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/= test-abidiff/test-PR18791-report0.txt index 49c96d53..18cb0cf9 100644 --- a/tests/data/test-abidiff/test-PR18791-report0.txt +++ b/tests/data/test-abidiff/test-PR18791-report0.txt @@ -16,11 +16,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable in pointed to type 'struct sigc::connection': type size hasn't changed 1 data member change: - type of 'sigc::slot_base* slot_' changed: + type of 'slot_base* slot_' changed: in pointed to type 'class sigc::slot_base': type size hasn't changed 1 data member change: - type of 'sigc::slot_base::rep_type* rep_' changed: + type of 'rep_type* rep_' changed: in pointed to type 'typedef sigc::slot_base::rep_type': underlying type 'struct sigc::internal::slot_rep' chan= ged: type size hasn't changed @@ -28,7 +28,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable 'struct sigc::trackable' changed: type size hasn't changed 1 data member change: - type of 'sigc::internal::trackable_callback_li= st* callback_list_' changed: + type of 'trackable_callback_list* callback_lis= t_' changed: in pointed to type 'struct sigc::internal::t= rackable_callback_list': type size changed from 192 to 256 (in bits= ) 2 data member changes: @@ -169,7 +169,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable 'struct sigc::trackable' changed: details were reported earlier 1 data member change: - type of 'sigc::internal::signal_impl* impl_' changed: + type of 'signal_impl* impl_' changed: pointed to type 'struct sigc::internal::signal_impl' changed, = as reported earlier =20 [C] 'method bool sigc::signal_base::blocked()' has some indirect sub-typ= e changes: diff --git a/tests/data/test-abidiff/test-crc-report-0-1.txt b/tests/data/t= est-abidiff/test-crc-report-0-1.txt index 0db42f68..0a6438f5 100644 --- a/tests/data/test-abidiff/test-crc-report-0-1.txt +++ b/tests/data/test-abidiff/test-crc-report-0-1.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added va= riables =20 1 function with some indirect sub-type change: =20 - [C] 'function void exported_function()' has some indirect sub-type chang= es: + [C] 'function void exported_function(void)' has some indirect sub-type c= hanges: CRC (modversions) changed from (none) to 0xe52d5bcf =20 2 Changed variables: diff --git a/tests/data/test-abidiff/test-crc-report-1-0.txt b/tests/data/t= est-abidiff/test-crc-report-1-0.txt index e11f29c1..cb2fb86e 100644 --- a/tests/data/test-abidiff/test-crc-report-1-0.txt +++ b/tests/data/test-abidiff/test-crc-report-1-0.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added va= riables =20 1 function with some indirect sub-type change: =20 - [C] 'function void exported_function()' has some indirect sub-type chang= es: + [C] 'function void exported_function(void)' has some indirect sub-type c= hanges: CRC (modversions) changed from 0xe52d5bcf to (none) =20 2 Changed variables: diff --git a/tests/data/test-abidiff/test-crc-report-1-2.txt b/tests/data/t= est-abidiff/test-crc-report-1-2.txt index 9bea309e..809e278f 100644 --- a/tests/data/test-abidiff/test-crc-report-1-2.txt +++ b/tests/data/test-abidiff/test-crc-report-1-2.txt @@ -3,6 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 function with some indirect sub-type change: =20 - [C] 'function void exported_function()' has some indirect sub-type chang= es: + [C] 'function void exported_function(void)' has some indirect sub-type c= hanges: CRC (modversions) changed from 0xe52d5bcf to 0xe52d5bd0 =20 diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/te= st-annotate/test13-pr18894.so.abi index 9abd7adf..850b1255 100644 --- a/tests/data/test-annotate/test13-pr18894.so.abi +++ b/tests/data/test-annotate/test13-pr18894.so.abi @@ -1293,19 +1293,19 @@ - + - + - + - + @@ -1324,13 +1324,13 @@ - + - + + - + @@ -1340,11 +1340,11 @@ - + - + - + @@ -1354,9 +1354,9 @@ - + - + @@ -1364,67 +1364,67 @@ - + + - - + - + + + - + - + - + - + - + - + - + - + - + + + + + + + + + - - - - - - - - - - - + - + - + - + - + - + @@ -1482,7 +1482,7 @@ - + @@ -1692,14 +1692,14 @@ - + - + @@ -1708,7 +1708,7 @@ - + @@ -1734,7 +1734,7 @@ - + @@ -1927,7 +1927,7 @@ - + @@ -1949,7 +1949,7 @@ - + @@ -2015,7 +2015,7 @@ - + @@ -2030,7 +2030,7 @@ - + @@ -2043,7 +2043,7 @@ - + @@ -2058,7 +2058,7 @@ - + @@ -2091,21 +2091,21 @@ - + - + - + @@ -2227,7 +2227,7 @@ - + @@ -2238,7 +2238,7 @@ - + @@ -2249,7 +2249,7 @@ - + @@ -2260,18 +2260,18 @@ - + - + - + - + @@ -2300,7 +2300,7 @@ - + @@ -2309,7 +2309,7 @@ - + @@ -2429,7 +2429,7 @@ - + @@ -2908,7 +2908,7 @@ - + @@ -3094,14 +3094,14 @@ - + - + @@ -3146,7 +3146,7 @@ - + @@ -3216,7 +3216,7 @@ - + @@ -3235,28 +3235,28 @@ - + - + - + - + - + - + @@ -3269,49 +3269,49 @@ - + - + - + - + - + - + - + @@ -3324,7 +3324,7 @@ - + @@ -3333,7 +3333,7 @@ - + @@ -3411,7 +3411,7 @@ - + @@ -3425,17 +3425,17 @@ - + - + - + @@ -3460,9 +3460,9 @@ - + - + @@ -3592,14 +3592,14 @@ - + - + @@ -3900,72 +3900,72 @@ - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + @@ -4018,20 +4018,15 @@ - - - - - - + - + @@ -4040,12 +4035,17 @@ - + + + + + + @@ -4083,28 +4083,28 @@ - + - + - + - + - + @@ -4115,14 +4115,14 @@ - + - + @@ -4140,7 +4140,7 @@ - + @@ -4151,7 +4151,7 @@ - + @@ -4200,49 +4200,49 @@ - + - + - + - + - + - + - + - + @@ -4253,14 +4253,14 @@ - + - + @@ -4269,7 +4269,7 @@ - + diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/te= st-annotate/test14-pr18893.so.abi index 07e81a50..e7f0e2c6 100644 --- a/tests/data/test-annotate/test14-pr18893.so.abi +++ b/tests/data/test-annotate/test14-pr18893.so.abi @@ -186,51 +186,51 @@ - - + - + - + - + - + - + - + - + - + - + @@ -578,9 +578,9 @@ - + - + @@ -942,48 +942,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -1018,7 +1018,7 @@ - + @@ -1096,51 +1096,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -2131,48 +2131,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -2207,7 +2207,7 @@ - + @@ -2252,9 +2252,9 @@ - + - + @@ -2883,51 +2883,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -3878,7 +3878,7 @@ - + @@ -13565,9 +13565,9 @@ - + - + @@ -14368,7 +14368,7 @@ - + @@ -14386,7 +14386,7 @@ - + @@ -14885,7 +14885,7 @@ - + @@ -14919,11 +14919,11 @@ - + - + @@ -14934,11 +14934,11 @@ - + - + @@ -14949,11 +14949,11 @@ - + - + @@ -15027,11 +15027,11 @@ - + - + @@ -15173,11 +15173,11 @@ - + - + @@ -15323,7 +15323,7 @@ - + @@ -15337,7 +15337,7 @@ - + @@ -15399,22 +15399,22 @@ - + - + - + - + @@ -16402,11 +16402,11 @@ - + - + @@ -16455,11 +16455,11 @@ - + - + @@ -16620,11 +16620,11 @@ - + - + @@ -16655,11 +16655,11 @@ - + - + @@ -16690,11 +16690,11 @@ - + - + @@ -16725,11 +16725,11 @@ - + - + @@ -16760,11 +16760,11 @@ - + - + @@ -16795,11 +16795,11 @@ - + - + @@ -16827,14 +16827,14 @@ + + - - @@ -21338,13 +21338,13 @@ - + - + @@ -21413,13 +21413,13 @@ - + - + @@ -21470,13 +21470,13 @@ - + - + @@ -21527,13 +21527,13 @@ - + - + @@ -21584,13 +21584,13 @@ - + - + @@ -21641,13 +21641,13 @@ - + - + @@ -21698,13 +21698,13 @@ - + - + @@ -21755,13 +21755,13 @@ - + - + @@ -21812,13 +21812,13 @@ - + - + @@ -22310,7 +22310,7 @@ - + @@ -22429,7 +22429,7 @@ - + @@ -22469,7 +22469,7 @@ - + @@ -22485,23 +22485,23 @@ - + - + - + - + - + @@ -22517,27 +22517,27 @@ - - + - + - + - - + @@ -22629,7 +22629,7 @@ - + @@ -22660,7 +22660,7 @@ - + @@ -22763,27 +22763,27 @@ - + - + - + - - - - - - - - - + + + + + + + + + - + - + - + @@ -22943,7 +22943,7 @@ - + @@ -22956,7 +22956,7 @@ - + @@ -22971,14 +22971,14 @@ - + - + @@ -23370,7 +23370,7 @@ - + @@ -23378,14 +23378,14 @@ - + - - - + + + diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/te= st-annotate/test15-pr18892.so.abi index b749a0a6..65e69956 100644 --- a/tests/data/test-annotate/test15-pr18892.so.abi +++ b/tests/data/test-annotate/test15-pr18892.so.abi @@ -3123,11 +3123,11 @@ - + - + - + @@ -3139,9 +3139,9 @@ - + - + @@ -3191,7 +3191,7 @@ - + @@ -3199,7 +3199,7 @@ - + @@ -3437,9 +3437,9 @@ - + - + @@ -4338,7 +4338,7 @@ - + @@ -4393,7 +4393,7 @@ - + @@ -4414,7 +4414,7 @@ - + @@ -4609,9 +4609,9 @@ - + - + @@ -4853,7 +4853,7 @@ - + @@ -4982,7 +4982,7 @@ - + @@ -5062,11 +5062,11 @@ - + - + @@ -5289,7 +5289,7 @@ - + @@ -5335,13 +5335,8 @@ - - - - - - + @@ -5355,6 +5350,11 @@ + + + + + @@ -6162,9 +6162,9 @@ - + - + @@ -6456,20 +6456,20 @@ - + - + - + - + @@ -6477,7 +6477,7 @@ - + @@ -6699,7 +6699,7 @@ - + @@ -6782,7 +6782,7 @@ - + @@ -6798,7 +6798,7 @@ - + @@ -8065,9 +8065,9 @@ - + - + @@ -8129,7 +8129,7 @@ - + @@ -8169,7 +8169,7 @@ - + @@ -8545,7 +8545,7 @@ - + @@ -8555,7 +8555,7 @@ - @@ -8842,7 +8842,7 @@ - + @@ -8939,25 +8939,25 @@ - + - + - + - + - - + - + - + @@ -9038,7 +9038,7 @@ - + @@ -9185,7 +9185,7 @@ - + @@ -9564,11 +9564,11 @@ - + - + @@ -9835,7 +9835,7 @@ - + @@ -10669,7 +10669,7 @@ - + @@ -10681,7 +10681,7 @@ - + @@ -10999,20 +10999,20 @@ - + - + - + @@ -11024,7 +11024,7 @@ - + @@ -11064,645 +11064,645 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - - + + - + - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - - - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -11734,7 +11734,7 @@ - + @@ -11745,8 +11745,42 @@ + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + @@ -11754,575 +11788,541 @@ - + - + - + - + - + - + - + - + - + - + - + - + + + - - - + + + - + - + - - - + + + - + - + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - - - - - + + + + + - + - + - + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + - + - - - + - + - + - + - + - + - + - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - + - + - + - + @@ -13069,7 +13069,7 @@ - + @@ -13080,7 +13080,7 @@ - + @@ -13093,7 +13093,7 @@ - + @@ -13143,7 +13143,7 @@ - + @@ -13154,7 +13154,7 @@ - + @@ -13167,7 +13167,7 @@ - + @@ -13202,7 +13202,7 @@ - + @@ -13211,14 +13211,14 @@ - + - + @@ -13227,7 +13227,7 @@ - + @@ -13248,14 +13248,14 @@ - + - + @@ -13268,7 +13268,7 @@ - + @@ -13277,7 +13277,7 @@ - + @@ -13288,7 +13288,7 @@ - + @@ -13299,7 +13299,7 @@ - + @@ -13308,7 +13308,7 @@ - + @@ -13319,7 +13319,7 @@ - + @@ -13330,7 +13330,7 @@ - + @@ -13563,7 +13563,7 @@ - + @@ -13574,14 +13574,14 @@ - + - + @@ -13590,18 +13590,18 @@ - + - + - + @@ -13616,13 +13616,13 @@ - + - + @@ -13633,13 +13633,13 @@ - + - + @@ -13652,13 +13652,13 @@ - + - + @@ -13708,7 +13708,7 @@ - + @@ -13717,7 +13717,7 @@ - + @@ -13726,7 +13726,7 @@ - + @@ -13735,7 +13735,7 @@ - + @@ -13764,16 +13764,16 @@ - + - + - + @@ -13782,16 +13782,16 @@ - + - + - + @@ -13838,7 +13838,7 @@ - + @@ -13849,7 +13849,7 @@ - + @@ -13899,7 +13899,7 @@ - + @@ -13910,7 +13910,7 @@ - + @@ -13923,7 +13923,7 @@ - + @@ -14014,7 +14014,7 @@ - + @@ -14027,7 +14027,7 @@ - + @@ -14040,14 +14040,14 @@ - + - + @@ -14058,13 +14058,13 @@ - + - + @@ -14073,7 +14073,7 @@ - + @@ -14082,7 +14082,7 @@ - + @@ -14091,7 +14091,7 @@ - + @@ -14100,7 +14100,7 @@ - + @@ -14111,21 +14111,21 @@ - + - + - + @@ -14134,9 +14134,9 @@ - + - + @@ -14156,7 +14156,7 @@ - + @@ -14216,20 +14216,20 @@ - + - + - + @@ -14315,7 +14315,7 @@ - + @@ -14324,14 +14324,14 @@ - + - + @@ -14340,7 +14340,7 @@ - + @@ -14349,7 +14349,7 @@ - + @@ -14358,7 +14358,7 @@ - + @@ -14369,9 +14369,9 @@ - + - + @@ -14389,7 +14389,7 @@ - + @@ -14454,7 +14454,7 @@ - + @@ -14515,9 +14515,9 @@ - + - + @@ -14526,9 +14526,9 @@ - + - + @@ -14537,9 +14537,9 @@ - + - + @@ -14629,7 +14629,7 @@ - + @@ -14638,16 +14638,16 @@ - + - + - + @@ -14656,9 +14656,9 @@ - + - + @@ -14671,13 +14671,13 @@ - + - + - + - + @@ -14693,7 +14693,7 @@ - + @@ -14706,7 +14706,7 @@ - + @@ -14717,7 +14717,7 @@ - + @@ -14734,7 +14734,7 @@ - + @@ -15100,7 +15100,7 @@ @@ -15293,7 +15293,7 @@ @@ -15304,7 +15304,7 @@ @@ -17913,7 +17913,7 @@ - + @@ -17930,7 +17930,7 @@ - + @@ -17943,7 +17943,7 @@ - + @@ -17956,7 +17956,7 @@ - + @@ -17965,9 +17965,9 @@ - + - + @@ -17978,9 +17978,9 @@ - + - + @@ -18006,7 +18006,7 @@ @@ -18034,7 +18034,7 @@ @@ -18412,11 +18412,11 @@ - + - + - + @@ -18460,11 +18460,11 @@ - + - + - + @@ -18505,7 +18505,7 @@ - + @@ -18516,7 +18516,7 @@ - + @@ -18525,7 +18525,7 @@ - + @@ -18536,7 +18536,7 @@ - + @@ -18689,7 +18689,7 @@ - + @@ -18702,7 +18702,7 @@ - + @@ -18737,7 +18737,7 @@ - + @@ -18750,7 +18750,7 @@ - + @@ -18817,7 +18817,7 @@ - + @@ -18834,7 +18834,7 @@ - + @@ -18849,7 +18849,7 @@ - + @@ -18866,7 +18866,7 @@ - + @@ -19133,7 +19133,7 @@ - + @@ -19146,7 +19146,7 @@ - + @@ -19157,7 +19157,7 @@ - + @@ -19170,7 +19170,7 @@ - + @@ -19181,7 +19181,7 @@ - + @@ -19194,7 +19194,7 @@ - + @@ -19205,7 +19205,7 @@ - + @@ -19220,7 +19220,7 @@ - + @@ -19233,7 +19233,7 @@ - + @@ -19246,7 +19246,7 @@ - + @@ -19257,7 +19257,7 @@ - + @@ -19270,7 +19270,7 @@ - + @@ -19315,7 +19315,7 @@ - + @@ -19334,7 +19334,7 @@ - + @@ -19429,7 +19429,7 @@ - + @@ -19448,7 +19448,7 @@ - + @@ -19562,7 +19562,7 @@ - + @@ -19575,11 +19575,11 @@ @@ -19592,11 +19592,11 @@ @@ -20585,7 +20585,7 @@ - + @@ -20594,7 +20594,7 @@ - + @@ -21595,7 +21595,7 @@ - + @@ -21610,7 +21610,7 @@ - + @@ -21899,11 +21899,11 @@ @@ -21918,11 +21918,11 @@ @@ -21933,7 +21933,7 @@ - + @@ -21950,7 +21950,7 @@ - + @@ -21981,7 +21981,7 @@ @@ -21998,7 +21998,7 @@ @@ -22143,7 +22143,7 @@ - + @@ -22162,7 +22162,7 @@ - + @@ -22179,7 +22179,7 @@ - + @@ -22198,7 +22198,7 @@ - + @@ -22237,10 +22237,10 @@ - + - + @@ -22254,7 +22254,7 @@ - + @@ -22265,7 +22265,7 @@ - + @@ -22276,9 +22276,9 @@ - + - + @@ -22287,7 +22287,7 @@ - + @@ -22298,7 +22298,7 @@ - + @@ -22309,9 +22309,9 @@ - + - + @@ -22320,7 +22320,7 @@ - + @@ -22331,7 +22331,7 @@ - + @@ -22342,9 +22342,9 @@ - + - + @@ -22353,7 +22353,7 @@ - + @@ -22362,29 +22362,29 @@ - + - + - + - + - + @@ -22395,16 +22395,16 @@ - + - + - + @@ -22467,7 +22467,7 @@ - + @@ -22478,9 +22478,9 @@ - + - + @@ -22489,7 +22489,7 @@ - + @@ -22500,7 +22500,7 @@ - + @@ -22511,9 +22511,9 @@ - + - + @@ -22522,7 +22522,7 @@ - + @@ -22533,9 +22533,9 @@ - + - + @@ -22544,7 +22544,7 @@ - + @@ -22555,17 +22555,17 @@ - + - + - + @@ -22575,7 +22575,7 @@ - + @@ -22584,7 +22584,7 @@ - + @@ -22593,7 +22593,7 @@ - + @@ -22602,7 +22602,7 @@ - + @@ -22611,7 +22611,7 @@ - + @@ -22626,7 +22626,7 @@ - + @@ -22637,7 +22637,7 @@ - + @@ -22646,18 +22646,18 @@ - + - + - + @@ -22666,14 +22666,14 @@ - + - + @@ -22704,7 +22704,7 @@ - + @@ -22719,7 +22719,7 @@ - + @@ -22734,21 +22734,21 @@ - + - + - + @@ -22760,11 +22760,11 @@ - + - + - + - + @@ -22848,7 +22848,7 @@ - + @@ -22875,7 +22875,7 @@ - + @@ -22886,7 +22886,7 @@ - + @@ -22906,7 +22906,7 @@ - + @@ -22917,7 +22917,7 @@ - + @@ -22939,7 +22939,7 @@ - + @@ -22986,14 +22986,14 @@ - + - + @@ -23001,7 +23001,7 @@ - + @@ -23016,17 +23016,17 @@ - + - + - + - + - + @@ -23357,7 +23357,7 @@ - + @@ -23395,9 +23395,9 @@ - + - + @@ -23430,11 +23430,11 @@ - + - + @@ -23467,9 +23467,9 @@ - + @@ -23558,25 +23558,25 @@ - + - + - + - + - + - + @@ -23705,7 +23705,7 @@ - + @@ -23714,7 +23714,7 @@ - + @@ -23737,7 +23737,7 @@ - + @@ -23746,7 +23746,7 @@ - + @@ -23966,31 +23966,31 @@ - + - + - + - + - + @@ -24194,11 +24194,11 @@ - + - + @@ -24752,9 +24752,9 @@ - + - + @@ -24770,7 +24770,7 @@ @@ -25559,60 +25559,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -25620,85 +25620,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -25707,18 +25707,18 @@ - + - + - + @@ -25729,7 +25729,7 @@ - + @@ -25738,7 +25738,7 @@ - + @@ -25747,7 +25747,7 @@ - + @@ -25756,7 +25756,7 @@ - + @@ -25765,14 +25765,14 @@ - + - + @@ -25781,7 +25781,7 @@ - + @@ -25792,7 +25792,7 @@ - + @@ -25805,14 +25805,14 @@ - + - + @@ -25821,16 +25821,16 @@ - + - + - + @@ -25839,39 +25839,39 @@ - + - + - + - + - + - + - + @@ -25882,7 +25882,7 @@ - + @@ -25893,7 +25893,7 @@ - + @@ -25902,7 +25902,7 @@ - + @@ -25911,23 +25911,23 @@ - + - + - + - + @@ -25938,7 +25938,7 @@ - + @@ -25946,30 +25946,25 @@ - - - - - - + - + - + - + - + @@ -25978,47 +25973,47 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -26027,18 +26022,18 @@ - + - + - + - + @@ -26047,22 +26042,22 @@ - + - + - + - + - + @@ -26071,11 +26066,11 @@ - + - + @@ -26084,74 +26079,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -26160,7 +26155,7 @@ - + @@ -26169,64 +26164,72 @@ - + - + - + - + - + - + - + - + - + + + + + + + + + - + - + - + @@ -26234,19 +26237,29 @@ + + + + + + + + + + - + - + - + @@ -26256,18 +26269,8 @@ - - - - - - - - - - - + @@ -26276,7 +26279,7 @@ - + @@ -26287,24 +26290,16 @@ - + - - - - - - - - - + - + @@ -26313,28 +26308,28 @@ - + - + - + - + @@ -26343,7 +26338,7 @@ - + @@ -26354,22 +26349,22 @@ - + - + - + - + @@ -26378,29 +26373,29 @@ - + - + - + - + - + - + @@ -26411,7 +26406,7 @@ - + @@ -26422,7 +26417,7 @@ - + @@ -26431,7 +26426,7 @@ - + @@ -26442,7 +26437,7 @@ - + @@ -26455,7 +26450,7 @@ - + @@ -26466,7 +26461,7 @@ - + @@ -26479,7 +26474,7 @@ - + @@ -26492,7 +26487,7 @@ - + @@ -26507,7 +26502,7 @@ - + @@ -26518,7 +26513,7 @@ - + @@ -26531,27 +26526,27 @@ - + - + - + - + - + - + @@ -26566,7 +26561,7 @@ - + @@ -26577,7 +26572,7 @@ - + @@ -26588,7 +26583,7 @@ - + @@ -26597,7 +26592,7 @@ - + @@ -26608,7 +26603,7 @@ - + @@ -26619,7 +26614,7 @@ - + @@ -26630,7 +26625,7 @@ - + @@ -26643,7 +26638,7 @@ - + @@ -26656,7 +26651,7 @@ - + @@ -26667,7 +26662,7 @@ - + @@ -26678,7 +26673,7 @@ - + @@ -26689,7 +26684,7 @@ - + @@ -26702,7 +26697,7 @@ - + @@ -26715,7 +26710,7 @@ - + @@ -26728,7 +26723,7 @@ - + @@ -26739,7 +26734,7 @@ - + @@ -26748,7 +26743,7 @@ - + @@ -26757,7 +26752,7 @@ - + @@ -26768,7 +26763,7 @@ - + @@ -26776,25 +26771,25 @@ - - - - - - - - - - + + + - - - + + + + + + + + + + @@ -26803,15 +26798,20 @@ + + + + + - + - + @@ -26820,7 +26820,7 @@ - + @@ -26831,59 +26831,59 @@ - + - + - + - + - + - + - + - - + - - + - + + - + - + - + @@ -26892,7 +26892,7 @@ - + @@ -26901,7 +26901,7 @@ - + @@ -26910,16 +26910,16 @@ - + - + - + @@ -26927,20 +26927,20 @@ - + - + - + @@ -26951,16 +26951,16 @@ - + - + - + @@ -26969,7 +26969,7 @@ - + @@ -26979,17 +26979,17 @@ - - + + - + - + @@ -26998,18 +26998,18 @@ - + - + - + @@ -27020,7 +27020,7 @@ - + @@ -27030,13 +27030,13 @@ - - + + - + @@ -27044,7 +27044,7 @@ - + @@ -27055,7 +27055,7 @@ - + @@ -27068,11 +27068,11 @@ - + - + @@ -27083,11 +27083,11 @@ - + - + @@ -27096,18 +27096,18 @@ - + - + - + @@ -27118,7 +27118,7 @@ - + @@ -27145,29 +27145,29 @@ - + - + - + - + - + - + - + @@ -27180,7 +27180,7 @@ - + @@ -27195,7 +27195,7 @@ - + @@ -27208,7 +27208,7 @@ - + @@ -27218,14 +27218,23 @@ + + + + + + + + + - + - + @@ -27234,9 +27243,9 @@ - + - + @@ -27245,27 +27254,18 @@ - + - + - - - - - - - - - - + @@ -27299,14 +27299,14 @@ - + - + @@ -27315,7 +27315,7 @@ - + @@ -27326,7 +27326,7 @@ - + @@ -27337,7 +27337,7 @@ - + @@ -27346,7 +27346,7 @@ - + @@ -27394,7 +27394,7 @@ - + @@ -27403,14 +27403,14 @@ - + - + @@ -27424,7 +27424,7 @@ - + @@ -27433,7 +27433,7 @@ - + @@ -28537,10 +28537,10 @@ - + - + @@ -28612,7 +28612,7 @@ - + @@ -28754,9 +28754,9 @@ - + - + @@ -30011,11 +30011,11 @@ - + - + @@ -30997,7 +30997,7 @@ - + @@ -31048,11 +31048,11 @@ - + - + @@ -33500,7 +33500,7 @@ @@ -36919,10 +36919,10 @@ - - - - + + + + @@ -37221,11 +37221,11 @@ - + - + @@ -37315,7 +37315,7 @@ - + @@ -37324,7 +37324,7 @@ - + @@ -39014,9 +39014,9 @@ - - - + + + @@ -39942,7 +39942,7 @@ - + @@ -42720,13 +42720,13 @@ - + - + @@ -43277,7 +43277,7 @@ - + @@ -43290,7 +43290,7 @@ - + diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/te= st-annotate/test17-pr19027.so.abi index d27999c0..98d5282e 100644 --- a/tests/data/test-annotate/test17-pr19027.so.abi +++ b/tests/data/test-annotate/test17-pr19027.so.abi @@ -973,7 +973,7 @@ - + @@ -1085,7 +1085,7 @@ - + @@ -2395,23 +2395,23 @@ - + - + - + - + - + - + - + - + @@ -2502,22 +2502,20 @@ - - - - - - + + + + - + - + @@ -2526,17 +2524,19 @@ + + + + - - - - - + + + - + @@ -3055,7 +3055,7 @@ - + @@ -3067,7 +3067,7 @@ - + @@ -3078,7 +3078,7 @@ - + @@ -3086,14 +3086,14 @@ - + - + @@ -3104,7 +3104,7 @@ - + @@ -3115,7 +3115,7 @@ - + @@ -3126,7 +3126,7 @@ - + @@ -3141,7 +3141,7 @@ - + @@ -3344,31 +3344,31 @@ - + - + - + - + - + - + @@ -3383,7 +3383,7 @@ - + @@ -3392,7 +3392,7 @@ - + @@ -3401,14 +3401,14 @@ - + - + @@ -3417,14 +3417,14 @@ - + - + @@ -3433,14 +3433,14 @@ - + - + @@ -3449,14 +3449,14 @@ - + - + @@ -3465,14 +3465,14 @@ - + - + @@ -3481,7 +3481,7 @@ - + @@ -3490,7 +3490,7 @@ - + @@ -3499,14 +3499,14 @@ - + - + @@ -3515,28 +3515,28 @@ - + - + - + - + @@ -3545,14 +3545,14 @@ - + - + @@ -3563,7 +3563,7 @@ - + @@ -3572,14 +3572,14 @@ - + - + @@ -3588,7 +3588,7 @@ - + @@ -3597,28 +3597,28 @@ - + - + - + - + @@ -3633,7 +3633,7 @@ - + @@ -3648,7 +3648,7 @@ - + @@ -3663,7 +3663,7 @@ - + @@ -3678,7 +3678,7 @@ - + @@ -4826,15 +4826,15 @@ - + - + - + - + - + @@ -4842,11 +4842,11 @@ - - + - + @@ -4856,7 +4856,7 @@ - + @@ -5067,8 +5067,20 @@ - + + + + + + + + + + + + + @@ -5081,28 +5093,16 @@ + + + + - - - - - - - - - - - - - - - - @@ -8918,7 +8918,7 @@ - + @@ -8935,7 +8935,7 @@ - + @@ -8950,9 +8950,9 @@ - + - + @@ -8965,9 +8965,9 @@ - + - + @@ -8982,9 +8982,9 @@ - + - + @@ -9001,7 +9001,7 @@ - + @@ -9020,7 +9020,7 @@ - + @@ -9035,7 +9035,7 @@ - + @@ -9050,9 +9050,9 @@ - - + + @@ -9274,7 +9274,7 @@ - + @@ -9287,7 +9287,7 @@ - + @@ -9296,7 +9296,7 @@ - + @@ -9305,7 +9305,7 @@ - + @@ -9318,7 +9318,7 @@ - + @@ -9331,7 +9331,7 @@ - + @@ -9342,7 +9342,7 @@ - + @@ -9353,7 +9353,7 @@ - + @@ -9364,7 +9364,7 @@ - + @@ -9379,7 +9379,7 @@ - + @@ -9392,7 +9392,7 @@ - + @@ -9405,7 +9405,7 @@ - + @@ -9420,7 +9420,7 @@ - + @@ -9435,7 +9435,7 @@ - + @@ -9450,7 +9450,7 @@ - + @@ -9465,7 +9465,7 @@ - + @@ -9482,7 +9482,7 @@ - + @@ -9495,7 +9495,7 @@ - + @@ -9512,7 +9512,7 @@ - + @@ -9525,7 +9525,7 @@ - + @@ -9540,38 +9540,38 @@ - + - + - + - + - + - + - + - + @@ -9586,7 +9586,7 @@ - + @@ -9595,35 +9595,35 @@ - + - + - + - + - + - + @@ -9636,7 +9636,7 @@ - + @@ -9647,7 +9647,7 @@ - + @@ -9658,7 +9658,7 @@ - + @@ -9669,7 +9669,7 @@ - + @@ -9680,7 +9680,7 @@ - + @@ -10262,7 +10262,7 @@ - + @@ -10278,11 +10278,11 @@ - + - + @@ -10304,7 +10304,7 @@ - + @@ -10316,9 +10316,9 @@ - + - + @@ -10365,15 +10365,15 @@ - + - + - + - + - + @@ -10434,19 +10434,19 @@ - + - + - + @@ -12802,7 +12802,7 @@ - + @@ -13329,7 +13329,7 @@ - + @@ -13385,9 +13385,9 @@ - - + + @@ -13402,9 +13402,9 @@ - - + + @@ -13417,9 +13417,9 @@ - - + + @@ -13432,9 +13432,9 @@ - - + + @@ -14644,1032 +14644,1038 @@ - + - + - + - + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -15687,7 +15693,7 @@ - + @@ -15707,16 +15713,10 @@ - - - - - - - - + + - + @@ -15760,7 +15760,7 @@ - + @@ -15828,9 +15828,9 @@ - - + + @@ -15841,9 +15841,9 @@ - - + + @@ -15883,9 +15883,9 @@ - + @@ -15894,9 +15894,9 @@ - + @@ -15905,7 +15905,7 @@ @@ -15916,9 +15916,9 @@ - + @@ -15927,9 +15927,9 @@ - + @@ -15949,9 +15949,9 @@ - + @@ -15979,9 +15979,9 @@ - + - + @@ -15990,7 +15990,7 @@ - + @@ -15999,9 +15999,9 @@ - + - + @@ -16010,9 +16010,9 @@ - + - + @@ -16032,7 +16032,7 @@ - + @@ -16086,9 +16086,9 @@ - + - + @@ -16139,7 +16139,7 @@ - + @@ -16194,7 +16194,7 @@ - + @@ -16253,7 +16253,7 @@ - + @@ -16304,9 +16304,9 @@ - + - + @@ -16356,7 +16356,7 @@ - + @@ -16384,7 +16384,7 @@ - + @@ -16395,7 +16395,7 @@ - + @@ -16543,7 +16543,7 @@ - + @@ -16669,7 +16669,7 @@ - + @@ -16771,7 +16771,7 @@ - + @@ -16821,7 +16821,7 @@ - + @@ -16880,7 +16880,7 @@ - + @@ -16930,7 +16930,7 @@ - + @@ -17004,7 +17004,7 @@ - + @@ -17030,7 +17030,7 @@ - + @@ -17113,7 +17113,7 @@ - + @@ -17261,7 +17261,7 @@ - + @@ -17341,7 +17341,7 @@ - + @@ -17378,7 +17378,7 @@ - + @@ -17428,7 +17428,7 @@ - + @@ -17478,7 +17478,7 @@ - + @@ -17582,7 +17582,7 @@ - + @@ -17630,7 +17630,7 @@ - + @@ -17698,7 +17698,7 @@ - + @@ -17761,7 +17761,7 @@ - + @@ -17824,7 +17824,7 @@ - + @@ -17883,7 +17883,7 @@ - + @@ -17956,9 +17956,9 @@ - + - + @@ -18003,7 +18003,7 @@ - + @@ -18048,7 +18048,7 @@ - + @@ -18097,7 +18097,7 @@ - + @@ -18138,9 +18138,9 @@ - + - + @@ -18149,9 +18149,9 @@ - + - + @@ -18160,9 +18160,9 @@ - + - + @@ -18171,9 +18171,9 @@ - + - + @@ -18193,7 +18193,7 @@ - + @@ -18204,9 +18204,9 @@ - + - + @@ -18267,7 +18267,7 @@ - + @@ -18276,9 +18276,9 @@ - + - + @@ -18287,9 +18287,9 @@ - + - + @@ -18309,7 +18309,7 @@ - + @@ -18320,9 +18320,9 @@ - + - + @@ -18362,7 +18362,7 @@ - + @@ -18371,9 +18371,9 @@ - + - + @@ -18393,7 +18393,7 @@ - + @@ -18404,9 +18404,9 @@ - + - + @@ -18415,9 +18415,9 @@ - + - + @@ -18453,7 +18453,7 @@ - + @@ -18462,9 +18462,9 @@ - + - + @@ -18473,9 +18473,9 @@ - + - + @@ -18495,7 +18495,7 @@ - + @@ -18506,9 +18506,9 @@ - + - + @@ -18550,9 +18550,9 @@ - + - + @@ -18563,9 +18563,9 @@ - + - + @@ -18587,7 +18587,7 @@ - + - + - + @@ -18635,9 +18635,9 @@ - + - + @@ -18648,9 +18648,9 @@ - + - + @@ -18661,9 +18661,9 @@ - + - + @@ -18674,7 +18674,7 @@ - + - + @@ -18737,7 +18737,7 @@ - + @@ -18750,7 +18750,7 @@ - + @@ -18835,7 +18835,7 @@ - + @@ -18845,7 +18845,7 @@ @@ -18858,7 +18858,7 @@ @@ -18880,7 +18880,7 @@ @@ -18921,9 +18921,9 @@ - + - + @@ -18932,9 +18932,9 @@ - + - + @@ -18943,9 +18943,9 @@ - + - + @@ -18954,9 +18954,9 @@ - + - + @@ -18976,7 +18976,7 @@ - + @@ -18987,9 +18987,9 @@ - + - + @@ -19071,7 +19071,7 @@ @@ -19080,9 +19080,9 @@ - + @@ -19091,9 +19091,9 @@ - + @@ -19113,7 +19113,7 @@ @@ -19124,9 +19124,9 @@ - + @@ -19158,7 +19158,7 @@ @@ -19167,9 +19167,9 @@ - + @@ -19189,7 +19189,7 @@ @@ -19200,9 +19200,9 @@ - + @@ -19211,9 +19211,9 @@ - + @@ -19260,7 +19260,7 @@ - + @@ -19271,7 +19271,7 @@ - + @@ -19304,7 +19304,7 @@ - + @@ -19433,9 +19433,9 @@ - + - + @@ -19444,7 +19444,7 @@ - + @@ -19457,7 +19457,7 @@ - + @@ -19468,7 +19468,7 @@ - + @@ -19479,7 +19479,7 @@ - + @@ -19503,7 +19503,7 @@ - + @@ -19531,7 +19531,7 @@ - + @@ -19561,7 +19561,7 @@ - + @@ -19592,7 +19592,7 @@ - + @@ -19602,9 +19602,9 @@ - + @@ -19613,7 +19613,7 @@ @@ -19624,7 +19624,7 @@ @@ -19635,7 +19635,7 @@ @@ -19661,7 +19661,7 @@ - + @@ -19689,7 +19689,7 @@ - + @@ -19727,7 +19727,7 @@ - + @@ -19758,7 +19758,7 @@ - + @@ -19768,9 +19768,9 @@ - + @@ -19779,7 +19779,7 @@ @@ -19790,7 +19790,7 @@ @@ -19801,7 +19801,7 @@ @@ -19827,7 +19827,7 @@ - + @@ -19871,9 +19871,9 @@ - + - + @@ -19882,7 +19882,7 @@ - + @@ -19893,9 +19893,9 @@ - + - + @@ -19934,7 +19934,7 @@ - + @@ -19943,9 +19943,9 @@ - + - + @@ -19965,7 +19965,7 @@ - + @@ -20032,7 +20032,7 @@ - + @@ -20043,7 +20043,7 @@ - + @@ -20104,18 +20104,18 @@ - + - + - + - + @@ -20124,7 +20124,7 @@ - + @@ -20133,7 +20133,7 @@ - + @@ -20153,9 +20153,9 @@ - + - + @@ -20164,7 +20164,7 @@ - + @@ -20206,18 +20206,18 @@ - + - + - + - + @@ -20226,9 +20226,9 @@ - + - + @@ -20237,9 +20237,9 @@ - + - + @@ -20248,7 +20248,7 @@ - + @@ -20259,9 +20259,9 @@ - + - + @@ -20270,7 +20270,7 @@ - + @@ -20279,7 +20279,7 @@ - + @@ -20310,18 +20310,18 @@ - + - + - + - + @@ -20385,14 +20385,14 @@ - + @@ -20406,7 +20406,7 @@ - + @@ -20431,7 +20431,7 @@ - + @@ -20498,11 +20498,11 @@ - + - + @@ -20662,7 +20662,7 @@ - + @@ -20671,7 +20671,7 @@ - + @@ -20684,7 +20684,7 @@ - + @@ -20695,7 +20695,7 @@ - + @@ -20706,9 +20706,9 @@ - + - + @@ -20727,7 +20727,7 @@ - + @@ -20744,7 +20744,7 @@ - + @@ -20757,7 +20757,7 @@ - + @@ -20796,9 +20796,9 @@ - - + + @@ -20807,9 +20807,9 @@ - - + + @@ -20818,7 +20818,7 @@ - + @@ -20857,9 +20857,9 @@ - - + + @@ -20868,9 +20868,9 @@ - - + + @@ -20879,7 +20879,7 @@ - + @@ -20936,18 +20936,18 @@ - + - + - + @@ -20956,18 +20956,18 @@ - + - + - + @@ -20982,7 +20982,7 @@ - + @@ -20997,7 +20997,7 @@ - + @@ -21006,7 +21006,7 @@ - + @@ -21019,18 +21019,18 @@ - + - + - + @@ -21131,14 +21131,14 @@ - + - + @@ -21164,7 +21164,7 @@ - + @@ -21266,9 +21266,9 @@ - + - + @@ -21309,9 +21309,9 @@ - + - + @@ -21345,9 +21345,9 @@ - + - + @@ -21356,9 +21356,9 @@ - + - + @@ -21367,9 +21367,9 @@ - + - + @@ -21389,7 +21389,7 @@ - + @@ -21428,9 +21428,9 @@ - + - + @@ -21439,9 +21439,9 @@ - + - + @@ -21450,9 +21450,9 @@ - + - + @@ -21472,7 +21472,7 @@ - + @@ -21522,9 +21522,9 @@ - + - + @@ -21533,9 +21533,9 @@ - + - + @@ -21544,7 +21544,7 @@ - + @@ -21555,9 +21555,9 @@ - + - + @@ -21566,9 +21566,9 @@ - + - + @@ -21588,9 +21588,9 @@ - + - + @@ -21641,7 +21641,7 @@ - + @@ -21650,9 +21650,9 @@ - + - + @@ -21661,9 +21661,9 @@ - + - + @@ -21672,9 +21672,9 @@ - + - + @@ -21694,7 +21694,7 @@ - + @@ -21841,7 +21841,7 @@ - + @@ -21849,7 +21849,7 @@ - + @@ -21882,9 +21882,9 @@ - + - + @@ -21893,7 +21893,7 @@ - + @@ -21904,9 +21904,9 @@ - + - + @@ -21972,7 +21972,7 @@ - + @@ -22027,7 +22027,7 @@ - + @@ -22066,7 +22066,7 @@ - + @@ -22110,9 +22110,9 @@ - + - + @@ -22121,7 +22121,7 @@ - + @@ -22132,9 +22132,9 @@ - + - + @@ -22200,7 +22200,7 @@ - + @@ -22251,9 +22251,9 @@ - + - + @@ -22262,7 +22262,7 @@ - + @@ -22273,9 +22273,9 @@ - + - + @@ -22341,7 +22341,7 @@ - + @@ -22424,9 +22424,9 @@ - + - + @@ -22435,9 +22435,9 @@ - + - + @@ -22446,7 +22446,7 @@ - + @@ -22457,9 +22457,9 @@ - + - + @@ -22468,9 +22468,9 @@ - + - + @@ -22490,9 +22490,9 @@ - + - + @@ -22520,9 +22520,9 @@ - + - + @@ -22531,7 +22531,7 @@ - + @@ -22540,9 +22540,9 @@ - + - + @@ -22551,9 +22551,9 @@ - + - + @@ -22573,7 +22573,7 @@ - + @@ -22597,7 +22597,7 @@ - + @@ -22704,11 +22704,11 @@ - + - + @@ -22720,11 +22720,11 @@ - + - + @@ -22791,7 +22791,7 @@ - + @@ -22839,7 +22839,7 @@ - + @@ -22889,7 +22889,7 @@ - + @@ -22937,7 +22937,7 @@ - + @@ -22985,7 +22985,7 @@ - + @@ -23033,7 +23033,7 @@ - + @@ -23081,7 +23081,7 @@ - + @@ -23129,7 +23129,7 @@ - + @@ -23286,7 +23286,7 @@ - + @@ -23349,7 +23349,7 @@ - + @@ -23399,7 +23399,7 @@ - + @@ -23449,7 +23449,7 @@ - + @@ -23497,7 +23497,7 @@ - + @@ -23545,7 +23545,7 @@ - + @@ -23593,7 +23593,7 @@ - + @@ -23654,7 +23654,7 @@ - + @@ -23715,7 +23715,7 @@ - + @@ -23763,7 +23763,7 @@ - + @@ -23811,7 +23811,7 @@ - + @@ -23874,7 +23874,7 @@ - + @@ -23909,7 +23909,7 @@ - + @@ -24046,7 +24046,7 @@ - + @@ -24133,7 +24133,7 @@ - + @@ -24168,7 +24168,7 @@ - + @@ -24216,7 +24216,7 @@ - + @@ -24264,7 +24264,7 @@ - + @@ -24312,7 +24312,7 @@ - + @@ -24375,7 +24375,7 @@ - + @@ -24410,7 +24410,7 @@ - + @@ -24510,7 +24510,7 @@ - + @@ -24565,9 +24565,9 @@ - + - + @@ -24576,7 +24576,7 @@ - + @@ -24587,9 +24587,9 @@ - + - + @@ -24658,7 +24658,7 @@ - + @@ -24732,7 +24732,7 @@ - + @@ -24803,7 +24803,7 @@ - + @@ -24816,7 +24816,7 @@ - + @@ -24829,9 +24829,9 @@ - + - + @@ -24845,9 +24845,9 @@ - + - + @@ -24856,9 +24856,9 @@ - + - + @@ -24867,7 +24867,7 @@ - + @@ -24878,18 +24878,18 @@ - + - + - + @@ -24898,7 +24898,7 @@ - + @@ -24920,9 +24920,9 @@ - + - + @@ -25013,9 +25013,9 @@ - + - + @@ -25026,9 +25026,9 @@ - + - + @@ -25039,7 +25039,7 @@ - + @@ -25088,9 +25088,9 @@ - + - + @@ -25099,7 +25099,7 @@ - + @@ -25110,7 +25110,7 @@ - + @@ -25121,7 +25121,7 @@ - + @@ -25132,9 +25132,9 @@ - + - + @@ -25271,25 +25271,25 @@ - + - + - + - + @@ -25302,14 +25302,14 @@ - + - + - + @@ -25322,7 +25322,7 @@ - + @@ -25335,14 +25335,14 @@ - + - + - + @@ -25355,7 +25355,7 @@ - + @@ -25370,16 +25370,16 @@ - + - + - + @@ -25397,16 +25397,16 @@ - + - + - + @@ -25444,9 +25444,9 @@ - + - + @@ -25455,9 +25455,9 @@ - + - + @@ -25466,7 +25466,7 @@ - + @@ -25477,9 +25477,9 @@ - + - + @@ -25488,9 +25488,9 @@ - + - + @@ -25510,9 +25510,9 @@ - + - + @@ -25548,9 +25548,9 @@ - + - + @@ -25559,7 +25559,7 @@ - + @@ -25568,9 +25568,9 @@ - + - + @@ -25579,9 +25579,9 @@ - + - + @@ -25601,7 +25601,7 @@ - + @@ -25635,9 +25635,9 @@ - + - + @@ -25648,9 +25648,9 @@ - + - + @@ -25672,7 +25672,7 @@ - + @@ -25685,9 +25685,9 @@ - + - + @@ -25720,9 +25720,9 @@ - + - + @@ -25733,9 +25733,9 @@ - + - + @@ -25746,9 +25746,9 @@ - + - + @@ -25759,7 +25759,7 @@ - + @@ -25786,7 +25786,7 @@ - + @@ -25807,7 +25807,7 @@ - + @@ -25828,7 +25828,7 @@ - + @@ -25840,7 +25840,7 @@ - + @@ -25850,9 +25850,9 @@ - + - + @@ -25872,7 +25872,7 @@ - + @@ -25887,18 +25887,18 @@ - + - + - + @@ -25922,9 +25922,9 @@ - + - + @@ -25933,9 +25933,9 @@ - + - + @@ -25955,7 +25955,7 @@ - + @@ -25990,9 +25990,9 @@ - + - + @@ -26001,7 +26001,7 @@ - + @@ -26012,9 +26012,9 @@ - + - + @@ -26068,7 +26068,7 @@ - + @@ -26137,7 +26137,7 @@ - + @@ -26192,9 +26192,9 @@ - + - + @@ -26203,9 +26203,9 @@ - + - + @@ -26214,7 +26214,7 @@ - + @@ -26225,9 +26225,9 @@ - + - + @@ -26236,9 +26236,9 @@ - + - + @@ -26258,9 +26258,9 @@ - + - + @@ -26309,9 +26309,9 @@ - + - + @@ -26320,7 +26320,7 @@ - + @@ -26329,9 +26329,9 @@ - + - + @@ -26340,9 +26340,9 @@ - + - + @@ -26362,7 +26362,7 @@ - + @@ -26409,9 +26409,9 @@ - + - + @@ -26420,7 +26420,7 @@ - + @@ -26429,9 +26429,9 @@ - + - + @@ -26440,9 +26440,9 @@ - + - + @@ -26462,7 +26462,7 @@ - + @@ -26488,14 +26488,14 @@ - + - + @@ -26506,7 +26506,7 @@ - + @@ -26515,14 +26515,14 @@ - + - + @@ -26533,7 +26533,7 @@ - + @@ -26547,32 +26547,32 @@ - + - + - + - + - + - + @@ -26586,9 +26586,9 @@ - + - + @@ -26597,9 +26597,9 @@ - + - + @@ -26608,9 +26608,9 @@ - + - + @@ -26619,9 +26619,9 @@ - + - + @@ -26630,7 +26630,7 @@ - + @@ -26650,11 +26650,11 @@ - + - + - + @@ -26674,7 +26674,7 @@ - + @@ -26683,7 +26683,7 @@ - + @@ -26694,9 +26694,9 @@ - + - + @@ -26705,9 +26705,9 @@ - + - + @@ -26716,18 +26716,18 @@ - + - + - + @@ -26738,7 +26738,7 @@ - + @@ -26760,9 +26760,9 @@ - + - + @@ -26883,7 +26883,7 @@ - + - + - + @@ -26916,9 +26916,9 @@ - + - + @@ -26942,9 +26942,9 @@ - + - + @@ -26955,9 +26955,9 @@ - + - + @@ -26968,7 +26968,7 @@ - + @@ -26981,9 +26981,9 @@ - + - + @@ -27027,7 +27027,7 @@ - + @@ -27036,25 +27036,25 @@ - + - + - + - + - + @@ -27110,7 +27110,7 @@ - + @@ -27138,15 +27138,15 @@ - + - + - + @@ -27178,8 +27178,8 @@ - - + + @@ -27290,11 +27290,11 @@ - + - + - + - + - + @@ -27340,7 +27340,7 @@ - + @@ -27350,7 +27350,7 @@ - + @@ -27367,7 +27367,7 @@ - + @@ -27376,13 +27376,13 @@ - + - + @@ -27391,7 +27391,7 @@ - + @@ -27402,7 +27402,7 @@ - + @@ -27411,7 +27411,7 @@ - + @@ -27420,7 +27420,7 @@ - + @@ -27435,7 +27435,7 @@ - + @@ -27449,7 +27449,7 @@ - + @@ -27466,7 +27466,7 @@ - + @@ -27475,13 +27475,13 @@ - + - + @@ -27490,7 +27490,7 @@ - + @@ -27499,7 +27499,7 @@ - + @@ -27515,8 +27515,8 @@ - - + + @@ -27528,7 +27528,7 @@ - + @@ -27536,7 +27536,7 @@ - + @@ -27564,7 +27564,7 @@ - + @@ -27582,9 +27582,9 @@ - - + + @@ -27595,7 +27595,7 @@ - + @@ -27606,7 +27606,7 @@ - + @@ -27617,7 +27617,7 @@ - + @@ -27628,7 +27628,7 @@ - + @@ -27639,7 +27639,7 @@ - + @@ -27650,7 +27650,7 @@ - + @@ -27661,7 +27661,7 @@ - + @@ -27672,7 +27672,7 @@ - + @@ -27683,7 +27683,7 @@ - + @@ -27694,7 +27694,7 @@ - + @@ -27705,7 +27705,7 @@ - + @@ -27716,7 +27716,7 @@ - + @@ -27727,7 +27727,7 @@ - + @@ -27738,7 +27738,7 @@ - + @@ -27749,7 +27749,7 @@ - + @@ -27760,7 +27760,7 @@ - + @@ -27771,7 +27771,7 @@ - + @@ -27782,7 +27782,7 @@ - + @@ -27793,7 +27793,7 @@ - + @@ -27804,7 +27804,7 @@ - + @@ -27813,7 +27813,7 @@ - + @@ -27844,7 +27844,7 @@ - + @@ -27857,7 +27857,7 @@ - + @@ -27868,7 +27868,7 @@ - + @@ -27892,7 +27892,7 @@ - + @@ -27936,7 +27936,7 @@ - + @@ -27953,7 +27953,7 @@ - + @@ -27964,9 +27964,9 @@ - + - + @@ -27979,7 +27979,7 @@ - + @@ -27992,9 +27992,9 @@ - - + + @@ -28007,9 +28007,9 @@ - - + + @@ -28027,10 +28027,10 @@ - + - - + + @@ -28064,7 +28064,7 @@ @@ -28079,9 +28079,9 @@ - + @@ -28090,9 +28090,9 @@ - + @@ -28101,9 +28101,9 @@ - + @@ -28112,9 +28112,9 @@ - + @@ -28123,9 +28123,9 @@ - + @@ -28134,9 +28134,9 @@ - + @@ -28145,9 +28145,9 @@ - + @@ -28156,9 +28156,9 @@ - + @@ -28167,9 +28167,9 @@ - + @@ -28178,9 +28178,9 @@ - + @@ -28189,9 +28189,9 @@ - + @@ -28200,9 +28200,9 @@ - + @@ -28211,7 +28211,7 @@ @@ -28227,7 +28227,7 @@ @@ -28238,7 +28238,7 @@ - + @@ -28249,7 +28249,7 @@ @@ -28258,10 +28258,10 @@ - + - - + + @@ -28307,7 +28307,7 @@ - + @@ -28328,7 +28328,7 @@ - + @@ -28339,9 +28339,9 @@ - + - + @@ -28350,9 +28350,9 @@ - + - + @@ -28361,9 +28361,9 @@ - + - + @@ -28372,9 +28372,9 @@ - + - + @@ -28383,9 +28383,9 @@ - + - + @@ -28394,9 +28394,9 @@ - + - + @@ -28405,9 +28405,9 @@ - + - + @@ -28416,9 +28416,9 @@ - + - + @@ -28427,9 +28427,9 @@ - + - + @@ -28438,9 +28438,9 @@ - + - + @@ -28449,9 +28449,9 @@ - + - + @@ -28460,9 +28460,9 @@ - + - + @@ -28471,9 +28471,9 @@ - + - + @@ -28482,9 +28482,9 @@ - + - + @@ -28493,9 +28493,9 @@ - + - + @@ -28504,9 +28504,9 @@ - + - + @@ -28515,9 +28515,9 @@ - + - + @@ -28526,9 +28526,9 @@ - + - + @@ -28537,9 +28537,9 @@ - + - + @@ -28548,9 +28548,9 @@ - + - + @@ -28559,7 +28559,7 @@ - + @@ -28575,7 +28575,7 @@ - + @@ -28586,7 +28586,7 @@ - + @@ -28597,7 +28597,7 @@ - + @@ -28606,7 +28606,7 @@ - + @@ -28623,7 +28623,7 @@ - + @@ -28632,9 +28632,9 @@ - + - + @@ -28643,9 +28643,9 @@ - + - + @@ -28654,9 +28654,9 @@ - + - + @@ -28665,9 +28665,9 @@ - + - + @@ -28676,9 +28676,9 @@ - + - + @@ -28687,9 +28687,9 @@ - + - + @@ -28698,9 +28698,9 @@ - + - + @@ -28709,9 +28709,9 @@ - + - + @@ -28720,9 +28720,9 @@ - + - + @@ -28731,9 +28731,9 @@ - + - + @@ -28742,9 +28742,9 @@ - + - + @@ -28753,9 +28753,9 @@ - + - + @@ -28764,9 +28764,9 @@ - + - + @@ -28775,9 +28775,9 @@ - + - + @@ -28786,9 +28786,9 @@ - + - + @@ -28797,9 +28797,9 @@ - + - + @@ -28808,9 +28808,9 @@ - + - + @@ -28819,9 +28819,9 @@ - + - + @@ -28830,9 +28830,9 @@ - + - + @@ -28841,9 +28841,9 @@ - + - + @@ -28852,7 +28852,7 @@ - + @@ -28868,7 +28868,7 @@ - + @@ -28877,9 +28877,9 @@ - + - + @@ -28888,9 +28888,9 @@ - + - + @@ -28899,9 +28899,9 @@ - + - + @@ -28910,9 +28910,9 @@ - + - + @@ -28921,9 +28921,9 @@ - + - + @@ -28932,9 +28932,9 @@ - + - + @@ -28943,9 +28943,9 @@ - + - + @@ -28954,9 +28954,9 @@ - + - + @@ -28965,9 +28965,9 @@ - + - + @@ -28976,9 +28976,9 @@ - + - + @@ -28987,9 +28987,9 @@ - + - + @@ -28998,16 +28998,16 @@ - + - + - + @@ -29036,7 +29036,7 @@ - + @@ -29053,9 +29053,9 @@ - + - + @@ -29064,9 +29064,9 @@ - + - + @@ -29075,9 +29075,9 @@ - + - + @@ -29086,9 +29086,9 @@ - + - + @@ -29097,9 +29097,9 @@ - + - + @@ -29108,9 +29108,9 @@ - + - + @@ -29119,9 +29119,9 @@ - + - + @@ -29130,9 +29130,9 @@ - + - + @@ -29141,9 +29141,9 @@ - + - + @@ -29152,9 +29152,9 @@ - + - + @@ -29163,9 +29163,9 @@ - + - + @@ -29174,9 +29174,9 @@ - + - + @@ -29185,7 +29185,7 @@ - + @@ -29201,7 +29201,7 @@ - + @@ -29211,12 +29211,12 @@ - + - + - - + + @@ -29378,7 +29378,7 @@ - + @@ -29427,7 +29427,7 @@ - + @@ -29602,11 +29602,11 @@ - + - + - + @@ -29689,7 +29689,7 @@ - + @@ -29698,40 +29698,40 @@ - + - + - + - + - + - + - + - + @@ -29742,9 +29742,9 @@ - - + + @@ -29753,7 +29753,7 @@ - + @@ -30219,13 +30219,13 @@ - + - + - + - + @@ -30635,7 +30635,7 @@ - + @@ -30768,23 +30768,23 @@ - + - + - + - + - + @@ -30792,15 +30792,15 @@ - + - + - + @@ -30820,27 +30820,27 @@ - + - + - + - + - + @@ -30908,9 +30908,9 @@ - - + + @@ -30921,9 +30921,9 @@ - - + + @@ -31001,9 +31001,9 @@ - + - + @@ -31022,18 +31022,18 @@ - + - + - + - + - + @@ -31049,9 +31049,9 @@ - + - + @@ -31092,9 +31092,9 @@ - + - + @@ -31766,9 +31766,9 @@ - + - + @@ -31834,9 +31834,9 @@ - + - + @@ -31849,9 +31849,9 @@ - + - + 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 adff58f8..f29ab0bf 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 @@ -7255,7 +7255,7 @@ - + @@ -7429,7 +7429,7 @@ - + @@ -7465,7 +7465,7 @@ - + @@ -10627,9 +10627,9 @@ - + - + @@ -12069,7 +12069,7 @@ - + @@ -12400,11 +12400,11 @@ - + - + @@ -16332,11 +16332,11 @@ - + - + @@ -18085,11 +18085,11 @@ - + - + @@ -19329,11 +19329,11 @@ - + - + @@ -22597,11 +22597,11 @@ - + - + @@ -26533,11 +26533,11 @@ - + - + diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profil= er.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profile= r.so.abi index 97490f59..67e0c80b 100644 --- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.a= bi +++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.a= bi @@ -2732,13 +2732,13 @@ - + - @@ -3869,9 +3869,9 @@ - + - + @@ -4237,11 +4237,11 @@ - + - + @@ -4249,13 +4249,13 @@ - + - + - + @@ -4273,26 +4273,26 @@ - + - + - + - + - + - + @@ -4310,11 +4310,11 @@ - + - + @@ -4334,11 +4334,11 @@ - + - + @@ -4347,11 +4347,11 @@ - + - + @@ -4382,11 +4382,11 @@ - + - + @@ -4395,11 +4395,11 @@ - + - + @@ -4437,11 +4437,11 @@ - + - + @@ -4507,7 +4507,7 @@ - + @@ -4730,7 +4730,7 @@ - + @@ -5734,11 +5734,11 @@ - + - + @@ -5746,11 +5746,11 @@ - - + @@ -6601,7 +6601,7 @@ - + @@ -6612,7 +6612,7 @@ - + @@ -7722,13 +7722,13 @@ - + - + - + - + @@ -8305,189 +8305,189 @@ + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - + @@ -8537,7 +8537,7 @@ - + @@ -8556,7 +8556,7 @@ - + @@ -8565,7 +8565,7 @@ - + @@ -8578,7 +8578,7 @@ - + @@ -8587,13 +8587,13 @@ - + - + @@ -8602,7 +8602,7 @@ - + @@ -8615,7 +8615,7 @@ - + @@ -8626,7 +8626,7 @@ - + @@ -8664,7 +8664,7 @@ - + @@ -8673,7 +8673,7 @@ - + @@ -8682,7 +8682,7 @@ - + @@ -8691,7 +8691,7 @@ - + @@ -8700,7 +8700,7 @@ - + @@ -8715,7 +8715,7 @@ - + @@ -8753,7 +8753,7 @@ - + @@ -8764,7 +8764,7 @@ - + @@ -8775,7 +8775,7 @@ - + @@ -8793,7 +8793,7 @@ - + @@ -8804,7 +8804,7 @@ - + @@ -8813,18 +8813,18 @@ - + - + - + @@ -8835,7 +8835,7 @@ - + @@ -8851,7 +8851,7 @@ - + @@ -8870,7 +8870,7 @@ - + @@ -8879,7 +8879,7 @@ - + @@ -8892,7 +8892,7 @@ - + @@ -8901,13 +8901,13 @@ - + - + @@ -8916,7 +8916,7 @@ - + @@ -8929,7 +8929,7 @@ - + @@ -8940,7 +8940,7 @@ - + @@ -8951,7 +8951,7 @@ - + @@ -8978,7 +8978,7 @@ - + @@ -8987,7 +8987,7 @@ - + @@ -8996,7 +8996,7 @@ - + @@ -9005,7 +9005,7 @@ - + @@ -9014,7 +9014,7 @@ - + @@ -9029,7 +9029,7 @@ - + @@ -9049,7 +9049,7 @@ - + @@ -9073,7 +9073,7 @@ - + @@ -9093,7 +9093,7 @@ - + @@ -9111,7 +9111,7 @@ - + @@ -9122,7 +9122,7 @@ - + @@ -9133,7 +9133,7 @@ - + @@ -9142,18 +9142,18 @@ - + - + - + @@ -9164,7 +9164,7 @@ - + @@ -9175,7 +9175,7 @@ - + @@ -9191,7 +9191,7 @@ - + @@ -9210,7 +9210,7 @@ - + @@ -9219,7 +9219,7 @@ - + @@ -9232,7 +9232,7 @@ - + @@ -9241,13 +9241,13 @@ - + - + @@ -9256,7 +9256,7 @@ - + @@ -9269,7 +9269,7 @@ - + @@ -9280,7 +9280,7 @@ - + @@ -9291,7 +9291,7 @@ - + @@ -9300,7 +9300,7 @@ - + @@ -9327,7 +9327,7 @@ - + @@ -9336,7 +9336,7 @@ - + @@ -9345,7 +9345,7 @@ - + @@ -9354,7 +9354,7 @@ - + @@ -9363,7 +9363,7 @@ - + @@ -9378,7 +9378,7 @@ - + @@ -9398,7 +9398,7 @@ - + @@ -9422,7 +9422,7 @@ - + @@ -9451,7 +9451,7 @@ - + @@ -9462,7 +9462,7 @@ - + @@ -9473,7 +9473,7 @@ - + @@ -9482,7 +9482,7 @@ - + @@ -9493,18 +9493,18 @@ - + - + - + @@ -9515,7 +9515,7 @@ - + @@ -9526,7 +9526,7 @@ - + @@ -9542,7 +9542,7 @@ - + @@ -9561,7 +9561,7 @@ - + @@ -9570,7 +9570,7 @@ - + @@ -9583,7 +9583,7 @@ - + @@ -9592,13 +9592,13 @@ - + - + @@ -9607,7 +9607,7 @@ - + @@ -9620,7 +9620,7 @@ - + @@ -9631,7 +9631,7 @@ - + @@ -9642,7 +9642,7 @@ - + @@ -9651,7 +9651,7 @@ - + @@ -9705,7 +9705,7 @@ - + @@ -9716,7 +9716,7 @@ - + @@ -9725,7 +9725,7 @@ - + @@ -9734,7 +9734,7 @@ - + @@ -9745,7 +9745,7 @@ - + @@ -9754,7 +9754,7 @@ - + @@ -9772,7 +9772,7 @@ - + @@ -9781,7 +9781,7 @@ - + @@ -9796,7 +9796,7 @@ - + @@ -9816,7 +9816,7 @@ - + @@ -9836,18 +9836,18 @@ - + - + - + - + @@ -9863,7 +9863,7 @@ - + @@ -9874,7 +9874,7 @@ - + @@ -9889,18 +9889,18 @@ - + - + - + @@ -9918,7 +9918,7 @@ - + @@ -9927,7 +9927,7 @@ - + @@ -9938,7 +9938,7 @@ - + @@ -9950,7 +9950,7 @@ - + @@ -9961,7 +9961,7 @@ - + @@ -9993,14 +9993,14 @@ - + - + @@ -10009,7 +10009,7 @@ - + @@ -10018,7 +10018,7 @@ - + @@ -10029,7 +10029,7 @@ - + @@ -10049,7 +10049,7 @@ - + @@ -10058,7 +10058,7 @@ - + @@ -10071,7 +10071,7 @@ - + @@ -10084,7 +10084,7 @@ - + @@ -10101,7 +10101,7 @@ - + @@ -10116,13 +10116,13 @@ - + - + @@ -10131,7 +10131,7 @@ - + @@ -10142,7 +10142,7 @@ - + @@ -10153,7 +10153,7 @@ - + @@ -10168,7 +10168,7 @@ - + @@ -10185,7 +10185,7 @@ - + @@ -10200,7 +10200,7 @@ - + @@ -10213,7 +10213,7 @@ - + @@ -10228,7 +10228,7 @@ - + @@ -10293,7 +10293,7 @@ - + @@ -10331,7 +10331,7 @@ - + @@ -10402,7 +10402,7 @@ - + @@ -10411,7 +10411,7 @@ - + @@ -10424,7 +10424,7 @@ - + @@ -10435,18 +10435,18 @@ - + - + - + @@ -10457,7 +10457,7 @@ - + @@ -10468,7 +10468,7 @@ - + @@ -10488,7 +10488,7 @@ @@ -10497,7 +10497,7 @@ @@ -10510,7 +10510,7 @@ @@ -10521,7 +10521,7 @@ @@ -10532,7 +10532,7 @@ @@ -10541,7 +10541,7 @@ @@ -10552,7 +10552,7 @@ @@ -10561,7 +10561,7 @@ @@ -10572,11 +10572,11 @@ - + @@ -10594,7 +10594,7 @@ - + @@ -10603,7 +10603,7 @@ - + @@ -10616,7 +10616,7 @@ - + @@ -10627,7 +10627,7 @@ - + @@ -10636,7 +10636,7 @@ - + @@ -10645,7 +10645,7 @@ - + @@ -10665,7 +10665,7 @@ - + @@ -10678,11 +10678,11 @@ - + - + @@ -10696,7 +10696,7 @@ - + @@ -10705,7 +10705,7 @@ - + @@ -10718,7 +10718,7 @@ - + @@ -10729,7 +10729,7 @@ - + - + - + @@ -10765,7 +10765,7 @@ - + @@ -10774,7 +10774,7 @@ - + @@ -10785,7 +10785,7 @@ - + @@ -10800,7 +10800,7 @@ - + @@ -10811,7 +10811,7 @@ - + @@ -10822,7 +10822,7 @@ - + @@ -10831,7 +10831,7 @@ - + @@ -10891,7 +10891,7 @@ - + @@ -10900,7 +10900,7 @@ - + @@ -10909,7 +10909,7 @@ - + @@ -10927,7 +10927,7 @@ - + @@ -10938,9 +10938,9 @@ - + - + @@ -10949,7 +10949,7 @@ - + @@ -10958,7 +10958,7 @@ - + @@ -10971,7 +10971,7 @@ - + @@ -11004,14 +11004,14 @@ - + - - + + @@ -11041,14 +11041,14 @@ - + - - + + @@ -11101,25 +11101,25 @@ - + - - + + - + - - + + @@ -11133,7 +11133,7 @@ - + @@ -11142,7 +11142,7 @@ - + @@ -11153,7 +11153,7 @@ - + @@ -11168,7 +11168,7 @@ - + @@ -11179,7 +11179,7 @@ - + @@ -11221,7 +11221,7 @@ - + @@ -11230,7 +11230,7 @@ - + @@ -11239,7 +11239,7 @@ - + @@ -11250,7 +11250,7 @@ - + @@ -11261,7 +11261,7 @@ - + @@ -11305,7 +11305,7 @@ - + @@ -11314,7 +11314,7 @@ - + @@ -11325,7 +11325,7 @@ - + @@ -11345,9 +11345,9 @@ - + - + @@ -11374,7 +11374,7 @@ - + @@ -11385,7 +11385,7 @@ - + @@ -11412,7 +11412,7 @@ - + @@ -11421,7 +11421,7 @@ - + @@ -11432,7 +11432,7 @@ - + @@ -11470,7 +11470,7 @@ - + @@ -11479,7 +11479,7 @@ - + @@ -11490,7 +11490,7 @@ - + @@ -11528,7 +11528,7 @@ - + @@ -11537,7 +11537,7 @@ - + @@ -11548,7 +11548,7 @@ - + @@ -11568,9 +11568,9 @@ - + - + @@ -11595,7 +11595,7 @@ - + @@ -11604,7 +11604,7 @@ - + @@ -11615,7 +11615,7 @@ - + @@ -11626,18 +11626,18 @@ - + - + - + - + @@ -11651,7 +11651,7 @@ - + @@ -11660,7 +11660,7 @@ - + @@ -11682,9 +11682,9 @@ - + - + @@ -11698,7 +11698,7 @@ - + @@ -11707,7 +11707,7 @@ - + @@ -11729,9 +11729,9 @@ - + - + @@ -11754,7 +11754,7 @@ - + @@ -11763,7 +11763,7 @@ - + @@ -11785,9 +11785,9 @@ - + - + @@ -11821,7 +11821,7 @@ - + @@ -11830,7 +11830,7 @@ - + @@ -11850,9 +11850,9 @@ - + - + @@ -11881,9 +11881,9 @@ - + - + @@ -11892,7 +11892,7 @@ - + @@ -11900,7 +11900,7 @@ - + @@ -11975,7 +11975,7 @@ - + @@ -11994,7 +11994,7 @@ - + @@ -12003,7 +12003,7 @@ - + @@ -12014,13 +12014,13 @@ - + - + @@ -12029,7 +12029,7 @@ - + @@ -12040,7 +12040,7 @@ - + @@ -12053,7 +12053,7 @@ - + @@ -12064,7 +12064,7 @@ - + - + @@ -12093,7 +12093,7 @@ - + @@ -12107,26 +12107,26 @@ - + - - + + - - + + - - + + - + @@ -12135,7 +12135,7 @@ - + @@ -12146,13 +12146,13 @@ - + - + @@ -12161,7 +12161,7 @@ - + @@ -12172,7 +12172,7 @@ - + @@ -12185,7 +12185,7 @@ - + @@ -12202,12 +12202,12 @@ - + - - - + + + @@ -12218,20 +12218,20 @@ - + - + - + - + - - + + @@ -12239,7 +12239,7 @@ - + - + @@ -12267,7 +12267,7 @@ - + @@ -12278,13 +12278,13 @@ - + - + @@ -12293,7 +12293,7 @@ - + @@ -12304,7 +12304,7 @@ - + @@ -12317,7 +12317,7 @@ - + @@ -12337,7 +12337,7 @@ - + @@ -12350,7 +12350,7 @@ - + @@ -12359,7 +12359,7 @@ - + @@ -12459,12 +12459,12 @@ - + - - - - + + + + @@ -12507,12 +12507,12 @@ - + - - - - + + + + @@ -12555,7 +12555,7 @@ @@ -12575,13 +12575,13 @@ - + @@ -12776,7 +12776,7 @@ - + @@ -12785,7 +12785,7 @@ - + - + @@ -12818,7 +12818,7 @@ - + @@ -12829,7 +12829,7 @@ - + @@ -12842,7 +12842,7 @@ - + @@ -12851,7 +12851,7 @@ - + @@ -12862,7 +12862,7 @@ - + @@ -12875,7 +12875,7 @@ - + @@ -12884,7 +12884,7 @@ - + @@ -12895,7 +12895,7 @@ - + @@ -12908,7 +12908,7 @@ - + @@ -12917,7 +12917,7 @@ - + @@ -12928,7 +12928,7 @@ - + @@ -12941,7 +12941,7 @@ - + @@ -12950,7 +12950,7 @@ - + @@ -12961,7 +12961,7 @@ - + @@ -12974,7 +12974,7 @@ - + @@ -12983,7 +12983,7 @@ - + @@ -13189,16 +13189,16 @@ - + - - - - - - - - + + + + + + + + @@ -13211,16 +13211,16 @@ - + - - - - - - - - + + + + + + + + @@ -13233,16 +13233,16 @@ - + - - - - - - - - + + + + + + + + @@ -13255,16 +13255,16 @@ - + - - - - - - - - + + + + + + + + @@ -13288,16 +13288,16 @@ - + - - - - - - - - + + + + + + + + @@ -13321,16 +13321,16 @@ - + - - - - - - - - + + + + + + + + @@ -13343,12 +13343,12 @@ - + - - - - + + + + @@ -13374,14 +13374,14 @@ - + - - - - + + + + - + @@ -13430,16 +13430,16 @@ - + - - - - - - - - + + + + + + + + @@ -13480,18 +13480,18 @@ - + - - - - - - + + + + + + - - - + + + @@ -13506,18 +13506,18 @@ - + - - - - - - + + + + + + - - - + + + @@ -13910,8 +13910,8 @@ - - + + @@ -13923,32 +13923,32 @@ - + - - + + - + - - + + - + - - + + @@ -14042,12 +14042,12 @@ - + - - + + @@ -14055,7 +14055,7 @@ - + @@ -14063,30 +14063,30 @@ - - + + - + - - - - + + + + - + - - + + @@ -14242,20 +14242,20 @@ - + - + - + - + @@ -14282,33 +14282,33 @@ - + - + - + - + - + - + - + @@ -14326,20 +14326,20 @@ - + - + - + - @@ -14366,33 +14366,33 @@ - + - - + - + - - + - @@ -14490,26 +14490,26 @@ - + - + - + - + @@ -14583,7 +14583,7 @@ - + @@ -14693,17 +14693,17 @@ - - + - + - + - + - + @@ -14889,7 +14889,7 @@ - + @@ -14898,7 +14898,7 @@ - + @@ -15022,7 +15022,7 @@ - + @@ -15031,7 +15031,7 @@ - + @@ -15889,7 +15889,7 @@ - + @@ -15898,7 +15898,7 @@ - + @@ -15991,7 +15991,7 @@ - + @@ -16000,7 +16000,7 @@ - + @@ -16382,7 +16382,7 @@ - + @@ -16390,7 +16390,7 @@ - + @@ -16406,7 +16406,7 @@ - + + @@ -16428,13 +16428,13 @@ - + - + @@ -16448,13 +16448,13 @@ - + + @@ -16468,13 +16468,13 @@ - + @@ -16488,13 +16488,13 @@ - + + @@ -16510,7 +16510,7 @@ - + - + @@ -16534,7 +16534,7 @@ - + - + @@ -16565,7 +16565,7 @@ - + + @@ -16587,13 +16587,13 @@ - + + @@ -16750,7 +16750,7 @@ - + - + @@ -16789,7 +16789,7 @@ - + - + - + + @@ -16826,13 +16826,13 @@ - + + @@ -16846,13 +16846,13 @@ - + + @@ -17278,7 +17278,7 @@ - + @@ -17384,7 +17384,7 @@ - + @@ -18013,17 +18013,17 @@ - + - + - + - + - + - + @@ -18055,25 +18055,25 @@ - + - + - + - + - + - + - + - + - + - + @@ -18200,11 +18200,11 @@ - + - + @@ -18222,11 +18222,11 @@ - + - + @@ -18242,11 +18242,11 @@ - + - + @@ -18264,11 +18264,11 @@ - + - + @@ -18295,22 +18295,22 @@ - + - + - + - + @@ -18330,11 +18330,11 @@ - + - + @@ -18361,33 +18361,33 @@ - + - + - + - + - + - + - + @@ -18407,11 +18407,11 @@ - + - + @@ -18438,33 +18438,33 @@ - + - + - + - + - + - + - + @@ -18482,11 +18482,11 @@ - + - + @@ -18513,33 +18513,33 @@ - + - + - + - + - + - + - + @@ -18916,11 +18916,11 @@ - - + @@ -18948,11 +18948,11 @@ - + - + @@ -19320,7 +19320,7 @@ - + @@ -19478,7 +19478,7 @@ - + @@ -19487,7 +19487,7 @@ - + @@ -20487,7 +20487,7 @@ - + @@ -20575,7 +20575,7 @@ - + @@ -21259,7 +21259,7 @@ - + @@ -21691,7 +21691,7 @@ - + @@ -21923,7 +21923,7 @@ - + @@ -22977,7 +22977,7 @@ - + @@ -22986,7 +22986,7 @@ - + @@ -23079,7 +23079,7 @@ - + @@ -23088,7 +23088,7 @@ - + @@ -26215,15 +26215,15 @@ - + - + - + @@ -26241,22 +26241,22 @@ - + - + - + - + @@ -26857,7 +26857,7 @@ - + @@ -27141,7 +27141,7 @@ - + @@ -27213,25 +27213,25 @@ - + - + - + - + - + - + - + - + - + - + @@ -27631,12 +27631,12 @@ - + - - - - + + + + @@ -27865,16 +27865,16 @@ - + - - - - - - - - + + + + + + + + @@ -27933,16 +27933,16 @@ - + - - - - - - - - + + + + + + + + @@ -28012,16 +28012,16 @@ - + - - - - - - - - + + + + + + + + @@ -28148,7 +28148,7 @@ - + @@ -28157,7 +28157,7 @@ - + @@ -28436,7 +28436,7 @@ - + @@ -29414,20 +29414,20 @@ - + - + - + - + @@ -29445,33 +29445,33 @@ - + - + - + - + - + - + - + @@ -29498,11 +29498,11 @@ - + - + @@ -29516,11 +29516,11 @@ - + - + @@ -29529,33 +29529,33 @@ - + - + - + - + - + - + - + @@ -33076,13 +33076,13 @@ - + - + - + - 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 3de32474..a6759aa3 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 @@ -4000,7 +4000,7 @@ - + @@ -4334,7 +4334,7 @@ - + @@ -4396,7 +4396,7 @@ - + @@ -4442,7 +4442,7 @@ - + @@ -7802,11 +7802,11 @@ - + - + @@ -8923,9 +8923,9 @@ - + - + @@ -10519,7 +10519,7 @@ - + @@ -10529,7 +10529,7 @@ - + @@ -10649,11 +10649,11 @@ - + - + @@ -11722,11 +11722,11 @@ - + - + @@ -12707,7 +12707,7 @@ - + @@ -13325,13 +13325,13 @@ - + - + - + - + @@ -17704,7 +17704,7 @@ - + @@ -17717,13 +17717,13 @@ - + - + @@ -17855,11 +17855,11 @@ - + - + @@ -19305,13 +19305,13 @@ - + - + @@ -21731,7 +21731,7 @@ - + @@ -24016,11 +24016,11 @@ - + - + @@ -24416,11 +24416,11 @@ - + - + @@ -28072,11 +28072,11 @@ - + - + @@ -29701,11 +29701,11 @@ - + - + @@ -30462,11 +30462,11 @@ - + - + diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/te= st-annotate/test21-pr19092.so.abi index 5e94e912..3f28dbde 100644 --- a/tests/data/test-annotate/test21-pr19092.so.abi +++ b/tests/data/test-annotate/test21-pr19092.so.abi @@ -1282,11 +1282,11 @@ - + - + @@ -1294,7 +1294,7 @@ - + @@ -1442,11 +1442,11 @@ - + - + @@ -1691,7 +1691,7 @@ - + @@ -1712,7 +1712,7 @@ + @@ -1728,7 +1728,7 @@ - + @@ -1756,13 +1756,13 @@ - + - + - + @@ -1794,7 +1794,7 @@ - + @@ -1818,19 +1818,19 @@ - - - - - - - - - + + + + + + + + + - + - + @@ -2114,7 +2114,7 @@ - + @@ -2122,9 +2122,9 @@ - + - + @@ -2372,10 +2372,10 @@ - + - - + + @@ -2541,13 +2541,8 @@ - - - - - - + @@ -2558,7 +2553,7 @@ - + @@ -2567,12 +2562,17 @@ - + + + + + + @@ -2684,9 +2684,9 @@ - + - + @@ -2694,9 +2694,9 @@ - + - + @@ -3993,7 +3993,7 @@ - + @@ -4182,9 +4182,9 @@ - + - + @@ -4397,19 +4397,19 @@ - + - + - + - + - + - + - + @@ -4421,21 +4421,21 @@ + + - - + + - - - + - + - + @@ -4542,7 +4542,7 @@ - + @@ -4551,7 +4551,7 @@ - + @@ -4913,11 +4913,11 @@ - + - + @@ -4925,7 +4925,7 @@ - + @@ -5867,11 +5867,11 @@ - + - + @@ -5881,7 +5881,7 @@ - + @@ -6314,9 +6314,9 @@ - + - + @@ -7541,43 +7541,43 @@ - + - + - - + - + - + - + - + - + - + @@ -7585,31 +7585,31 @@ - + - + - + - + - + - + - + @@ -7749,7 +7749,7 @@ - + @@ -8354,11 +8354,11 @@ - + - + @@ -8551,7 +8551,7 @@ - + @@ -8575,7 +8575,7 @@ - + @@ -8606,15 +8606,15 @@ - + - + - + - + - + @@ -8662,7 +8662,7 @@ - + @@ -8674,49 +8674,49 @@ + + - - + + - + - + - - - + - + - + - + - + - + - - + - + @@ -8899,7 +8899,7 @@ - + @@ -8908,7 +8908,7 @@ - + @@ -8988,14 +8988,14 @@ - + - + @@ -9876,7 +9876,7 @@ - + @@ -9947,7 +9947,7 @@ - + @@ -10601,39 +10601,39 @@ - + - + - - + - + - + - + - + - + @@ -10739,27 +10739,27 @@ - + - + - + - + - - - + - + - + + + @@ -11214,8 +11214,8 @@ - - + + diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annota= te/test7.so.abi index 1ceb92af..f9120693 100644 --- a/tests/data/test-annotate/test7.so.abi +++ b/tests/data/test-annotate/test7.so.abi @@ -32,15 +32,15 @@ + + + + + - + - - - - - - + @@ -64,8 +64,8 @@ - - + + @@ -81,9 +81,9 @@ - - - + + + diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b= /tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt index 328ce804..224237e2 100644 --- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt +++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt @@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added = variables =20 79 Added functions: =20 - [A] 'function lttng_condition* lttng_condition_session_consumed_size_cre= ate()' + [A] 'function lttng_condition* lttng_condition_session_consumed_size_cre= ate(void)' [A] 'function lttng_condition_status lttng_condition_session_consumed_si= ze_get_session_name(const lttng_condition*, const char**)' [A] 'function lttng_condition_status lttng_condition_session_consumed_si= ze_get_threshold(const lttng_condition*, uint64_t*)' [A] 'function lttng_condition_status lttng_condition_session_consumed_si= ze_set_session_name(lttng_condition*, const char*)' [A] 'function lttng_condition_status lttng_condition_session_consumed_si= ze_set_threshold(lttng_condition*, uint64_t)' - [A] 'function lttng_condition* lttng_condition_session_rotation_complete= d_create()' + [A] 'function lttng_condition* lttng_condition_session_rotation_complete= d_create(void)' [A] 'function lttng_condition_status lttng_condition_session_rotation_ge= t_session_name(const lttng_condition*, const char**)' - [A] 'function lttng_condition* lttng_condition_session_rotation_ongoing_= create()' + [A] 'function lttng_condition* lttng_condition_session_rotation_ongoing_= create(void)' [A] 'function lttng_condition_status lttng_condition_session_rotation_se= t_session_name(lttng_condition*, const char*)' [A] 'function lttng_error_code lttng_create_session_ext(lttng_session_de= scriptor*)' [A] 'function lttng_error_code lttng_destroy_session_ext(const char*, lt= tng_destruction_handle**)' @@ -24,7 +24,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added = variables [A] 'function lttng_evaluation_status lttng_evaluation_session_consumed_= size_get_consumed_size(const lttng_evaluation*, uint64_t*)' [A] 'function lttng_evaluation_status lttng_evaluation_session_rotation_= completed_get_location(const lttng_evaluation*, const lttng_trace_archive_l= ocation**)' [A] 'function lttng_evaluation_status lttng_evaluation_session_rotation_= get_id(const lttng_evaluation*, uint64_t*)' - [A] 'function lttng_event* lttng_event_create()' + [A] 'function lttng_event* lttng_event_create(void)' [A] 'function void lttng_event_destroy(lttng_event*)' [A] 'function const lttng_userspace_probe_location* lttng_event_get_user= space_probe_location(const lttng_event*)' [A] 'function int lttng_event_set_userspace_probe_location(lttng_event*,= lttng_userspace_probe_location*)' @@ -35,10 +35,10 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables [A] 'function lttng_rotation_status lttng_rotation_handle_get_state(lttn= g_rotation_handle*, lttng_rotation_state*)' [A] 'function void lttng_rotation_schedule_destroy(lttng_rotation_schedu= le*)' [A] 'function lttng_rotation_schedule_type lttng_rotation_schedule_get_t= ype(const lttng_rotation_schedule*)' - [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_periodic_= create()' + [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_periodic_= create(void)' [A] 'function lttng_rotation_status lttng_rotation_schedule_periodic_get= _period(const lttng_rotation_schedule*, uint64_t*)' [A] 'function lttng_rotation_status lttng_rotation_schedule_periodic_set= _period(lttng_rotation_schedule*, uint64_t)' - [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_size_thre= shold_create()' + [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_size_thre= shold_create(void)' [A] 'function lttng_rotation_status lttng_rotation_schedule_size_thresho= ld_get_threshold(const lttng_rotation_schedule*, uint64_t*)' [A] 'function lttng_rotation_status lttng_rotation_schedule_size_thresho= ld_set_threshold(lttng_rotation_schedule*, uint64_t)' [A] 'function void lttng_rotation_schedules_destroy(lttng_rotation_sched= ules*)' @@ -74,9 +74,9 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added = variables [A] 'function const lttng_userspace_probe_location_lookup_method* lttng_= userspace_probe_location_get_lookup_method(const lttng_userspace_probe_loca= tion*)' [A] 'function lttng_userspace_probe_location_type lttng_userspace_probe_= location_get_type(const lttng_userspace_probe_location*)' [A] 'function void lttng_userspace_probe_location_lookup_method_destroy(= lttng_userspace_probe_location_lookup_method*)' - [A] 'function lttng_userspace_probe_location_lookup_method* lttng_usersp= ace_probe_location_lookup_method_function_elf_create()' + [A] 'function lttng_userspace_probe_location_lookup_method* lttng_usersp= ace_probe_location_lookup_method_function_elf_create(void)' [A] 'function lttng_userspace_probe_location_lookup_method_type lttng_us= erspace_probe_location_lookup_method_get_type(const lttng_userspace_probe_l= ocation_lookup_method*)' - [A] 'function lttng_userspace_probe_location_lookup_method* lttng_usersp= ace_probe_location_lookup_method_tracepoint_sdt_create()' + [A] 'function lttng_userspace_probe_location_lookup_method* lttng_usersp= ace_probe_location_lookup_method_tracepoint_sdt_create(void)' [A] 'function lttng_userspace_probe_location* lttng_userspace_probe_loca= tion_tracepoint_create(const char*, const char*, const char*, lttng_userspa= ce_probe_location_lookup_method*)' [A] 'function int lttng_userspace_probe_location_tracepoint_get_binary_f= d(const lttng_userspace_probe_location*)' [A] 'function const char* lttng_userspace_probe_location_tracepoint_get_= binary_path(const lttng_userspace_probe_location*)' @@ -91,12 +91,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables type size hasn't changed 3 data member changes: type of 'action_validate_cb validate' changed: - underlying type 'bool (lttng_action*)*' changed: + underlying type 'bool (*)(lttng_action*)' changed: in pointed to type 'function type bool (lttng_action*)': parameter 1 of type 'lttng_action*' has sub-type changes: pointed to type 'struct lttng_action' changed, as being = reported type of 'action_serialize_cb serialize' changed: - underlying type 'typedef ssize_t (lttng_action*, char*)*' chan= ged: + underlying type 'ssize_t (*)(lttng_action*, char*)' changed: in pointed to type 'function type typedef ssize_t (lttng_act= ion*, char*)': return type changed: entity changed from 'typedef ssize_t' to compatible type= 'int' @@ -109,7 +109,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables entity changed from 'char' to 'struct lttng_dynamic_bu= ffer' type size changed from 8 to 192 (in bits) type of 'action_destroy_cb destroy' changed: - underlying type 'void (lttng_action*)*' changed: + underlying type 'void (*)(lttng_action*)' changed: in pointed to type 'function type void (lttng_action*)': parameter 1 of type 'lttng_action*' has sub-type changes: pointed to type 'struct lttng_action' changed, as being = reported @@ -118,7 +118,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables parameter 1 of type 'lttng_action*' has sub-type changes: pointed to type 'struct lttng_action' changed, as reported earlier =20 - [C] 'function lttng_action* lttng_action_notify_create()' has some indir= ect sub-type changes: + [C] 'function lttng_action* lttng_action_notify_create(void)' has some i= ndirect sub-type changes: return type changed: pointed to type 'struct lttng_action' changed, as reported earlier =20 @@ -146,13 +146,13 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Ad= ded variables 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATI= ON_ONGOING' value '103' 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATI= ON_COMPLETED' value '104' type of 'condition_validate_cb validate' changed: - underlying type 'bool (const lttng_condition*)*' changed: + underlying type 'bool (*)(const lttng_condition*)' changed: in pointed to type 'function type bool (const lttng_condit= ion*)': parameter 1 of type 'const lttng_condition*' has sub-typ= e changes: in pointed to type 'const lttng_condition': unqualified underlying type 'struct lttng_condition'= changed, as being reported type of 'condition_serialize_cb serialize' changed: - underlying type 'typedef ssize_t (const lttng_condition*, ch= ar*)*' changed: + underlying type 'ssize_t (*)(const lttng_condition*, char*)'= changed: in pointed to type 'function type typedef ssize_t (const l= ttng_condition*, char*)': return type changed: entity changed from 'typedef ssize_t' to compatible ty= pe 'int' @@ -166,7 +166,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables entity changed from 'char' to 'struct lttng_dynamic_= buffer' type size changed from 8 to 192 (in bits) type of 'condition_equal_cb equal' changed: - underlying type 'bool (const lttng_condition*, const lttng_c= ondition*)*' changed: + underlying type 'bool (*)(const lttng_condition*, const lttn= g_condition*)' changed: in pointed to type 'function type bool (const lttng_condit= ion*, const lttng_condition*)': parameter 1 of type 'const lttng_condition*' has sub-typ= e changes: in pointed to type 'const lttng_condition': @@ -175,7 +175,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables in pointed to type 'const lttng_condition': unqualified underlying type 'struct lttng_condition'= changed, as being reported type of 'condition_destroy_cb destroy' changed: - underlying type 'void (lttng_condition*)*' changed: + underlying type 'void (*)(lttng_condition*)' changed: in pointed to type 'function type void (lttng_condition*)'= : parameter 1 of type 'lttng_condition*' has sub-type chan= ges: pointed to type 'struct lttng_condition' changed, as b= eing reported @@ -200,11 +200,11 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Ad= ded variables in pointed to type 'const lttng_condition': unqualified underlying type 'struct lttng_condition' changed, as r= eported earlier =20 - [C] 'function lttng_condition* lttng_condition_buffer_usage_high_create(= )' has some indirect sub-type changes: + [C] 'function lttng_condition* lttng_condition_buffer_usage_high_create(= void)' has some indirect sub-type changes: return type changed: pointed to type 'struct lttng_condition' changed, as reported earlie= r =20 - [C] 'function lttng_condition* lttng_condition_buffer_usage_low_create()= ' has some indirect sub-type changes: + [C] 'function lttng_condition* lttng_condition_buffer_usage_low_create(v= oid)' has some indirect sub-type changes: return type changed: pointed to type 'struct lttng_condition' changed, as reported earlie= r =20 @@ -269,7 +269,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables 3 data member changes: type of 'lttng_condition_type type' changed, as reported earli= er type of 'evaluation_serialize_cb serialize' changed: - underlying type 'typedef ssize_t (lttng_evaluation*, char*)*= ' changed: + underlying type 'ssize_t (*)(lttng_evaluation*, char*)' chan= ged: in pointed to type 'function type typedef ssize_t (lttng_e= valuation*, char*)': return type changed: entity changed from 'typedef ssize_t' to compatible ty= pe 'int' @@ -284,7 +284,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Adde= d variables entity changed from 'char' to 'struct lttng_dynamic_= buffer' type size changed from 8 to 192 (in bits) type of 'evaluation_destroy_cb destroy' changed: - underlying type 'void (lttng_evaluation*)*' changed: + underlying type 'void (*)(lttng_evaluation*)' changed: in pointed to type 'function type void (lttng_evaluation*)= ': parameter 1 of type 'lttng_evaluation*' has sub-type cha= nges: pointed to type 'struct lttng_evaluation' changed, as = being reported diff --git a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt b/te= sts/data/test-diff-dwarf/test-23-diff-arch-report-0.txt index c5a6e0a3..5d082418 100644 --- a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt +++ b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt @@ -6,6 +6,6 @@ architecture changed from 'elf-intel-80386' to 'elf-amd-x86= _64' =20 1 function with some indirect sub-type change: =20 - [C] 'function int foo()' has some indirect sub-type changes: + [C] 'function int foo(void)' has some indirect sub-type changes: address size of function changed from 32 bits to 64 bits =20 diff --git a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt b/tes= ts/data/test-diff-dwarf/test18-alias-sym-report-0.txt index 9683d745..672aa27f 100644 --- a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt +++ b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' + [A] 'function void bar(void)' =20 diff --git a/tests/data/test-diff-dwarf/test19-soname-report-0.txt b/tests/= data/test-diff-dwarf/test19-soname-report-0.txt index 45df5856..19b43add 100644 --- a/tests/data/test-diff-dwarf/test19-soname-report-0.txt +++ b/tests/data/test-diff-dwarf/test19-soname-report-0.txt @@ -6,5 +6,5 @@ SONAME changed from 'libtest19-soname-0' to 'libtest19-sona= me-1' =20 1 Added function: =20 - [A] 'function void func1()' + [A] 'function void func1(void)' =20 diff --git a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt = b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt index e270f48b..7a30831f 100644 --- a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt +++ b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 function with some indirect sub-type change: =20 - [C] 'function void fun()' has some indirect sub-type changes: + [C] 'function void fun(void)' has some indirect sub-type changes: parameter 1 of type 'unsigned int' was added parameter 2 of type 'char' was added parameter 3 of type 'int' was added diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b= /tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt index 3238e4c9..2ba0e64a 100644 --- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt +++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt @@ -11,15 +11,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable =20 3 functions with some indirect sub-type change: =20 - [C] 'function callback fn0()' has some indirect sub-type changes: + [C] 'function callback fn0(void)' has some indirect sub-type changes: return type changed: - underlying type 'int (int)*' changed: + underlying type 'int (*)(int)' changed: in pointed to type 'function type int (int)': return type changed: type name changed from 'int' to 'void' type size changed from 32 to 0 (in bits) =20 - [C] 'function double (int)* fn1()' has some indirect sub-type changes: + [C] 'function double (*fn1(void))(int)' has some indirect sub-type chang= es: return type changed: in pointed to type 'function type double (int)': return type changed: @@ -30,14 +30,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable parameter 1 of type 'class S' has sub-type changes: type size hasn't changed 3 data member changes: - type of 'int ()* fnptr0' changed: - in pointed to type 'function type int ()': + type of 'int (* fnptr0)(void)' changed: + in pointed to type 'function type int (void)': parameter 1 of type 'double' was added - type of 'int ()* fnptr1' changed: - in pointed to type 'function type int ()': - entity changed from 'function type int ()' to 'void' + type of 'int (* fnptr1)(void)' changed: + in pointed to type 'function type int (void)': + entity changed from 'function type int (void)' to 'void' type size changed from 64 to 0 (in bits) - type of 'int ()* fnptr2' changed: - entity changed from 'int ()*' to 'int' + type of 'int (* fnptr2)(void)' changed: + entity changed from 'int (*)(void)' to 'int' type size changed from 64 to 32 (in bits) =20 diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b= /tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt index d16753c7..1d76043e 100644 --- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt +++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt @@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable =20 3 functions with some indirect sub-type change: =20 - [C] 'function callback fn0()' has some indirect sub-type changes: + [C] 'function callback fn0(void)' has some indirect sub-type changes: return type changed: underlying type 'int (int)&' changed: in referenced type 'function type int (int)': @@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable type name changed from 'int' to 'void' type size changed from 32 to 0 (in bits) =20 - [C] 'function double (int)& fn1()' has some indirect sub-type changes: + [C] 'function double (int)& fn1(void)' has some indirect sub-type change= s: return type changed: in referenced type 'function type double (int)': return type changed: @@ -31,15 +31,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable in referenced type 'class S': type size hasn't changed 3 data member changes: - type of 'int ()& fnref0' changed: - in referenced type 'function type int ()': + type of 'int (& fnref0)(void)' changed: + in referenced type 'function type int (void)': parameter 1 of type 'double' was added - type of 'int ()& fnref1' changed: - in referenced type 'function type int ()': - entity changed from 'function type int ()' to 'int*' + type of 'int (& fnref1)(void)' changed: + in referenced type 'function type int (void)': + entity changed from 'function type int (void)' to 'int*' type size hasn't changed - type of 'int ()& fnref2' changed: - in referenced type 'function type int ()': - entity changed from 'function type int ()' to 'int' + type of 'int (& fnref2)(void)' changed: + in referenced type 'function type int (void)': + entity changed from 'function type int (void)' to 'int' type size changed from 64 to 32 (in bits) =20 diff --git a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt = b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt index fad1ed9a..bc148f3d 100644 --- a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt +++ b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt @@ -32,7 +32,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable implicit parameter 0 of type 'Interface*' has sub-type changes: pointed to type 'class Interface' changed, as reported earlier =20 - [C] 'function Interface* make_interface()' has some indirect sub-type ch= anges: + [C] 'function Interface* make_interface(void)' has some indirect sub-typ= e changes: return type changed: pointed to type 'class Interface' changed, as reported earlier =20 diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-= diff-dwarf/test5-report.txt index ba721004..9cf2af80 100644 --- a/tests/data/test-diff-dwarf/test5-report.txt +++ b/tests/data/test-diff-dwarf/test5-report.txt @@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable 1 data member change: 'int m0' access changed from 'private' to 'public' =20 - [C] 'function C0 foo()' has some indirect sub-type changes: + [C] 'function C0 foo(void)' has some indirect sub-type changes: return type changed: entity changed from 'class C0' to compatible type 'typedef c0_type' details were reported earlier diff --git a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt b/test= s/data/test-diff-filter/test-PR26739-2-report-0.txt index 8989efd7..a9ce8065 100644 --- a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt +++ b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt @@ -12,6 +12,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable entity changed from 'const volatile int[5]' to compatible type= 'typedef array_type1' at test-PR26739-2-v1.c:3:1 array element type 'const volatile int' changed: 'const volatile int' changed to 'const int' - type name changed from 'const volatile int[5]' to 'const int= [5]' + type name changed from 'volatile const int[5]' to 'const int= [5]' type size hasn't changed =20 diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-re= port-0.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-re= port-0.txt index 2c64c39f..c73ce1aa 100644 --- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.= txt +++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.= txt @@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable underlying type 'struct S' changed: type size hasn't changed 1 data member changes (1 filtered): - type of 'FooStruct::Embedded* m1' changed: + type of 'Embedded* m1' changed: in pointed to type 'struct FooStruct::Embedded': type size hasn't changed 1 data member insertion: diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-re= port-1.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-re= port-1.txt index 9af85bdc..587688ec 100644 --- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.= txt +++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.= txt @@ -11,12 +11,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Adde= d variable underlying type 'struct S' changed: type size hasn't changed 2 data member changes: - type of 'FooStruct::Embedded* m1' changed: + type of 'Embedded* m1' changed: in pointed to type 'struct FooStruct::Embedded': type size hasn't changed 1 data member insertion: 'char m1', at offset 32 (in bits) - type of 'FooStruct::Embedded** m2' changed: + type of 'Embedded** m2' changed: in pointed to type 'FooStruct::Embedded*': pointed to type 'struct FooStruct::Embedded' changed, = as reported earlier =20 diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.t= xt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt index 77510262..d2ba56bc 100644 --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variab= le symbol not referen =20 82 Removed functions: =20 - [D] 'function void COI::fini()' - [D] 'function bool COI::init()' + [D] 'function void COI::fini(void)' + [D] 'function bool COI::init(void)' [D] 'function void* DL_sym(void*, const char*, const char*)' [D] 'method COIRESULT Engine::compute(const std::__cxx11::list >&, void*, uint16_t, void*, uint16_t, uint32_= t, const COIEVENT*, COIEVENT*)' [D] 'method void FuncList::dump()' @@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)' [D] 'method MicEnvVar::~MicEnvVar(int)' [D] 'method bool MyoWrapper::LoadLibrary()' - [D] 'function void ORSL::init()' + [D] 'function void ORSL::init(void)' [D] 'function void ORSL::release(int)' [D] 'function bool ORSL::reserve(int)' [D] 'function bool ORSL::try_reserve(int)' @@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)' [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)' [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)' - [D] 'function void Offload_Timer_Print()' + [D] 'function void Offload_Timer_Print(void)' [D] 'method void VarList::dump()' [D] 'method void VarList::table_copy(void*, int64_t)' [D] 'method void VarList::table_patch_names(int64_t)' @@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'function bool __dv_is_allocated(const ArrDesc*)' [D] 'function bool __dv_is_contiguous(const ArrDesc*)' [D] 'function void __liboffload_error_support(error_types, ...)' - [D] 'function int __offload_init_library()' - [D] 'function void __offload_myoFini()' + [D] 'function int __offload_init_library(void)' + [D] 'function void __offload_myoFini(void)' [D] 'function bool __offload_parse_int_string(const char*, int64_t&)' [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)' [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)' @@ -308,13 +308,13 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen [A] 'method __gnu_cxx::__normal_iterator > >& _= _gnu_cxx::__normal_iterator > >::operator++()' [A] 'method __gnu_cxx::__normal_iterator > > __= gnu_cxx::__normal_iterator > >::operator-(__gnu_cx= x::__normal_iterator > >::difference_type) const' [A] 'method __gnu_cxx::__normal_iterator > >& _= _gnu_cxx::__normal_iterator > >::operator--()' - [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter::_Iter_comp_iter(bool (const VarTable:= :Entry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter::_Iter_comp_iter(bool (*)(const VarTab= le::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter::operator()<__gnu_cxx::__normal_iterat= or >, __gnu_cx= x::__normal_iterator > >(__gnu_cxx::__normal_iterator > >, __gnu= _cxx::__normal_iterator > >)' - [A] 'method void __gnu_cxx::__ops::_Iter_comp_val::_Iter_comp_val(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Iter_comp_val::_Iter_comp_val(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val::operator()<__gnu_cxx::__normal_iterato= r >, const Var= Table::Entry*>(__gnu_cxx::__normal_iterator > >, c= onst VarTable::Entry*&)' - [A] 'method void __gnu_cxx::__ops::_Val_comp_iter::_Val_comp_iter(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Val_comp_iter::_Val_comp_iter(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter::operator() > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator > >)' - [A] 'function __gnu_cxx::__ops::_Iter_comp_iter __gnu_cxx::__ops::__iter_comp_iter(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'function __gnu_cxx::__ops::_Iter_comp_iter __gnu_cxx::__ops::__iter_comp_iter(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'function __gnu_cxx::__ops::_Iter_comp_val __gnu_cxx::__ops::__iter_comp_val(__gnu_cxx::__ops::_Iter_c= omp_iter)' [A] 'function __gnu_cxx::__ops::_Val_comp_iter __gnu_cxx::__ops::__val_comp_iter(__gnu_cxx::__ops::_Iter_c= omp_iter)' [A] 'method __gnu_cxx::new_allocator::pointer __= gnu_cxx::new_allocator::allocate(__gnu_cxx::new_all= ocator::size_type, void*)' @@ -1154,7 +1154,7 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen [A] 'method std::pair, bool> std::= set, std::allocator >::insert(std::set= , std::allocator >::value_type&)' [A] 'method void std::set, std::allocator >::set()' [A] 'function std::_Setprecision std::setprecision(int)' - [A] 'function void std::sort<__gnu_cxx::__normal_iterator >, bool (*)(const VarTable::= Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >,= bool (const VarTable::Entry*, const VarTable::Entry*)*)' + [A] 'function void std::sort<__gnu_cxx::__normal_iterator >, bool (*)(const VarTable::= Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >,= bool (*)(const VarTable::Entry*, const VarTable::Entry*))' [A] 'function void std::swap(const VarTable::Ent= ry*&, const VarTable::Entry*&)' [A] 'method void std::tuple::tuple(std::tuple<= long unsigned int const&>&)' [A] 'method void std::tuple::tuple(c= onst unsigned long int&)' @@ -1263,7 +1263,7 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t a= lloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;} to: struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t p= reallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; = uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uin= t32_t always_delete; uint32_t pin;} - type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed: + type of 'VarExtra* m_vars_extra' changed: in pointed to type 'struct OffloadDescriptor::VarExtra': type size changed from 576 to 640 (in bits) 2 data member insertions: @@ -1418,8 +1418,8 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen entity changed from 'struct InitTableEntry' to compatible type 'ty= pedef InitTableEntry' type size hasn't changed 1 data member change: - type of 'void ()* func' changed: - in pointed to type 'function type void ()': + type of 'void (* func)(void)' changed: + in pointed to type 'function type void (void)': parameter 1 of type 'typedef MyoArena' was added =20 [C] 'function void __offload_register_image(void*)' has some indirect su= b-type changes: @@ -1435,28 +1435,28 @@ Variable symbols changes summary: 0 Removed, 0 Adde= d variable symbol not referen =20 47 Removed variables: =20 - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef ui= nt64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef = uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreate' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy' - [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSin= kAddress' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uin= t64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, = COIMAPINSTANCE*, void**)* COI::BufferMap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferRead' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef C= OI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIE= VENT*, COIEVENT*)* COI::BufferSetState' - [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const = COIEVENT*, COIEVENT*)* COI::BufferUnmap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferWrite' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGet= Count' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGIN= E*)* COI::EngineGetHandle' - [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32= _t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait' - [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency' - [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t,= COIPIPELINE*)* COI::PipelineCreate' - [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy' - [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typede= f uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, co= nst COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)= * COI::PipelineRunFunction' - [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef u= int64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t,= const char*, typedef uint64_t, const char*, const char*, typedef uint64_t,= COIPROCESS*)* COI::ProcessCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uin= t8_t, int8_t*, uint32_t*)* COI::ProcessDestroy' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char= **, COIFUNCTION*)* COI::ProcessGetFunctionHandles' - [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, con= st char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COI= LIBRARY*)* COI::ProcessLoadLibraryFromMemory' - [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const= char**, const uint64_t*)* COI::ProcessRegisterLibraries' + [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint6= 4_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t= , void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE= , uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)' + [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)' + [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP= _TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)' + [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t,= COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER= _STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIE= VENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t= , COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)' + [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGIN= E*)' + [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, ui= nt8_t, uint32_t*, uint32_t*)' + [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)' + [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, = COIPIPELINE*)' + [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)' + [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, ui= nt32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT= *, void*, uint16_t, void*, uint16_t, COIEVENT*)' + [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, = void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const c= har*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)' + [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int= 8_t*, uint32_t*)' + [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, = const char**, COIFUNCTION*)' + [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, = uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIB= RARY*)' + [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const= uint64_t*, const char**, const uint64_t*)' [D] 'bool COI::is_available' [D] 'static const int MicEnvVar::any_card' [D] 'FuncList __offload_entries' @@ -1485,10 +1485,10 @@ Variable symbols changes summary: 0 Removed, 0 Adde= d variable symbol not referen =20 11 Added variables: =20 - [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_= INFO*)* COI::EngineGetInfo' - [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typede= f COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback' - [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask' - [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef ui= nt8_t, uint64_t*)* COI::PipelineSetCPUMask' + [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_IN= FO*)' + [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVEN= T, COIRESULT, void*), void*, uint64_t)' + [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)' + [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t= , uint64_t*)' [A] 'static Stream::StreamMap Stream::all_streams' [A] 'static mutex_t Stream::m_stream_lock' [A] 'static uint64_t Stream::m_streams_count' diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.t= xt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt index d555711f..dca2fab7 100644 --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variab= le symbol not referen =20 82 Removed functions: =20 - [D] 'function void COI::fini()' - [D] 'function bool COI::init()' + [D] 'function void COI::fini(void)' + [D] 'function bool COI::init(void)' [D] 'function void* DL_sym(void*, const char*, const char*)' [D] 'method COIRESULT Engine::compute(const std::__cxx11::list >&, void*, uint16_t, void*, uint16_t, uint32_= t, const COIEVENT*, COIEVENT*)' [D] 'method void FuncList::dump()' @@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)' [D] 'method MicEnvVar::~MicEnvVar(int)' [D] 'method bool MyoWrapper::LoadLibrary()' - [D] 'function void ORSL::init()' + [D] 'function void ORSL::init(void)' [D] 'function void ORSL::release(int)' [D] 'function bool ORSL::reserve(int)' [D] 'function bool ORSL::try_reserve(int)' @@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)' [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)' [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)' - [D] 'function void Offload_Timer_Print()' + [D] 'function void Offload_Timer_Print(void)' [D] 'method void VarList::dump()' [D] 'method void VarList::table_copy(void*, int64_t)' [D] 'method void VarList::table_patch_names(int64_t)' @@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'function bool __dv_is_allocated(const ArrDesc*)' [D] 'function bool __dv_is_contiguous(const ArrDesc*)' [D] 'function void __liboffload_error_support(error_types, ...)' - [D] 'function int __offload_init_library()' - [D] 'function void __offload_myoFini()' + [D] 'function int __offload_init_library(void)' + [D] 'function void __offload_myoFini(void)' [D] 'function bool __offload_parse_int_string(const char*, int64_t&)' [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)' [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)' @@ -308,13 +308,13 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen [A] 'method __gnu_cxx::__normal_iterator > >& _= _gnu_cxx::__normal_iterator > >::operator++()' [A] 'method __gnu_cxx::__normal_iterator > > __= gnu_cxx::__normal_iterator > >::operator-(__gnu_cx= x::__normal_iterator > >::difference_type) const' [A] 'method __gnu_cxx::__normal_iterator > >& _= _gnu_cxx::__normal_iterator > >::operator--()' - [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter::_Iter_comp_iter(bool (const VarTable:= :Entry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter::_Iter_comp_iter(bool (*)(const VarTab= le::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter::operator()<__gnu_cxx::__normal_iterat= or >, __gnu_cx= x::__normal_iterator > >(__gnu_cxx::__normal_iterator > >, __gnu= _cxx::__normal_iterator > >)' - [A] 'method void __gnu_cxx::__ops::_Iter_comp_val::_Iter_comp_val(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Iter_comp_val::_Iter_comp_val(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val::operator()<__gnu_cxx::__normal_iterato= r >, const Var= Table::Entry*>(__gnu_cxx::__normal_iterator > >, c= onst VarTable::Entry*&)' - [A] 'method void __gnu_cxx::__ops::_Val_comp_iter::_Val_comp_iter(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Val_comp_iter::_Val_comp_iter(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter::operator() > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator > >)' - [A] 'function __gnu_cxx::__ops::_Iter_comp_iter __gnu_cxx::__ops::__iter_comp_iter(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'function __gnu_cxx::__ops::_Iter_comp_iter __gnu_cxx::__ops::__iter_comp_iter(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'function __gnu_cxx::__ops::_Iter_comp_val __gnu_cxx::__ops::__iter_comp_val(__gnu_cxx::__ops::_Iter_c= omp_iter)' [A] 'function __gnu_cxx::__ops::_Val_comp_iter __gnu_cxx::__ops::__val_comp_iter(__gnu_cxx::__ops::_Iter_c= omp_iter)' [A] 'method __gnu_cxx::new_allocator::pointer __= gnu_cxx::new_allocator::allocate(__gnu_cxx::new_all= ocator::size_type, void*)' @@ -1154,7 +1154,7 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen [A] 'method std::pair, bool> std::= set, std::allocator >::insert(std::set= , std::allocator >::value_type&)' [A] 'method void std::set, std::allocator >::set()' [A] 'function std::_Setprecision std::setprecision(int)' - [A] 'function void std::sort<__gnu_cxx::__normal_iterator >, bool (*)(const VarTable::= Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >,= bool (const VarTable::Entry*, const VarTable::Entry*)*)' + [A] 'function void std::sort<__gnu_cxx::__normal_iterator >, bool (*)(const VarTable::= Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >,= bool (*)(const VarTable::Entry*, const VarTable::Entry*))' [A] 'function void std::swap(const VarTable::Ent= ry*&, const VarTable::Entry*&)' [A] 'method void std::tuple::tuple(std::tuple<= long unsigned int const&>&)' [A] 'method void std::tuple::tuple(c= onst unsigned long int&)' @@ -1263,7 +1263,7 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t a= lloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;} to: struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t p= reallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; = uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uin= t32_t always_delete; uint32_t pin;} - type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed: + type of 'VarExtra* m_vars_extra' changed: in pointed to type 'struct OffloadDescriptor::VarExtra' at off= load_host.h:216:1: type size changed from 576 to 640 (in bits) 2 data member insertions: @@ -1418,8 +1418,8 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen entity changed from 'struct InitTableEntry' to compatible type 'ty= pedef InitTableEntry' at offload_table.h:296:1 type size hasn't changed 1 data member change: - type of 'void ()* func' changed: - in pointed to type 'function type void ()': + type of 'void (* func)(void)' changed: + in pointed to type 'function type void (void)': parameter 1 of type 'typedef MyoArena' was added =20 [C] 'function void __offload_register_image(void*)' at offload_host.cpp:= 4245:1 has some indirect sub-type changes: @@ -1435,28 +1435,28 @@ Variable symbols changes summary: 0 Removed, 0 Adde= d variable symbol not referen =20 47 Removed variables: =20 - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef ui= nt64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef = uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreate' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy' - [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSin= kAddress' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uin= t64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, = COIMAPINSTANCE*, void**)* COI::BufferMap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferRead' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef C= OI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIE= VENT*, COIEVENT*)* COI::BufferSetState' - [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const = COIEVENT*, COIEVENT*)* COI::BufferUnmap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferWrite' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGet= Count' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGIN= E*)* COI::EngineGetHandle' - [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32= _t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait' - [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency' - [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t,= COIPIPELINE*)* COI::PipelineCreate' - [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy' - [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typede= f uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, co= nst COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)= * COI::PipelineRunFunction' - [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef u= int64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t,= const char*, typedef uint64_t, const char*, const char*, typedef uint64_t,= COIPROCESS*)* COI::ProcessCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uin= t8_t, int8_t*, uint32_t*)* COI::ProcessDestroy' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char= **, COIFUNCTION*)* COI::ProcessGetFunctionHandles' - [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, con= st char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COI= LIBRARY*)* COI::ProcessLoadLibraryFromMemory' - [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const= char**, const uint64_t*)* COI::ProcessRegisterLibraries' + [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint6= 4_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t= , void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE= , uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)' + [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)' + [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP= _TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)' + [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t,= COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER= _STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIE= VENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t= , COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)' + [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGIN= E*)' + [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, ui= nt8_t, uint32_t*, uint32_t*)' + [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)' + [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, = COIPIPELINE*)' + [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)' + [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, ui= nt32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT= *, void*, uint16_t, void*, uint16_t, COIEVENT*)' + [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, = void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const c= har*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)' + [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int= 8_t*, uint32_t*)' + [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, = const char**, COIFUNCTION*)' + [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, = uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIB= RARY*)' + [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const= uint64_t*, const char**, const uint64_t*)' [D] 'bool COI::is_available' [D] 'static const int MicEnvVar::any_card' [D] 'FuncList __offload_entries' @@ -1485,10 +1485,10 @@ Variable symbols changes summary: 0 Removed, 0 Adde= d variable symbol not referen =20 11 Added variables: =20 - [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_= INFO*)* COI::EngineGetInfo' - [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typede= f COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback' - [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask' - [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef ui= nt8_t, uint64_t*)* COI::PipelineSetCPUMask' + [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_IN= FO*)' + [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVEN= T, COIRESULT, void*), void*, uint64_t)' + [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)' + [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t= , uint64_t*)' [A] 'static Stream::StreamMap Stream::all_streams' [A] 'static mutex_t Stream::m_stream_lock' [A] 'static uint64_t Stream::m_streams_count' diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.t= xt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt index 7058b67a..1d214576 100644 --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variab= le symbol not referen =20 82 Removed functions: =20 - [D] 'function void COI::fini()' - [D] 'function bool COI::init()' + [D] 'function void COI::fini(void)' + [D] 'function bool COI::init(void)' [D] 'function void* DL_sym(void*, const char*, const char*)' [D] 'method COIRESULT Engine::compute(const std::__cxx11::list >&, void*, uint16_t, void*, uint16_t, uint32_= t, const COIEVENT*, COIEVENT*)' [D] 'method void FuncList::dump()' @@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)' [D] 'method MicEnvVar::~MicEnvVar(int)' [D] 'method bool MyoWrapper::LoadLibrary()' - [D] 'function void ORSL::init()' + [D] 'function void ORSL::init(void)' [D] 'function void ORSL::release(int)' [D] 'function bool ORSL::reserve(int)' [D] 'function bool ORSL::try_reserve(int)' @@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)' [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)' [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)' - [D] 'function void Offload_Timer_Print()' + [D] 'function void Offload_Timer_Print(void)' [D] 'method void VarList::dump()' [D] 'method void VarList::table_copy(void*, int64_t)' [D] 'method void VarList::table_patch_names(int64_t)' @@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'function bool __dv_is_allocated(const ArrDesc*)' [D] 'function bool __dv_is_contiguous(const ArrDesc*)' [D] 'function void __liboffload_error_support(error_types, ...)' - [D] 'function int __offload_init_library()' - [D] 'function void __offload_myoFini()' + [D] 'function int __offload_init_library(void)' + [D] 'function void __offload_myoFini(void)' [D] 'function bool __offload_parse_int_string(const char*, int64_t&)' [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)' [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)' @@ -308,13 +308,13 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen [A] 'method __gnu_cxx::__normal_iterator > >& _= _gnu_cxx::__normal_iterator > >::operator++()' [A] 'method __gnu_cxx::__normal_iterator > > __= gnu_cxx::__normal_iterator > >::operator-(__gnu_cx= x::__normal_iterator > >::difference_type) const' [A] 'method __gnu_cxx::__normal_iterator > >& _= _gnu_cxx::__normal_iterator > >::operator--()' - [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter::_Iter_comp_iter(bool (const VarTable:= :Entry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter::_Iter_comp_iter(bool (*)(const VarTab= le::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter::operator()<__gnu_cxx::__normal_iterat= or >, __gnu_cx= x::__normal_iterator > >(__gnu_cxx::__normal_iterator > >, __gnu= _cxx::__normal_iterator > >)' - [A] 'method void __gnu_cxx::__ops::_Iter_comp_val::_Iter_comp_val(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Iter_comp_val::_Iter_comp_val(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val::operator()<__gnu_cxx::__normal_iterato= r >, const Var= Table::Entry*>(__gnu_cxx::__normal_iterator > >, c= onst VarTable::Entry*&)' - [A] 'method void __gnu_cxx::__ops::_Val_comp_iter::_Val_comp_iter(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'method void __gnu_cxx::__ops::_Val_comp_iter::_Val_comp_iter(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter::operator() > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator > >)' - [A] 'function __gnu_cxx::__ops::_Iter_comp_iter __gnu_cxx::__ops::__iter_comp_iter(bool (const VarTable::E= ntry*, const VarTable::Entry*)*)' + [A] 'function __gnu_cxx::__ops::_Iter_comp_iter __gnu_cxx::__ops::__iter_comp_iter(bool (*)(const VarTable= ::Entry*, const VarTable::Entry*))' [A] 'function __gnu_cxx::__ops::_Iter_comp_val __gnu_cxx::__ops::__iter_comp_val(__gnu_cxx::__ops::_Iter_c= omp_iter)' [A] 'function __gnu_cxx::__ops::_Val_comp_iter __gnu_cxx::__ops::__val_comp_iter(__gnu_cxx::__ops::_Iter_c= omp_iter)' [A] 'method __gnu_cxx::new_allocator::pointer __= gnu_cxx::new_allocator::allocate(__gnu_cxx::new_all= ocator::size_type, void*)' @@ -1154,7 +1154,7 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen [A] 'method std::pair, bool> std::= set, std::allocator >::insert(std::set= , std::allocator >::value_type&)' [A] 'method void std::set, std::allocator >::set()' [A] 'function std::_Setprecision std::setprecision(int)' - [A] 'function void std::sort<__gnu_cxx::__normal_iterator >, bool (*)(const VarTable::= Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >,= bool (const VarTable::Entry*, const VarTable::Entry*)*)' + [A] 'function void std::sort<__gnu_cxx::__normal_iterator >, bool (*)(const VarTable::= Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator > >, __gnu_cxx::__normal_iterator > >,= bool (*)(const VarTable::Entry*, const VarTable::Entry*))' [A] 'function void std::swap(const VarTable::Ent= ry*&, const VarTable::Entry*&)' [A] 'method void std::tuple::tuple(std::tuple<= long unsigned int const&>&)' [A] 'method void std::tuple::tuple(c= onst unsigned long int&)' @@ -1263,7 +1263,7 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t a= lloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;} to: struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t p= reallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; = uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uin= t32_t always_delete; uint32_t pin;} - type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed: + type of 'VarExtra* m_vars_extra' changed: in pointed to type 'struct OffloadDescriptor::VarExtra' at off= load_host.h:216:1: type size changed from 0x48 to 0x50 (in bytes) 2 data member insertions: @@ -1418,8 +1418,8 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen entity changed from 'struct InitTableEntry' to compatible type 'ty= pedef InitTableEntry' at offload_table.h:296:1 type size hasn't changed 1 data member change: - type of 'void ()* func' changed: - in pointed to type 'function type void ()': + type of 'void (* func)(void)' changed: + in pointed to type 'function type void (void)': parameter 1 of type 'typedef MyoArena' was added =20 [C] 'function void __offload_register_image(void*)' at offload_host.cpp:= 4245:1 has some indirect sub-type changes: @@ -1435,28 +1435,28 @@ Variable symbols changes summary: 0 Removed, 0 Adde= d variable symbol not referen =20 47 Removed variables: =20 - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef ui= nt64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef = uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreate' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy' - [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSin= kAddress' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uin= t64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, = COIMAPINSTANCE*, void**)* COI::BufferMap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferRead' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef C= OI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIE= VENT*, COIEVENT*)* COI::BufferSetState' - [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const = COIEVENT*, COIEVENT*)* COI::BufferUnmap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferWrite' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGet= Count' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGIN= E*)* COI::EngineGetHandle' - [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32= _t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait' - [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency' - [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t,= COIPIPELINE*)* COI::PipelineCreate' - [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy' - [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typede= f uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, co= nst COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)= * COI::PipelineRunFunction' - [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef u= int64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t,= const char*, typedef uint64_t, const char*, const char*, typedef uint64_t,= COIPROCESS*)* COI::ProcessCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uin= t8_t, int8_t*, uint32_t*)* COI::ProcessDestroy' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char= **, COIFUNCTION*)* COI::ProcessGetFunctionHandles' - [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, con= st char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COI= LIBRARY*)* COI::ProcessLoadLibraryFromMemory' - [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const= char**, const uint64_t*)* COI::ProcessRegisterLibraries' + [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint6= 4_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t= , void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE= , uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)' + [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)' + [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP= _TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)' + [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t,= COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER= _STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIE= VENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t= , COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)' + [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGIN= E*)' + [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, ui= nt8_t, uint32_t*, uint32_t*)' + [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)' + [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, = COIPIPELINE*)' + [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)' + [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, ui= nt32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT= *, void*, uint16_t, void*, uint16_t, COIEVENT*)' + [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, = void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const c= har*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)' + [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int= 8_t*, uint32_t*)' + [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, = const char**, COIFUNCTION*)' + [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, = uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIB= RARY*)' + [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const= uint64_t*, const char**, const uint64_t*)' [D] 'bool COI::is_available' [D] 'static const int MicEnvVar::any_card' [D] 'FuncList __offload_entries' @@ -1485,10 +1485,10 @@ Variable symbols changes summary: 0 Removed, 0 Adde= d variable symbol not referen =20 11 Added variables: =20 - [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_= INFO*)* COI::EngineGetInfo' - [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typede= f COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback' - [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask' - [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef ui= nt8_t, uint64_t*)* COI::PipelineSetCPUMask' + [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_IN= FO*)' + [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVEN= T, COIRESULT, void*), void*, uint64_t)' + [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)' + [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t= , uint64_t*)' [A] 'static Stream::StreamMap Stream::all_streams' [A] 'static mutex_t Stream::m_stream_lock' [A] 'static uint64_t Stream::m_streams_count' diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.= txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt index 08c01085..6cd782f4 100644 --- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt +++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 6 Added variab= le symbols not refere =20 13 Added functions: =20 - [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()' - [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()' + [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length(void)' + [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length(void)' [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)' [A] 'method virtual const char* std::bad_array_length::what() const' note that this adds a new entry to the vtable of class std::bad_array_= length @@ -20,25 +20,25 @@ Variable symbols changes summary: 0 Removed, 6 Added va= riable symbols not refere note that this adds a new entry to the vtable of class std::bad_array_= new_length [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int= )' note that this adds a new entry to the vtable of class std::bad_array_= new_length - [A] 'function std::new_handler std::get_new_handler()' - [A] 'function std::terminate_handler std::get_terminate()' - [A] 'function std::unexpected_handler std::get_unexpected()' + [A] 'function std::new_handler std::get_new_handler(void)' + [A] 'function std::terminate_handler std::get_terminate(void)' + [A] 'function std::unexpected_handler std::get_unexpected(void)' [A] 'method std::regex_error::regex_error(std::regex_constants::error_ty= pe)' =20 2 functions with some indirect sub-type change: =20 - [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_a= llocate_dependent_exception()' has some indirect sub-type changes: + [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_a= llocate_dependent_exception(void)' has some indirect sub-type changes: return type changed: in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception': type size hasn't changed 1 data member insertion: - 'void (void*)* __padding', at offset 32 (in bits) + 'void (* __padding)(void*)', at offset 32 (in bits) 6 data member changes: 'std::unexpected_handler unexpectedHandler' offset changed from = 32 to 64 (in bits) (by +32 bits) 'std::terminate_handler terminateHandler' offset changed from 64= to 96 (in bits) (by +32 bits) - '__cxxabiv1::__cxa_exception* nextException' offset changed from= 96 to 128 (in bits) (by +32 bits) + '__cxa_exception* nextException' offset changed from 96 to 128 (= in bits) (by +32 bits) 'int handlerCount' offset changed from 128 to 160 (in bits) (by = +32 bits) - '__cxxabiv1::__cxa_exception* nextPropagatingException' offset c= hanged from 160 to 192 (in bits) (by +32 bits) + '__cxa_exception* nextPropagatingException' offset changed from = 160 to 192 (in bits) (by +32 bits) 'int propagationCount' offset changed from 192 to 224 (in bits) = (by +32 bits) =20 [C] 'function void std::__throw_regex_error(std::regex_constants::error_= type)' has some indirect sub-type changes: diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.= txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt index e17ef594..9c333b6e 100644 --- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt +++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 6 Added variab= le symbols not refere =20 13 Added functions: =20 - [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()' - [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()' + [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length(void)' + [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length(void)' [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)' [A] 'method virtual const char* std::bad_array_length::what() const' note that this adds a new entry to the vtable of class std::bad_array_= length @@ -20,25 +20,25 @@ Variable symbols changes summary: 0 Removed, 6 Added va= riable symbols not refere note that this adds a new entry to the vtable of class std::bad_array_= new_length [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int= )' note that this adds a new entry to the vtable of class std::bad_array_= new_length - [A] 'function std::new_handler std::get_new_handler()' - [A] 'function std::terminate_handler std::get_terminate()' - [A] 'function std::unexpected_handler std::get_unexpected()' + [A] 'function std::new_handler std::get_new_handler(void)' + [A] 'function std::terminate_handler std::get_terminate(void)' + [A] 'function std::unexpected_handler std::get_unexpected(void)' [A] 'method std::regex_error::regex_error(std::regex_constants::error_ty= pe)' =20 2 functions with some indirect sub-type change: =20 - [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_a= llocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-t= ype changes: + [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_a= llocate_dependent_exception(void)' at eh_alloc.cc:158:1 has some indirect s= ub-type changes: return type changed: in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at= unwind-cxx.h:112:1: type size hasn't changed 1 data member insertion: - 'void (void*)* __padding', at offset 32 (in bits) at unwind-cxx.= h:120:1 + 'void (* __padding)(void*)', at offset 32 (in bits) at unwind-cx= x.h:120:1 6 data member changes: 'std::unexpected_handler unexpectedHandler' offset changed from = 32 to 64 (in bits) (by +32 bits) 'std::terminate_handler terminateHandler' offset changed from 64= to 96 (in bits) (by +32 bits) - '__cxxabiv1::__cxa_exception* nextException' offset changed from= 96 to 128 (in bits) (by +32 bits) + '__cxa_exception* nextException' offset changed from 96 to 128 (= in bits) (by +32 bits) 'int handlerCount' offset changed from 128 to 160 (in bits) (by = +32 bits) - '__cxxabiv1::__cxa_exception* nextPropagatingException' offset c= hanged from 160 to 192 (in bits) (by +32 bits) + '__cxa_exception* nextPropagatingException' offset changed from = 160 to 192 (in bits) (by +32 bits) 'int propagationCount' offset changed from 192 to 224 (in bits) = (by +32 bits) =20 [C] 'function void std::__throw_regex_error(std::regex_constants::error_= type)' at functexcept.cc:116:1 has some indirect sub-type changes: diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-repor= t-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0= .txt index e14819a4..079d4de5 100644 --- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt +++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variab= le symbol not referen =20 82 Removed functions: =20 - [D] 'function void COI::fini()' - [D] 'function bool COI::init()' + [D] 'function void COI::fini(void)' + [D] 'function bool COI::init(void)' [D] 'function void* DL_sym(void*, const char*, const char*)' [D] 'method COIRESULT Engine::compute(const std::__cxx11::list >&, void*, uint16_t, void*, uint16_t, uint32_= t, const COIEVENT*, COIEVENT*)' [D] 'method void FuncList::dump()' @@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)' [D] 'method MicEnvVar::~MicEnvVar(int)' [D] 'method bool MyoWrapper::LoadLibrary()' - [D] 'function void ORSL::init()' + [D] 'function void ORSL::init(void)' [D] 'function void ORSL::release(int)' [D] 'function bool ORSL::reserve(int)' [D] 'function bool ORSL::try_reserve(int)' @@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)' [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)' [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)' - [D] 'function void Offload_Timer_Print()' + [D] 'function void Offload_Timer_Print(void)' [D] 'method void VarList::dump()' [D] 'method void VarList::table_copy(void*, int64_t)' [D] 'method void VarList::table_patch_names(int64_t)' @@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'function bool __dv_is_allocated(const ArrDesc*)' [D] 'function bool __dv_is_contiguous(const ArrDesc*)' [D] 'function void __liboffload_error_support(error_types, ...)' - [D] 'function int __offload_init_library()' - [D] 'function void __offload_myoFini()' + [D] 'function int __offload_init_library(void)' + [D] 'function void __offload_myoFini(void)' [D] 'function bool __offload_parse_int_string(const char*, int64_t&)' [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)' [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)' @@ -179,7 +179,7 @@ Variable symbols changes summary: 0 Removed, 0 Added va= riable symbol not referen struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t a= lloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;} to: struct {uint32_t is_static; uint32_t is_static_dstn;= uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t p= reallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; = uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uin= t32_t always_delete; uint32_t pin;} - type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed: + type of 'VarExtra* m_vars_extra' changed: in pointed to type 'struct OffloadDescriptor::VarExtra': type size changed from 576 to 640 (in bits) 2 data member insertions: @@ -334,8 +334,8 @@ Variable symbols changes summary: 0 Removed, 0 Added va= riable symbol not referen entity changed from 'struct InitTableEntry' to compatible type 'ty= pedef InitTableEntry' type size hasn't changed 1 data member change: - type of 'void ()* func' changed: - in pointed to type 'function type void ()': + type of 'void (* func)(void)' changed: + in pointed to type 'function type void (void)': parameter 1 of type 'typedef MyoArena' was added =20 [C] 'function void __offload_register_image(void*)' has some indirect su= b-type changes: @@ -351,28 +351,28 @@ Variable symbols changes summary: 0 Removed, 0 Added = variable symbol not referen =20 47 Removed variables: =20 - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef ui= nt64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef = uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreate' - [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typed= ef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::= BufferCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy' - [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSin= kAddress' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uin= t64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, = COIMAPINSTANCE*, void**)* COI::BufferMap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferRead' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef C= OI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIE= VENT*, COIEVENT*)* COI::BufferSetState' - [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const = COIEVENT*, COIEVENT*)* COI::BufferUnmap' - [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, type= def uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COI= EVENT*)* COI::BufferWrite' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGet= Count' - [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGIN= E*)* COI::EngineGetHandle' - [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32= _t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait' - [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency' - [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t,= COIPIPELINE*)* COI::PipelineCreate' - [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy' - [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typede= f uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, co= nst COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)= * COI::PipelineRunFunction' - [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef u= int64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t,= const char*, typedef uint64_t, const char*, const char*, typedef uint64_t,= COIPROCESS*)* COI::ProcessCreateFromMemory' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uin= t8_t, int8_t*, uint32_t*)* COI::ProcessDestroy' - [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char= **, COIFUNCTION*)* COI::ProcessGetFunctionHandles' - [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, con= st char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COI= LIBRARY*)* COI::ProcessLoadLibraryFromMemory' - [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const= char**, const uint64_t*)* COI::ProcessRegisterLibraries' + [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint6= 4_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t= , void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE= , uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)' + [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)' + [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)' + [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP= _TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)' + [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t,= COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER= _STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIE= VENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t= , COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)' + [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)' + [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGIN= E*)' + [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, ui= nt8_t, uint32_t*, uint32_t*)' + [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)' + [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, = COIPIPELINE*)' + [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)' + [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, ui= nt32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT= *, void*, uint16_t, void*, uint16_t, COIEVENT*)' + [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, = void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const c= har*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)' + [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int= 8_t*, uint32_t*)' + [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, = const char**, COIFUNCTION*)' + [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, = uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIB= RARY*)' + [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const= uint64_t*, const char**, const uint64_t*)' [D] 'bool COI::is_available' [D] 'static const int MicEnvVar::any_card' [D] 'FuncList __offload_entries' diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-repor= t-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1= .txt index 9e12abd2..42f4a1dd 100644 --- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt +++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt @@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variab= le symbol not referen =20 82 Removed functions: =20 - [D] 'function void COI::fini()' - [D] 'function bool COI::init()' + [D] 'function void COI::fini(void)' + [D] 'function bool COI::init(void)' [D] 'function void* DL_sym(void*, const char*, const char*)' [D] 'method COIRESULT Engine::compute(const std::__cxx11::list >&, void*, uint16_t, void*, uint16_t, uint32_= t, const COIEVENT*, COIEVENT*)' [D] 'method void FuncList::dump()' @@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)' [D] 'method MicEnvVar::~MicEnvVar(int)' [D] 'method bool MyoWrapper::LoadLibrary()' - [D] 'function void ORSL::init()' + [D] 'function void ORSL::init(void)' [D] 'function void ORSL::release(int)' [D] 'function bool ORSL::reserve(int)' [D] 'function bool ORSL::try_reserve(int)' @@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)' [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)' [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)' - [D] 'function void Offload_Timer_Print()' + [D] 'function void Offload_Timer_Print(void)' [D] 'method void VarList::dump()' [D] 'method void VarList::table_copy(void*, int64_t)' [D] 'method void VarList::table_patch_names(int64_t)' @@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen [D] 'function bool __dv_is_allocated(const ArrDesc*)' [D] 'function bool __dv_is_contiguous(const ArrDesc*)' [D] 'function void __liboffload_error_support(error_types, ...)' - [D] 'function int __offload_init_library()' - [D] 'function void __offload_myoFini()' + [D] 'function int __offload_init_library(void)' + [D] 'function void __offload_myoFini(void)' [D] 'function bool __offload_parse_int_string(const char*, int64_t&)' [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)' [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)' diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/t= est-diff-filter/test41-report-0.txt index c76cb67d..49eac055 100644 --- a/tests/data/test-diff-filter/test41-report-0.txt +++ b/tests/data/test-diff-filter/test41-report-0.txt @@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added vari= able symbol not referen return type changed: type size hasn't changed 1 data member change: - type of 'std::__cxx11::string* raw_' changed: + type of 'string* raw_' changed: in pointed to type 'typedef std::__cxx11::string' at stringfwd.h= :74:1: underlying type 'class std::__cxx11::basic_string, std::allocator >' at basic_string.h:72:1 changed: type size hasn't changed diff --git a/tests/data/test-diff-filter/test6-report.txt b/tests/data/test= -diff-filter/test6-report.txt index 61fb1d93..5327622d 100644 --- a/tests/data/test-diff-filter/test6-report.txt +++ b/tests/data/test-diff-filter/test6-report.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 function with some indirect sub-type change: =20 - [C] 'function return_type foo()' has some indirect sub-type changes: + [C] 'function return_type foo(void)' has some indirect sub-type changes: return type changed: underlying type 'unsigned char' changed: type name changed from 'unsigned char' to 'unsigned int' diff --git a/tests/data/test-diff-filter/test7-report.txt b/tests/data/test= -diff-filter/test7-report.txt index 2a28163f..b1600f86 100644 --- a/tests/data/test-diff-filter/test7-report.txt +++ b/tests/data/test-diff-filter/test7-report.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 function with some indirect sub-type change: =20 - [C] 'function return_type foo()' has some indirect sub-type changes: + [C] 'function return_type foo(void)' has some indirect sub-type changes: return type changed: type name changed from 'return_type' to 'other_return_type' type size hasn't changed diff --git a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt b/tes= ts/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt index 171d6490..fecc0ce9 100644 --- a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt +++ b/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt @@ -126,8 +126,8 @@ type of variable changed: type size hasn't changed 1 data member change: - type of 'typedef mp_limb_t (typedef mp_srcptr, typedef mp_size_t= , typedef mp_limb_t)* gcd_1' changed: - in pointed to type 'function type typedef mp_limb_t (typedef m= p_srcptr, typedef mp_size_t, typedef mp_limb_t)': + type of 'mp_limb_t (* gcd_1)(mp_srcptr, mp_size_t, mp_limb_t)' c= hanged: + in pointed to type 'function type typedef mp_limb_t (mp_srcptr= , mp_size_t, mp_limb_t)': parameter 1 of type 'typedef mp_srcptr' changed: typedef name changed from mp_srcptr to mp_limb_t underlying type 'const mp_limb_t*' changed: diff --git a/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt b/tests/dat= a/test-diff-pkg-ctf/test-rpm-report-0.txt index 346d100b..2bf90e76 100644 --- a/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt +++ b/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt @@ -4,7 +4,7 @@ =20 1 Added function: =20 - [A] 'function int dwarf_get_str_2()' {dwarf_get_str_2} + [A] 'function int dwarf_get_str_2(void)' {dwarf_get_str_2} =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D end of changes of 'libdwa= rf.so.1.20180129.0'=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24= .2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-= 29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt index 5bc7ff2c..868e6ed1 100644 --- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.f= c30.x86_64-report-0.txt +++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.f= c30.x86_64-report-0.txt @@ -11,7 +11,7 @@ in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at = gl_h.ads:57:1: type size hasn't changed 1 data member change: - type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* P_BOU= NDS' changed: + type of 'gl_h__gluint_vec___XUB* P_BOUNDS' changed: in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__glu= int_vec___XUB' at gl_h.ads:57:1: type size hasn't changed 2 data member changes: @@ -27,7 +27,7 @@ in unqualified underlying type 'struct gtk__glarea__attributes_arr= ay___XUP' at gtk-glarea.ads:48:1: type size hasn't changed 1 data member change: - type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__att= ributes_array___XUB* P_BOUNDS' changed: + type of 'gtk__glarea__attributes_array___XUB* P_BOUNDS' change= d: in pointed to type 'struct gtk__glarea__attributes_array___X= UP::gtk__glarea__attributes_array___XUB': type size hasn't changed 2 data member changes: diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/= data/test-diff-pkg/PR24690/PR24690-report-0.txt index 87c40934..6f71157b 100644 --- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt +++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt @@ -8,7 +8,7 @@ [A] 'function gboolean flatpak_installation_add_remote(FlatpakInstalla= tion*, FlatpakRemote*, gboolean, GCancellable*, GError**)' {flatpak_inst= allation_add_remote} [A] 'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_= sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, c= onst char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)' {f= latpak_installation_fetch_remote_ref_sync_full} [A] 'function GPtrArray* flatpak_installation_list_remote_refs_sync_fu= ll(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GEr= ror**)' {flatpak_installation_list_remote_refs_sync_full} - [A] 'function GType flatpak_query_flags_get_type()' {flatpak_query_= flags_get_type} + [A] 'function GType flatpak_query_flags_get_type(void)' {flatpak_qu= ery_flags_get_type} [A] 'function char* flatpak_remote_get_comment(FlatpakRemote*)' {fl= atpak_remote_get_comment} [A] 'function char* flatpak_remote_get_description(FlatpakRemote*)' = {flatpak_remote_get_description} [A] 'function char* flatpak_remote_get_filter(FlatpakRemote*)' {fla= tpak_remote_get_filter} @@ -33,11 +33,11 @@ [C] 'struct _FlatpakTransactionClass' changed: type size changed from 2176 to 2240 (in bits) 1 data member insertion: - 'typedef gboolean (FlatpakTransaction*, const char*, const char*, = const char*, const char*, const char**)* end_of_lifed_with_rebase', at offs= et 1408 (in bits) at flatpak-transaction.h:117:1 + 'gboolean (* end_of_lifed_with_rebase)(FlatpakTransaction*, const = char*, const char*, const char*, const char*, const char**)', at offset 140= 8 (in bits) at flatpak-transaction.h:117:1 4 data member changes (3 filtered): - 'typedef gboolean (FlatpakTransaction*)* ready' offset changed fro= m 1408 to 1472 (in bits) (by +64 bits) - 'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransaction= RemoteReason, const char*, const char*, const char*)* add_new_remote' offse= t changed from 1472 to 1536 (in bits) (by +64 bits) - 'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* = run' offset changed from 1536 to 1600 (in bits) (by +64 bits) + 'gboolean (* ready)(FlatpakTransaction*)' offset changed from 1408= to 1472 (in bits) (by +64 bits) + 'gboolean (* add_new_remote)(FlatpakTransaction*, FlatpakTransacti= onRemoteReason, const char*, const char*, const char*)' offset changed from= 1472 to 1536 (in bits) (by +64 bits) + 'gboolean (* run)(FlatpakTransaction*, GCancellable*, GError**)' o= ffset changed from 1536 to 1600 (in bits) (by +64 bits) 'gpointer padding[9]' offset changed from 1600 to 1664 (in bits) (= by +64 bits) =20 6 added types unreachable from any public interface: diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--lib= sigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg= /libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-r= eport-0.txt index ec948e26..af560426 100644 --- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-= 2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt +++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-= 2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt @@ -17,11 +17,11 @@ in pointed to type 'struct sigc::connection': type size hasn't changed 1 data member change: - type of 'sigc::slot_base* slot_' changed: + type of 'slot_base* slot_' changed: in pointed to type 'class sigc::slot_base': type size hasn't changed 1 data member change: - type of 'sigc::slot_base::rep_type* rep_' changed: + type of 'rep_type* rep_' changed: in pointed to type 'typedef sigc::slot_base::rep_type'= : underlying type 'struct sigc::internal::slot_rep' ch= anged: type size hasn't changed @@ -29,7 +29,7 @@ 'struct sigc::trackable' changed: type size hasn't changed 1 data member change: - type of 'sigc::internal::trackable_callback_= list* callback_list_' changed: + type of 'trackable_callback_list* callback_l= ist_' changed: in pointed to type 'struct sigc::internal:= :trackable_callback_list': type size changed from 192 to 256 (in bi= ts) 2 data member changes: diff --git a/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcry= pt-compat-4.4.18-3.el9.x86_64-report-1.txt b/tests/data/test-diff-pkg/libxc= rypt-4.1.1-6.el8.x86_64--libxcrypt-compat-4.4.18-3.el9.x86_64-report-1.txt index b2030147..e3699d6c 100644 --- a/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-comp= at-4.4.18-3.el9.x86_64-report-1.txt +++ b/tests/data/test-diff-pkg/libxcrypt-4.1.1-6.el8.x86_64--libxcrypt-comp= at-4.4.18-3.el9.x86_64-report-1.txt @@ -6,7 +6,7 @@ =20 [A] 'function int _crypt_crypt_checksalt(const char*)' {crypt_check= salt@@XCRYPT_4.3} [A] 'function char* _crypt_crypt_gensalt_rn(const char*, unsigned long= int, const char*, int, char*, int)' {xcrypt_gensalt_r@XCRYPT_2.0, alias= es crypt_gensalt_r@XCRYPT_2.0, crypt_gensalt_rn@@XCRYPT_2.0} - [A] 'function const char* _crypt_crypt_preferred_method()' {crypt_p= referred_method@@XCRYPT_4.4} + [A] 'function const char* _crypt_crypt_preferred_method(void)' {cry= pt_preferred_method@@XCRYPT_4.4} [A] 'function char* _crypt_crypt_r(const char*, const char*, crypt_dat= a*)' {xcrypt_r@XCRYPT_2.0, aliases crypt_r@@XCRYPT_2.0, crypt_r@GLIBC_2.= 2.5} =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D end of changes of 'libcry= pt.so.1.1.0'=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.1= 2.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.= 4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt index b2d0b268..8ccc71cf 100644 --- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.e= l7.x86_64-report-2.txt +++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.e= l7.x86_64-report-2.txt @@ -35,77 +35,77 @@ underlying type 'struct QXLInterface' at spice.h= :230:1 changed: type size hasn't changed 15 data member changes: - type of 'void (QXLInstance*, QXLWorker*)* at= tache_worker' changed: + type of 'void (* attache_worker)(QXLInstance= *, QXLWorker*)' changed: in pointed to type 'function type void (QX= LInstance*, QXLWorker*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, int)* set_compr= ession_level' changed: + type of 'void (* set_compression_level)(QXLI= nstance*, int)' changed: in pointed to type 'function type void (QX= LInstance*, int)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, typedef uint32_= t)* set_mm_time' changed: - in pointed to type 'function type void (QX= LInstance*, typedef uint32_t)': + type of 'void (* set_mm_time)(QXLInstance*, = uint32_t)' changed: + in pointed to type 'function type void (QX= LInstance*, uint32_t)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, QXLDevInitInfo*= )* get_init_info' changed: + type of 'void (* get_init_info)(QXLInstance*= , QXLDevInitInfo*)' changed: in pointed to type 'function type void (QX= LInstance*, QXLDevInitInfo*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'int (QXLInstance*, QXLCommandExt*)*= get_command' changed: + type of 'int (* get_command)(QXLInstance*, Q= XLCommandExt*)' changed: in pointed to type 'function type int (QXL= Instance*, QXLCommandExt*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'int (QXLInstance*)* req_cmd_notific= ation' changed: + type of 'int (* req_cmd_notification)(QXLIns= tance*)' changed: in pointed to type 'function type int (QXL= Instance*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, struct QXLRelea= seInfoExt)* release_resource' changed: - in pointed to type 'function type void (QX= LInstance*, struct QXLReleaseInfoExt)': + type of 'void (* release_resource)(QXLInstan= ce*, QXLReleaseInfoExt)' changed: + in pointed to type 'function type void (QX= LInstance*, QXLReleaseInfoExt)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'int (QXLInstance*, QXLCommandExt*)*= get_cursor_command' changed: + type of 'int (* get_cursor_command)(QXLInsta= nce*, QXLCommandExt*)' changed: in pointed to type 'function type int (QXL= Instance*, QXLCommandExt*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'int (QXLInstance*)* req_cursor_noti= fication' changed: + type of 'int (* req_cursor_notification)(QXL= Instance*)' changed: in pointed to type 'function type int (QXL= Instance*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, typedef uint32_= t)* notify_update' changed: - in pointed to type 'function type void (QX= LInstance*, typedef uint32_t)': + type of 'void (* notify_update)(QXLInstance*= , uint32_t)' changed: + in pointed to type 'function type void (QX= LInstance*, uint32_t)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'int (QXLInstance*)* flush_resources= ' changed: + type of 'int (* flush_resources)(QXLInstance= *)' changed: in pointed to type 'function type int (QXL= Instance*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, typedef uint64_= t)* async_complete' changed: - in pointed to type 'function type void (QX= LInstance*, typedef uint64_t)': + type of 'void (* async_complete)(QXLInstance= *, uint64_t)' changed: + in pointed to type 'function type void (QX= LInstance*, uint64_t)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, typedef uint32_= t, QXLRect*, typedef uint32_t)* update_area_complete' changed: - in pointed to type 'function type void (QX= LInstance*, typedef uint32_t, QXLRect*, typedef uint32_t)': + type of 'void (* update_area_complete)(QXLIn= stance*, uint32_t, QXLRect*, uint32_t)' changed: + in pointed to type 'function type void (QX= LInstance*, uint32_t, QXLRect*, uint32_t)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'void (QXLInstance*, typedef uint8_t= , uint8_t*)* set_client_capabilities' changed: - in pointed to type 'function type void (QX= LInstance*, typedef uint8_t, uint8_t*)': + type of 'void (* set_client_capabilities)(QX= LInstance*, uint8_t, uint8_t*)' changed: + in pointed to type 'function type void (QX= LInstance*, uint8_t, uint8_t*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: underlying type 'struct QXLInstance'= changed, as being reported - type of 'int (QXLInstance*, VDAgentMonitorsC= onfig*)* client_monitors_config' changed: + type of 'int (* client_monitors_config)(QXLI= nstance*, VDAgentMonitorsConfig*)' changed: in pointed to type 'function type int (QXL= Instance*, VDAgentMonitorsConfig*)': parameter 1 of type 'QXLInstance*' has s= ub-type changes: in pointed to type 'typedef QXLInstanc= e' at spice-qxl.h:34:1: @@ -128,8 +128,8 @@ underlying type 'struct SpiceCoreInt= erface' at spice.h:82:1 changed: type size hasn't changed 3 data member changes: - type of 'SpiceWatch* (int, int, = typedef SpiceWatchFunc, void*)* watch_add' changed: - in pointed to type 'function t= ype SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)': + type of 'SpiceWatch* (* watch_ad= d)(int, int, SpiceWatchFunc, void*)' changed: + in pointed to type 'function t= ype SpiceWatch* (int, int, SpiceWatchFunc, void*)': return type changed: in pointed to type 'typede= f SpiceWatch' at spice-core.h:68:1: underlying type 'struct = SpiceWatch' at red_worker.c:268:1 changed: @@ -165,7 +165,7 @@ = type size hasn't changed = 10 data member changes: = type of 'channel_configure_socket_proc config_socket' changed: - = underlying type 'int (RedChannelClient*)*' changed: + = underlying type 'int (*)(RedChannelClient*)' changed: = in pointed to type 'function type int (RedChannelClient*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = in pointed to type 'typedef RedChannelClient' at red_ch= annel.h:131:1: @@ -194,9 +194,9 @@ = 5 data member deletions: = 'RedsSASL sasl', at offset 256 (in bits) = at reds.h:78:1 = 'SpiceChannelEventInfo* info', at offset = 1024 (in bits) at reds.h:85:1 - = 'typedef ssize_t (RedsStream*, void*, typ= edef size_t)* read', at offset 1088 (in bits) at reds.h:88:1 - = 'typedef ssize_t (RedsStream*, void*, typ= edef size_t)* write', at offset 1152 (in bits) at reds.h:89:1 - = 'typedef ssize_t (RedsStream*, const iove= c*, int)* writev', at offset 1216 (in bits) at reds.h:90:1 + = 'ssize_t (* read)(RedsStream*, void*, siz= e_t)', at offset 1088 (in bits) at reds.h:88:1 + = 'ssize_t (* write)(RedsStream*, void*, si= ze_t)', at offset 1152 (in bits) at reds.h:89:1 + = 'ssize_t (* writev)(RedsStream*, const io= vec*, int)', at offset 1216 (in bits) at reds.h:90:1 = 2 data member changes: = type of 'SSL* ssl' changed: = in pointed to type 'typedef SSL' at red= s_stream.h:32:1: @@ -213,7 +213,7 @@ = 'BIO* bbio', at offset 256 (in bi= ts) at ssl.h:1082:1 = 'int rwstate', at offset 320 (in = bits) at ssl.h:1093:1 = 'int in_handshake', at offset 352= (in bits) at ssl.h:1096:1 - = 'int (SSL*)* handshake_func', at = offset 384 (in bits) at ssl.h:1097:1 + = 'int (* handshake_func)(SSL*)', a= t offset 384 (in bits) at ssl.h:1097:1 = 'int server', at offset 448 (in b= its) at ssl.h:1107:1 = 'int new_session', at offset 480 = (in bits) at ssl.h:1109:1 = 'int quiet_shutdown', at offset 5= 12 (in bits) at ssl.h:1113:1 @@ -230,7 +230,7 @@ = 'ssl3_state_st* s3', at offset 10= 24 (in bits) at ssl.h:1129:1 = 'dtls1_state_st* d1', at offset 1= 088 (in bits) at ssl.h:1130:1 = 'int read_ahead', at offset 1152 = (in bits) at ssl.h:1132:1 - = 'void (int, int, int, void*, type= def size_t, SSL*, void*)* msg_callback', at offset 1216 (in bits) at ssl.h:= 1136:1 + = 'void (* msg_callback)(int, int, = int, void*, size_t, SSL*, void*)', at offset 1216 (in bits) at ssl.h:1136:1 = 'void* msg_callback_arg', at offs= et 1280 (in bits) at ssl.h:1137:1 = 'int hit', at offset 1344 (in bit= s) at ssl.h:1139:1 = 'X509_VERIFY_PARAM* param', at of= fset 1408 (in bits) at ssl.h:1141:1 @@ -249,13 +249,13 @@ = 'SSL_SESSION* session', at offset= 2432 (in bits) at ssl.h:1183:1 = 'GEN_SESSION_CB generate_session_= id', at offset 2496 (in bits) at ssl.h:1186:1 = 'int verify_mode', at offset 2560= (in bits) at ssl.h:1189:1 - = 'int (int, X509_STORE_CTX*)* veri= fy_callback', at offset 2624 (in bits) at ssl.h:1191:1 - = 'void (const SSL*, int, int)* inf= o_callback', at offset 2688 (in bits) at ssl.h:1193:1 + = 'int (* verify_callback)(int, X50= 9_STORE_CTX*)', at offset 2624 (in bits) at ssl.h:1191:1 + = 'void (* info_callback)(const SSL= *, int, int)', at offset 2688 (in bits) at ssl.h:1193:1 = 'int error', at offset 2752 (in b= its) at ssl.h:1195:1 = 'int error_code', at offset 2784 = (in bits) at ssl.h:1196:1 = 'KSSL_CTX* kssl_ctx', at offset 2= 816 (in bits) at ssl.h:1199:1 - = 'unsigned int (SSL*, const char*,= char*, unsigned int, unsigned char*, unsigned int)* psk_client_callback', = at offset 2880 (in bits) at ssl.h:1203:1 - = 'unsigned int (SSL*, const char*,= unsigned char*, unsigned int)* psk_server_callback', at offset 2944 (in bi= ts) at ssl.h:1206:1 + = 'unsigned int (* psk_client_callb= ack)(SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)'= , at offset 2880 (in bits) at ssl.h:1203:1 + = 'unsigned int (* psk_server_callb= ack)(SSL*, const char*, unsigned char*, unsigned int)', at offset 2944 (in = bits) at ssl.h:1206:1 = 'SSL_CTX* ctx', at offset 3008 (i= n bits) at ssl.h:1210:1 = 'int debug', at offset 3072 (in b= its) at ssl.h:1213:1 = 'long int verify_result', at offs= et 3136 (in bits) at ssl.h:1216:1 @@ -268,7 +268,7 @@ = 'int first_packet', at offset 364= 8 (in bits) at ssl.h:1226:1 = 'int client_version', at offset 3= 680 (in bits) at ssl.h:1227:1 = 'unsigned int max_send_fragment',= at offset 3712 (in bits) at ssl.h:1229:1 - = 'void (SSL*, int, int, unsigned c= har*, int, void*)* tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232= :1 + = 'void (* tlsext_debug_cb)(SSL*, i= nt, int, unsigned char*, int, void*)', at offset 3776 (in bits) at ssl.h:12= 32:1 = 'void* tlsext_debug_arg', at offs= et 3840 (in bits) at ssl.h:1235:1 = 'char* tlsext_hostname', at offse= t 3904 (in bits) at ssl.h:1236:1 = 'int servername_done', at offset = 3968 (in bits) at ssl.h:1237:1 @@ -304,48 +304,48 @@ = in pointed to type 'typedef SpiceWatch'= at spice-core.h:68:1: = underlying type 'struct SpiceWatch' c= hanged, as being reported = type of 'channel_disconnect_proc on_disconnect' changed: - = underlying type 'void (RedChannelClient*)*' changed: + = underlying type 'void (*)(RedChannelClient*)' changed: = in pointed to type 'function type void (RedChannelClient*)'= : = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_send_pipe_item_proc send_item' changed: - = underlying type 'void (RedChannelClient*, PipeItem*)*' change= d: + = underlying type 'void (*)(RedChannelClient*, PipeItem*)' chan= ged: = in pointed to type 'function type void (RedChannelClient*, = PipeItem*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_hold_pipe_item_proc hold_item' changed: - = underlying type 'void (RedChannelClient*, PipeItem*)*' change= d: + = underlying type 'void (*)(RedChannelClient*, PipeItem*)' chan= ged: = in pointed to type 'function type void (RedChannelClient*, = PipeItem*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_release_pipe_item_proc release_item' changed: - = underlying type 'void (RedChannelClient*, PipeItem*, int)*' c= hanged: + = underlying type 'void (*)(RedChannelClient*, PipeItem*, int)'= changed: = in pointed to type 'function type void (RedChannelClient*, = PipeItem*, int)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_alloc_msg_recv_buf_proc alloc_recv_buf' change= d: - = underlying type 'uint8_t* (RedChannelClient*, typedef uint16_= t, typedef uint32_t)*' changed: - = in pointed to type 'function type uint8_t* (RedChannelClien= t*, typedef uint16_t, typedef uint32_t)': + = underlying type 'uint8_t* (*)(RedChannelClient*, uint16_t, ui= nt32_t)' changed: + = in pointed to type 'function type uint8_t* (RedChannelClien= t*, uint16_t, uint32_t)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_release_msg_recv_buf_proc release_recv_buf' ch= anged: - = underlying type 'void (RedChannelClient*, typedef uint16_t, t= ypedef uint32_t, uint8_t*)*' changed: - = in pointed to type 'function type void (RedChannelClient*, = typedef uint16_t, typedef uint32_t, uint8_t*)': + = underlying type 'void (*)(RedChannelClient*, uint16_t, uint32= _t, uint8_t*)' changed: + = in pointed to type 'function type void (RedChannelClient*, = uint16_t, uint32_t, uint8_t*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_handle_migrate_flush_mark_proc handle_migrate_= flush_mark' changed: - = underlying type 'int (RedChannelClient*)*' changed: + = underlying type 'int (*)(RedChannelClient*)' changed: = in pointed to type 'function type int (RedChannelClient*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_handle_migrate_data_proc handle_migrate_data' = changed: - = underlying type 'int (RedChannelClient*, typedef uint32_t, vo= id*)*' changed: - = in pointed to type 'function type int (RedChannelClient*, t= ypedef uint32_t, void*)': + = underlying type 'int (*)(RedChannelClient*, uint32_t, void*)'= changed: + = in pointed to type 'function type int (RedChannelClient*, u= int32_t, void*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_handle_migrate_data_get_serial_proc handle_mig= rate_data_get_serial' changed: - = underlying type 'typedef uint64_t (RedChannelClient*, typedef= uint32_t, void*)*' changed: - = in pointed to type 'function type typedef uint64_t (RedChan= nelClient*, typedef uint32_t, void*)': + = underlying type 'uint64_t (*)(RedChannelClient*, uint32_t, vo= id*)' changed: + = in pointed to type 'function type typedef uint64_t (RedChan= nelClient*, uint32_t, void*)': = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'ClientCbs client_cbs' changed: @@ -353,7 +353,7 @@ = type size hasn't changed = 3 data member changes: = type of 'channel_client_connect_proc connect' changed: - = underlying type 'void (RedChannel*, RedClient*, RedsStream*, = int, int, uint32_t*, int, uint32_t*)*' changed: + = underlying type 'void (*)(RedChannel*, RedClient*, RedsStream= *, int, int, uint32_t*, int, uint32_t*)' changed: = in pointed to type 'function type void (RedChannel*, RedCli= ent*, RedsStream*, int, int, uint32_t*, int, uint32_t*)': = parameter 1 of type 'RedChannel*' has sub-type changes: = in pointed to type 'typedef RedChannel' at red_channel.= h:130:1: @@ -363,12 +363,12 @@ = parameter 3 of type 'RedsStream*' has sub-type changes: = pointed to type 'typedef RedsStream' changed at red_cha= nnel.h:134:1, as reported earlier = type of 'channel_client_disconnect_proc disconnect' changed: - = underlying type 'void (RedChannelClient*)*' changed: + = underlying type 'void (*)(RedChannelClient*)' changed: = in pointed to type 'function type void (RedChannelClient*)'= : = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier = type of 'channel_client_migrate_proc migrate' changed: - = underlying type 'void (RedChannelClient*)*' changed: + = underlying type 'void (*)(RedChannelClient*)' changed: = in pointed to type 'function type void (RedChannelClient*)'= : = parameter 1 of type 'RedChannelClient*' has sub-type chan= ges: = pointed to type 'typedef RedChannelClient' changed at r= ed_channel.h:136:1, as reported earlier @@ -575,11 +575,11 @@ 'uint64_t* com= mand_counter' offset changed from 15520064 to 14876800 (in bits) (by -64326= 4 bits) 'int driver_ca= p_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -= 643264 bits) 'int set_clien= t_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) = (by -643264 bits) - type of 'void (SpiceWatch*, int)= * watch_update_mask' changed: + type of 'void (* watch_update_ma= sk)(SpiceWatch*, int)' changed: in pointed to type 'function t= ype void (SpiceWatch*, int)': parameter 1 of type 'SpiceWa= tch*' has sub-type changes: pointed to type 'typedef S= piceWatch' changed at spice.h:61:1, as reported earlier - type of 'void (SpiceWatch*)* wat= ch_remove' changed: + type of 'void (* watch_remove)(S= piceWatch*)' changed: in pointed to type 'function t= ype void (SpiceWatch*)': parameter 1 of type 'SpiceWa= tch*' has sub-type changes: pointed to type 'typedef S= piceWatch' changed at spice.h:61:1, as reported earlier @@ -744,19 +744,19 @@ underlying type 'struct SpiceCharDeviceCallb= acks' at char_device.h:81:1 changed: type size hasn't changed 4 data member changes: - type of 'SpiceCharDeviceMsgToClient* (Sp= iceCharDeviceInstance*, void*)* read_one_msg_from_device' changed: + type of 'SpiceCharDeviceMsgToClient* (* = read_one_msg_from_device)(SpiceCharDeviceInstance*, void*)' changed: in pointed to type 'function type Spic= eCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)': parameter 1 of type 'SpiceCharDevice= Instance*' has sub-type changes: pointed to type 'typedef SpiceChar= DeviceInstance' changed at spice.h:399:1, as reported earlier - type of 'void (SpiceCharDeviceMsgToClien= t*, RedClient*, void*)* send_msg_to_client' changed: + type of 'void (* send_msg_to_client)(Spi= ceCharDeviceMsgToClient*, RedClient*, void*)' changed: in pointed to type 'function type void= (SpiceCharDeviceMsgToClient*, RedClient*, void*)': parameter 2 of type 'RedClient*' has= sub-type changes: pointed to type 'typedef RedClient= ' changed at red_channel.h:137:1, as reported earlier - type of 'void (RedClient*, typedef uint3= 2_t, void*)* send_tokens_to_client' changed: - in pointed to type 'function type void= (RedClient*, typedef uint32_t, void*)': + type of 'void (* send_tokens_to_client)(= RedClient*, uint32_t, void*)' changed: + in pointed to type 'function type void= (RedClient*, uint32_t, void*)': parameter 1 of type 'RedClient*' has= sub-type changes: pointed to type 'typedef RedClient= ' changed at red_channel.h:137:1, as reported earlier - type of 'void (RedClient*, void*)* remov= e_client' changed: + type of 'void (* remove_client)(RedClien= t*, void*)' changed: in pointed to type 'function type void= (RedClient*, void*)': parameter 1 of type 'RedClient*' has= sub-type changes: pointed to type 'typedef RedClient= ' changed at red_channel.h:137:1, as reported earlier @@ -846,7 +846,7 @@ parameter 1 of type 'SpiceServer*' has sub-type changes: pointed to type 'typedef SpiceServer' changed at spice.h:440:1, as= reported earlier =20 - [C] 'function SpiceServer* spice_server_new()' at reds.c:4089:1 has so= me indirect sub-type changes: + [C] 'function SpiceServer* spice_server_new(void)' at reds.c:4089:1 ha= s some indirect sub-type changes: return type changed: pointed to type 'typedef SpiceServer' changed at spice.h:440:1, as= reported earlier =20 @@ -881,19 +881,19 @@ type of 'RedChannelClient* channel_clien= t' changed: pointed to type 'typedef RedChannelCli= ent' changed at red_channel.h:136:1, as reported earlier type of 'snd_channel_handle_message_proc= handle_message' changed: - underlying type 'int (SndChannel*, typ= edef size_t, typedef uint32_t, void*)*' changed: - in pointed to type 'function type in= t (SndChannel*, typedef size_t, typedef uint32_t, void*)': + underlying type 'int (*)(SndChannel*, = size_t, uint32_t, void*)' changed: + in pointed to type 'function type in= t (SndChannel*, size_t, uint32_t, void*)': parameter 1 of type 'SndChannel*' = has sub-type changes: in pointed to type 'typedef SndC= hannel' at snd_worker.c:74:1: underlying type 'struct SndCha= nnel' changed, as being reported type of 'snd_channel_on_message_done_pro= c on_message_done' changed: - underlying type 'void (SndChannel*)*' = changed: + underlying type 'void (*)(SndChannel*)= ' changed: in pointed to type 'function type vo= id (SndChannel*)': parameter 1 of type 'SndChannel*' = has sub-type changes: in pointed to type 'typedef SndC= hannel' at snd_worker.c:74:1: underlying type 'struct SndCha= nnel' changed, as being reported type of 'snd_channel_cleanup_channel_pro= c cleanup' changed: - underlying type 'void (SndChannel*)*' = changed: + underlying type 'void (*)(SndChannel*)= ' changed: in pointed to type 'function type vo= id (SndChannel*)': parameter 1 of type 'SndChannel*' = has sub-type changes: in pointed to type 'typedef SndC= hannel' at snd_worker.c:74:1: diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.1= 2.8-1.el7.x86_64-report-3.txt b/tests/data/test-diff-pkg/spice-server-0.12.= 4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt index 2afe14f8..2d2cbb93 100644 --- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.e= l7.x86_64-report-3.txt +++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.e= l7.x86_64-report-3.txt @@ -83,7 +83,7 @@ Leaf changes summary: 10 artifacts changed (13 filtered o= ut) function int spice_server_migrate_info(SpiceServer*, const char*, in= t, int, const char*) function int spice_server_migrate_start(SpiceServer*) function int spice_server_migrate_switch(SpiceServer*) - function SpiceServer* spice_server_new() + function SpiceServer* spice_server_new(void) function void spice_server_playback_get_buffer(SpicePlaybackInstance= *, uint32_t**, uint32_t*) function void spice_server_playback_put_samples(SpicePlaybackInstanc= e*, uint32_t*) function void spice_server_playback_set_mute(SpicePlaybackInstance*,= uint8_t) diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4= .3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9= .20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt index 28cf8588..f6cf99e5 100644 --- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20= 141204.fc23.x86_64-report-0.txt +++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20= 141204.fc23.x86_64-report-0.txt @@ -6,7 +6,7 @@ =20 17 Added functions: =20 - [A] 'method int tbb::interface7::internal::task_arena_base::internal_c= urrent_slot()' {_ZN3tbb10interface78internal15task_arena_base21internal_= current_slotEv} + [A] 'method int tbb::interface7::internal::task_arena_base::internal_c= urrent_slot(void)' {_ZN3tbb10interface78internal15task_arena_base21inter= nal_current_slotEv} [A] 'method void tbb::interface7::internal::task_arena_base::internal_= enqueue(tbb::task&, intptr_t) const' {_ZNK3tbb10interface78internal15tas= k_arena_base16internal_enqueueERNS_4taskEl} [A] 'method void tbb::interface7::internal::task_arena_base::internal_= execute(tbb::interface7::internal::delegate_base&) const' {_ZNK3tbb10int= erface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE} [A] 'method void tbb::interface7::internal::task_arena_base::internal_= initialize()' {_ZN3tbb10interface78internal15task_arena_base19internal_i= nitializeEv} @@ -32,7 +32,7 @@ type size hasn't changed no member function changes (4 filtered); 1 data member changes (4 filtered): - type of 'tbb::internal::input_buffer* my_input_buffer' changed= : + type of 'input_buffer* my_input_buffer' changed: in pointed to type 'class tbb::internal::input_buffer' at pi= peline.cpp:52:1: type size hasn't changed 1 data member change: @@ -47,7 +47,7 @@ in unqualified underlying type 'class tbb::internal::allocate_ro= ot_with_context_proxy' at task.h:131:1: type size hasn't changed 1 data member change: - type of 'tbb::task_group_context& my_context' changed: + type of 'task_group_context& my_context' changed: in referenced type 'class tbb::task_group_context' at task= .h:302:1: type size hasn't changed 1 data member insertion: @@ -57,7 +57,7 @@ type name changed from 'char[80]' to 'char[72]' array type size changed from 640 to 576 array type subrange 1 changed length from 80 to 72 - type of 'tbb::internal::generic_scheduler* my_owner' c= hanged: + type of 'generic_scheduler* my_owner' changed: in pointed to type 'class tbb::internal::generic_sch= eduler' at scheduler.h:110:1: type size changed from 3136 to 3072 (in bits) 1 base class change: @@ -67,7 +67,7 @@ 'volatile intptr_t* my_ref_top_priority', at= offset 576 (in bits) at scheduler.h:96:1 'volatile uintptr_t* my_ref_reload_epoch', a= t offset 640 (in bits) at scheduler.h:99:1 3 data member changes (2 filtered): - type of 'tbb::internal::arena_slot* my_arena= _slot' changed: + type of 'arena_slot* my_arena_slot' changed: in pointed to type 'struct tbb::internal::= arena_slot' at scheduler_common.h:316:1: type size hasn't changed 2 base class deletions: @@ -76,7 +76,7 @@ 2 base class insertions: struct tbb::internal::padded at tbb_stddef.h:251:1 struct tbb::internal::padded at tbb_stddef.h:251:1 - type of 'tbb::internal::arena* my_arena' cha= nged: + type of 'arena* my_arena' changed: in pointed to type 'class tbb::internal::a= rena' at arena.h:160:1: type size hasn't changed 1 base class deletion: @@ -87,7 +87,7 @@ type of 'tbb::internal::mail_inbox my_inbox'= changed: type size hasn't changed 1 data member change: - type of 'tbb::internal::mail_outbox* my_= putter' changed: + type of 'mail_outbox* my_putter' changed= : in pointed to type 'class tbb::interna= l::mail_outbox' at mailbox.h:103:1: type size hasn't changed 1 base class deletion: @@ -107,7 +107,7 @@ 'volatile uintptr_t* my_ref_reload_epoch', at of= fset 2752 (in bits) at scheduler.h:443:1 18 data member changes: 'uintptr_t my_stealing_threshold' offset changed= from 704 to 832 (in bits) (by +128 bits) - type of 'tbb::internal::market* my_market' chang= ed: + type of 'market* my_market' changed: in pointed to type 'class tbb::internal::marke= t' at market.h:49:1: type size changed from 1664 to 1728 (in bits= ) no member function changes (8 filtered); @@ -134,7 +134,7 @@ 'intptr_t my_global_top_priority' offset c= hanged from 384 to 448 (in bits) (by +64 bits) 'intptr_t my_global_bottom_priority' offse= t changed from 448 to 512 (in bits) (by +64 bits) 'uintptr_t my_global_reload_epoch' offset = changed from 512 to 576 (in bits) (by +64 bits) - type of 'tbb::internal::market::priority_l= evel_info my_priority_levels[3]' changed: + type of 'priority_level_info my_priority_l= evels[3]' changed: array element type 'struct tbb::internal= ::market::priority_level_info' changed: type size hasn't changed 1 data member change: @@ -144,15 +144,15 @@ type size hasn't changed and offset changed from 576 to 640 (in bit= s) (by +64 bits) 'uintptr_t my_arenas_aba_epoch' offset cha= nged from 1536 to 1600 (in bits) (by +64 bits) - 'tbb::internal::generic_scheduler* my_work= ers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits) + 'generic_scheduler* my_workers[1]' offset = changed from 1600 to 1664 (in bits) (by +64 bits) and offset changed from 768 to 896 (in bits) (by= +128 bits) 'tbb::internal::FastRandom my_random' offset cha= nged from 832 to 960 (in bits) (by +128 bits) - 'tbb::task* my_free_list' offset changed from 96= 0 to 1024 (in bits) (by +64 bits) - 'tbb::task* my_dummy_task' offset changed from 1= 024 to 1088 (in bits) (by +64 bits) + 'task* my_free_list' offset changed from 960 to = 1024 (in bits) (by +64 bits) + 'task* my_dummy_task' offset changed from 1024 t= o 1088 (in bits) (by +64 bits) 'long int my_ref_count' offset changed from 1088= to 1152 (in bits) (by +64 bits) 'bool my_auto_initialized' offset changed from 1= 152 to 1216 (in bits) (by +64 bits) 'intptr_t my_small_task_count' offset changed fr= om 1216 to 1280 (in bits) (by +64 bits) - 'tbb::task* my_return_list' offset changed from = 1280 to 1344 (in bits) (by +64 bits) + 'task* my_return_list' offset changed from 1280 = to 1344 (in bits) (by +64 bits) 'char _padding1[112]' offset changed from 1344 t= o 1408 (in bits) (by +64 bits) 'tbb::internal::context_list_node_t my_context_l= ist_head' offset changed from 2240 to 2304 (in bits) (by +64 bits) 'tbb::spin_mutex my_context_list_mutex' offset c= hanged from 2368 to 2432 (in bits) (by +64 bits) @@ -169,7 +169,7 @@ type size hasn't changed no member function changes (7 filtered); 1 data member change: - type of 'tbb::internal::concurrent_queue_rep* my_rep' changed: + type of 'concurrent_queue_rep* my_rep' changed: in pointed to type 'class tbb::internal::concurrent_queue_re= p' at concurrent_queue.cpp:129:1: type size hasn't changed 1 data member changes (2 filtered): @@ -258,8 +258,8 @@ [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**,= size_t, size_t)' {__TBB_internal_posix_memalign} [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_= t)' {__TBB_internal_realloc} [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size= _t, void*)' {safer_scalable_aligned_realloc} - [D] 'function void safer_scalable_free(void*, void (void*)*)' {safe= r_scalable_free} - [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*= )*)' {safer_scalable_msize} + [D] 'function void safer_scalable_free(void*, void (*)(void*))' {sa= fer_scalable_free} + [D] 'function size_t safer_scalable_msize(void*, size_t (*)(void*))' = {safer_scalable_msize} [D] 'function void* safer_scalable_realloc(void*, size_t, void*)' {= safer_scalable_realloc} =20 27 Added function symbols not referenced by debug info: diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4= .3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9= .20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt index 675d766d..c159479e 100644 --- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20= 141204.fc23.x86_64-report-1.txt +++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20= 141204.fc23.x86_64-report-1.txt @@ -6,7 +6,7 @@ =20 17 Added functions: =20 - [A] 'method int tbb::interface7::internal::task_arena_base::internal_c= urrent_slot()' {_ZN3tbb10interface78internal15task_arena_base21internal_= current_slotEv} + [A] 'method int tbb::interface7::internal::task_arena_base::internal_c= urrent_slot(void)' {_ZN3tbb10interface78internal15task_arena_base21inter= nal_current_slotEv} [A] 'method void tbb::interface7::internal::task_arena_base::internal_= enqueue(tbb::task&, intptr_t) const' {_ZNK3tbb10interface78internal15tas= k_arena_base16internal_enqueueERNS_4taskEl} [A] 'method void tbb::interface7::internal::task_arena_base::internal_= execute(tbb::interface7::internal::delegate_base&) const' {_ZNK3tbb10int= erface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE} [A] 'method void tbb::interface7::internal::task_arena_base::internal_= initialize()' {_ZN3tbb10interface78internal15task_arena_base19internal_i= nitializeEv} @@ -32,7 +32,7 @@ in unqualified underlying type 'class tbb::internal::allocate_ro= ot_with_context_proxy' at task.h:131:1: type size hasn't changed 1 data member change: - type of 'tbb::task_group_context& my_context' changed: + type of 'task_group_context& my_context' changed: in referenced type 'class tbb::task_group_context' at task= .h:302:1: type size hasn't changed 1 data member insertion: @@ -116,8 +116,8 @@ [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**,= size_t, size_t)' {__TBB_internal_posix_memalign} [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_= t)' {__TBB_internal_realloc} [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size= _t, void*)' {safer_scalable_aligned_realloc} - [D] 'function void safer_scalable_free(void*, void (void*)*)' {safe= r_scalable_free} - [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*= )*)' {safer_scalable_msize} + [D] 'function void safer_scalable_free(void*, void (*)(void*))' {sa= fer_scalable_free} + [D] 'function size_t safer_scalable_msize(void*, size_t (*)(void*))' = {safer_scalable_msize} [D] 'function void* safer_scalable_realloc(void*, size_t, void*)' {= safer_scalable_realloc} =20 27 Added function symbols not referenced by debug info: diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt b/tes= ts/data/test-diff-suppr/test0-type-suppr-report-0.txt index 35b2c40a..3fb29aff 100644 --- a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt +++ b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt @@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable in pointed to type 'struct MyType': type size hasn't changed 1 data member change: - type of 'MyType::Private* priv' changed: + type of 'Private* priv' changed: in pointed to type 'struct MyType::Private': type size changed from 32 to 64 (in bits) 1 data member insertion: diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt b/tes= ts/data/test-diff-suppr/test0-type-suppr-report-3.txt index 35b2c40a..3fb29aff 100644 --- a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt +++ b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt @@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable in pointed to type 'struct MyType': type size hasn't changed 1 data member change: - type of 'MyType::Private* priv' changed: + type of 'Private* priv' changed: in pointed to type 'struct MyType::Private': type size changed from 32 to 64 (in bits) 1 data member insertion: diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt b/tes= ts/data/test-diff-suppr/test0-type-suppr-report-5.txt index 35b2c40a..3fb29aff 100644 --- a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt +++ b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt @@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable in pointed to type 'struct MyType': type size hasn't changed 1 data member change: - type of 'MyType::Private* priv' changed: + type of 'Private* priv' changed: in pointed to type 'struct MyType::Private': type size changed from 32 to 64 (in bits) 1 data member insertion: diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt b/tes= ts/data/test-diff-suppr/test0-type-suppr-report-7.txt index 35b2c40a..3fb29aff 100644 --- a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt +++ b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt @@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable in pointed to type 'struct MyType': type size hasn't changed 1 data member change: - type of 'MyType::Private* priv' changed: + type of 'Private* priv' changed: in pointed to type 'struct MyType::Private': type size changed from 32 to 64 (in bits) 1 data member insertion: diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt = b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt index 3f9c6fc7..8449e480 100644 --- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt +++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {_Z3barv} + [A] 'function void bar(void)' {_Z3barv} =20 1 function with some indirect sub-type change: =20 diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt = b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt index 0ab050b2..771dc639 100644 --- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt +++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {_Z3barv} + [A] 'function void bar(void)' {_Z3barv} =20 diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt = b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt index 3f9c6fc7..8449e480 100644 --- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt +++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {_Z3barv} + [A] 'function void bar(void)' {_Z3barv} =20 1 function with some indirect sub-type change: =20 diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.tx= t b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt index 59592e3d..4fed710a 100644 --- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt +++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void bar()' {_Z3barv} + [D] 'function void bar(void)' {_Z3barv} =20 1 function with some indirect sub-type change: =20 diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.tx= t b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt index 4d7d51cd..ca83ecdc 100644 --- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt +++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void bar()' {_Z3barv} + [D] 'function void bar(void)' {_Z3barv} =20 diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.tx= t b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt index 59592e3d..4fed710a 100644 --- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt +++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void bar()' {_Z3barv} + [D] 'function void bar(void)' {_Z3barv} =20 1 function with some indirect sub-type change: =20 diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-= 0.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt index ecb6d981..b99e4acf 100644 --- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt +++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {_Z3barv, aliases _Z3bazv} + [A] 'function void bar(void)' {_Z3barv, aliases _Z3bazv} =20 diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-= 3.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt index ecb6d981..b99e4acf 100644 --- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt +++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {_Z3barv, aliases _Z3bazv} + [A] 'function void bar(void)' {_Z3barv, aliases _Z3bazv} =20 diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-= 4.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt index ecb6d981..b99e4acf 100644 --- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt +++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {_Z3barv, aliases _Z3bazv} + [A] 'function void bar(void)' {_Z3barv, aliases _Z3bazv} =20 diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-= 0.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt index 853dd162..05b0c79d 100644 --- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt +++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {bar, aliases baz} + [A] 'function void bar(void)' {bar, aliases baz} =20 diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-= 1.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt index 853dd162..05b0c79d 100644 --- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt +++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {bar, aliases baz} + [A] 'function void bar(void)' {bar, aliases baz} =20 diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-= 2.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt index 853dd162..05b0c79d 100644 --- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt +++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {bar, aliases baz} + [A] 'function void bar(void)' {bar, aliases baz} =20 diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-= 4.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt index 853dd162..05b0c79d 100644 --- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt +++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {bar, aliases baz} + [A] 'function void bar(void)' {bar, aliases baz} =20 diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-= 5.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt index 853dd162..05b0c79d 100644 --- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt +++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt @@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 Added function: =20 - [A] 'function void bar()' {bar, aliases baz} + [A] 'function void bar(void)' {bar, aliases baz} =20 diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/te= st-diff-suppr/test30-report-0.txt index e273d013..dff96302 100644 --- a/tests/data/test-diff-suppr/test30-report-0.txt +++ b/tests/data/test-diff-suppr/test30-report-0.txt @@ -22,7 +22,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable in pointed to type 'class S' at test30-pub-lib-v1.h:1:1: type size hasn't changed 1 data member change: - type of 'S::priv_type* priv' changed: + type of 'priv_type* priv' changed: in pointed to type 'class S::priv_type' at test30-pub-lib-v1.c= c:14:1: type size changed from 64 to 128 (in bits) 1 data member insertion: diff --git a/tests/data/test-diff-suppr/test32-report-0.txt b/tests/data/te= st-diff-suppr/test32-report-0.txt index 2489b56d..c1adfb95 100644 --- a/tests/data/test-diff-suppr/test32-report-0.txt +++ b/tests/data/test-diff-suppr/test32-report-0.txt @@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added = variable =20 2 functions with some indirect sub-type change: =20 - [C] 'function void priv::foo()' has some indirect sub-type changes: + [C] 'function void priv::foo(void)' has some indirect sub-type changes: return type changed: type name changed from 'void' to 'int' type size changed from 0 to 32 (in bits) =20 - [C] 'function void pub::bar()' has some indirect sub-type changes: + [C] 'function void pub::bar(void)' has some indirect sub-type changes: return type changed: type name changed from 'void' to 'char' type size changed from 0 to 8 (in bits) diff --git a/tests/data/test-diff-suppr/test32-report-1.txt b/tests/data/te= st-diff-suppr/test32-report-1.txt index cffdf3a5..e416a088 100644 --- a/tests/data/test-diff-suppr/test32-report-1.txt +++ b/tests/data/test-diff-suppr/test32-report-1.txt @@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added va= riable =20 1 function with some indirect sub-type change: =20 - [C] 'function void pub::bar()' has some indirect sub-type changes: + [C] 'function void pub::bar(void)' has some indirect sub-type changes: return type changed: type name changed from 'void' to 'char' type size changed from 0 to 8 (in bits) diff --git a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-re= port-1.txt b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-re= port-1.txt index 1b49d600..6dc832ac 100644 --- a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.= txt +++ b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.= txt @@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added va= riable =20 1 Removed function: =20 - [D] 'function void test2()' {test2} + [D] 'function void test2(void)' {test2} =20 1 Removed variable: =20 diff --git a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte= 291-0.39.90-1.fc22.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/vte2= 91-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt index 8e6fdd4e..de2c4e6b 100644 --- a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.3= 9.90-1.fc22.x86_64-report-0.txt +++ b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.3= 9.90-1.fc22.x86_64-report-0.txt @@ -6,7 +6,7 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.= x86_64.rpm and vte291 =20 3 Added functions: =20 - [A] 'function const char* vte_get_features()' {vte_get_features} + [A] 'function const char* vte_get_features(void)' {vte_get_features= } [A] 'function const char* vte_terminal_get_word_char_exceptions(VteTer= minal*)' {vte_terminal_get_word_char_exceptions} [A] 'function void vte_terminal_set_word_char_exceptions(VteTerminal*,= const char*)' {vte_terminal_set_word_char_exceptions} =20 diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ct= f/test9.o.abi index 7f1e861b..a1def56f 100644 --- a/tests/data/test-read-ctf/test9.o.abi +++ b/tests/data/test-read-ctf/test9.o.abi @@ -16,11 +16,11 @@ - - + + - - + + @@ -36,7 +36,7 @@ - + @@ -45,8 +45,8 @@ - - + + diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data= /test-read-dwarf/PR22122-libftdc.so.abi index 501658df..678c67f0 100644 --- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi +++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi @@ -335,22 +335,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -412,7 +412,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -440,104 +440,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -546,99 +546,99 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -809,7 +809,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -887,7 +887,7 @@ - + @@ -911,7 +911,7 @@ - + @@ -923,14 +923,14 @@ - + - + @@ -948,13 +948,13 @@ - + - + @@ -966,14 +966,14 @@ - + - + @@ -986,32 +986,32 @@ - + - + - + - + - + @@ -1019,7 +1019,7 @@ - + @@ -1028,34 +1028,34 @@ - + - + - + - + - + @@ -1064,7 +1064,7 @@ - + @@ -1073,7 +1073,7 @@ - + @@ -1081,14 +1081,14 @@ - + - + @@ -1111,14 +1111,14 @@ - + - + @@ -1127,7 +1127,7 @@ - + @@ -1136,7 +1136,7 @@ - + @@ -1152,21 +1152,21 @@ - + - + - + @@ -1182,19 +1182,19 @@ - + - + - + @@ -1202,19 +1202,19 @@ - + - + - + @@ -1222,26 +1222,26 @@ - + - + - + - + @@ -1250,7 +1250,7 @@ - + @@ -1265,7 +1265,7 @@ - + @@ -1275,7 +1275,7 @@ - + @@ -1295,49 +1295,49 @@ - + - + - + - + - + - + - + - + @@ -1485,7 +1485,7 @@ - + @@ -1554,13 +1554,13 @@ - + - + @@ -1574,7 +1574,7 @@ - + @@ -1597,18 +1597,18 @@ - + - + - + @@ -1679,7 +1679,7 @@ - + @@ -2111,13 +2111,13 @@ - + - + @@ -2131,21 +2131,21 @@ - + - + - + @@ -2213,19 +2213,19 @@ - + - + - + @@ -2248,18 +2248,18 @@ - + - + - + @@ -2467,7 +2467,7 @@ - + @@ -2485,7 +2485,7 @@ - + @@ -2814,19 +2814,19 @@ - + - + - + @@ -2942,7 +2942,7 @@ - + @@ -3412,7 +3412,7 @@ - + @@ -3734,7 +3734,7 @@ - + @@ -4545,7 +4545,7 @@ - + @@ -4599,7 +4599,7 @@ - + @@ -5002,7 +5002,7 @@ - + @@ -5860,7 +5860,7 @@ - + @@ -5906,7 +5906,7 @@ - + @@ -7224,7 +7224,7 @@ - + @@ -8392,14 +8392,14 @@ - + - + @@ -8489,7 +8489,7 @@ - + @@ -8497,14 +8497,14 @@ - + - + @@ -8512,7 +8512,7 @@ - + @@ -9047,7 +9047,7 @@ - + @@ -9129,7 +9129,7 @@ - + @@ -9964,7 +9964,7 @@ - + @@ -12080,9 +12080,9 @@ - + - + @@ -12409,7 +12409,7 @@ - + @@ -12417,7 +12417,7 @@ - + @@ -13479,7 +13479,7 @@ - + @@ -13539,7 +13539,7 @@ - + @@ -14242,7 +14242,7 @@ - + @@ -14829,7 +14829,7 @@ - + @@ -14851,7 +14851,7 @@ - + @@ -15399,7 +15399,7 @@ - + @@ -15474,7 +15474,7 @@ - + @@ -15482,7 +15482,7 @@ - + @@ -15490,7 +15490,7 @@ - + @@ -15498,14 +15498,14 @@ - + - + @@ -16712,7 +16712,7 @@ - + @@ -16850,7 +16850,7 @@ - + diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/t= est-read-dwarf/PR25007-sdhci.ko.abi index 494cefea..e9ce423b 100644 --- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi +++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi @@ -9177,161 +9177,169 @@ + + - - - - + + + + - + + + + + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - + + + - - - - - - - - + + + + + + + + - + - + - + - - - - - + + + + + @@ -9340,178 +9348,183 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - + + - - - - + + + + + + - - - - - + + + + + + + - + - + - + - + @@ -9520,98 +9533,84 @@ - + - - - - - - + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + - - - + + + - + - + + + - @@ -9619,13 +9618,13 @@ - - - - - - - + + + + + + + @@ -9667,18 +9666,19 @@ + - - - - - - - - + + + + + + + + @@ -9903,20 +9903,20 @@ - + - + - + - + @@ -9924,34 +9924,34 @@ - + - + - + - + - + - + @@ -9962,18 +9962,18 @@ - + - + - + @@ -9983,23 +9983,23 @@ - + - + - + - + - + @@ -10009,19 +10009,19 @@ - + - + - + - + @@ -10035,7 +10035,7 @@ - + @@ -10044,230 +10044,224 @@ - + - - + + - + - + - + - + - + - + - - - - + - + - + - + - + - + - + + + + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - - - - - - - + - + - + - + - + - + - + - - + + - - - + + + - - + + - + - + - + - + - + @@ -10275,80 +10269,80 @@ - + - + - - + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -10356,21 +10350,21 @@ - + - + - + - + @@ -10379,8 +10373,8 @@ - - + + @@ -10388,11 +10382,11 @@ - - + + - + @@ -10402,7 +10396,7 @@ - + @@ -10412,33 +10406,33 @@ - + - + - + - + - + - + - + - + @@ -10447,7 +10441,7 @@ - + @@ -10456,124 +10450,124 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -10581,7 +10575,7 @@ - + @@ -10589,182 +10583,182 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - + - - + + - - + + - - - + + + - - + + - + - + @@ -10772,137 +10766,131 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - + - + - - - - - - - + - + @@ -10910,7 +10898,7 @@ - + @@ -10918,85 +10906,91 @@ - + - + - + - + - + - + - + - - + + - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -11004,34 +10998,40 @@ - + + + + + + + - + - + - + - + - + - + - + @@ -11040,7 +11040,7 @@ - + @@ -11048,12 +11048,12 @@ - + - + @@ -11061,57 +11061,54 @@ - - + + - + - + - + - + - - + + - - + + - - - + + + - + - - + + - - + + - - + + - - - @@ -11121,8 +11118,8 @@ - - + + @@ -11142,30 +11139,30 @@ - + - + - + - - + + - + - + @@ -11173,14 +11170,14 @@ - + - + @@ -11204,7 +11201,7 @@ - + @@ -11243,11 +11240,11 @@ - + - + @@ -11258,16 +11255,16 @@ - - + + - + - + @@ -11287,7 +11284,7 @@ - + @@ -11320,8 +11317,8 @@ - - + + @@ -11335,37 +11332,37 @@ - + - + - + - + - + - + - + @@ -11387,7 +11384,7 @@ - + @@ -11395,11 +11392,14 @@ - + + + + @@ -11419,44 +11419,44 @@ - - - - + - + - + - + - + - + - + - + - + - + + + + diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/= test-read-dwarf/test-libaaudio.so.abi index 88bc389d..5033c7c1 100644 --- a/tests/data/test-read-dwarf/test-libaaudio.so.abi +++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi @@ -237,8 +237,8 @@ - - + + @@ -287,6 +287,7 @@ + @@ -318,16 +319,15 @@ - + - - - + + @@ -1504,11 +1504,11 @@ - + - + @@ -1574,14 +1574,14 @@ - + - + @@ -2313,14 +2313,14 @@ - - - + + + diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data= /test-read-dwarf/test-libandroid.so.abi index 32c1a0a4..3b7d5ad6 100644 --- a/tests/data/test-read-dwarf/test-libandroid.so.abi +++ b/tests/data/test-read-dwarf/test-libandroid.so.abi @@ -1465,11 +1465,11 @@ - + - + @@ -1530,14 +1530,14 @@ - + - + @@ -1978,7 +1978,7 @@ - + @@ -3438,691 +3438,691 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4470,7 +4470,7 @@ - + @@ -4490,7 +4490,7 @@ - + @@ -5108,28 +5108,169 @@ - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + @@ -5594,215 +5735,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17626,11 +17626,11 @@ - + - + @@ -17640,18 +17640,18 @@ - + - + - + - + @@ -17659,12 +17659,12 @@ - + - + @@ -17675,12 +17675,12 @@ - + - + @@ -17689,11 +17689,11 @@ - + - + @@ -17703,11 +17703,11 @@ - + - + @@ -17767,11 +17767,11 @@ - + - + @@ -17781,19 +17781,19 @@ - + - + - + - + @@ -17804,12 +17804,12 @@ - + - + @@ -17818,11 +17818,11 @@ - + - + @@ -17832,11 +17832,11 @@ - + - + @@ -17850,11 +17850,11 @@ - + - + @@ -17864,19 +17864,19 @@ - + - + - + - + @@ -17887,12 +17887,12 @@ - + - + @@ -17901,11 +17901,11 @@ - + - + @@ -17915,11 +17915,11 @@ - + - + @@ -17959,25 +17959,25 @@ - + - + - + - + - + - + @@ -18001,25 +18001,25 @@ - + - + - + - + - + - + @@ -18045,28 +18045,28 @@ - + - + - + - + - + - + @@ -18093,28 +18093,28 @@ - + - + - + - + - + - + @@ -18135,25 +18135,25 @@ - + - + - + - + - + - + @@ -18177,25 +18177,25 @@ - + - + - + - + - + - + @@ -18272,11 +18272,11 @@ - + - + @@ -18286,19 +18286,19 @@ - + - + - + - + @@ -18309,12 +18309,12 @@ - + - + @@ -18323,11 +18323,11 @@ - + - + @@ -18337,11 +18337,11 @@ - + - + @@ -18360,11 +18360,11 @@ - + - + @@ -18374,11 +18374,11 @@ - + - + @@ -18387,12 +18387,12 @@ - + - + @@ -18403,12 +18403,12 @@ - + - + @@ -18417,11 +18417,11 @@ - + - + @@ -18431,11 +18431,11 @@ - + - + @@ -18450,11 +18450,11 @@ - + - + @@ -18464,19 +18464,19 @@ - + - + - + - + @@ -18487,12 +18487,12 @@ - + - + @@ -18501,11 +18501,11 @@ - + - + @@ -18515,11 +18515,11 @@ - + - + @@ -18665,11 +18665,11 @@ - + - + @@ -18679,11 +18679,11 @@ - + - + @@ -18783,12 +18783,12 @@ - + - + @@ -18799,12 +18799,12 @@ - + - + @@ -18870,11 +18870,11 @@ - + - + @@ -18884,11 +18884,11 @@ - + - + @@ -18972,8 +18972,8 @@ - - + + @@ -19098,8 +19098,8 @@ - - + + @@ -20277,12 +20277,12 @@ - + - + @@ -20648,7 +20648,7 @@ - + @@ -20657,7 +20657,7 @@ - + @@ -21469,34 +21469,34 @@ - + - + - + - + - + - + - + - + - + - + @@ -21589,10 +21589,10 @@ - + - + @@ -21649,14 +21649,14 @@ - - - - - - - - + + + + + + + + @@ -21881,7 +21881,7 @@ - + @@ -23062,7 +23062,7 @@ - + @@ -23148,12 +23148,12 @@ - - + + - + @@ -23201,10 +23201,10 @@ - + - + @@ -24518,7 +24518,7 @@ - + @@ -26260,8 +26260,8 @@ - - + + @@ -26671,7 +26671,7 @@ - + diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/= test-read-dwarf/test11-pr18828.so.abi index 3905060e..5702c50d 100644 --- a/tests/data/test-read-dwarf/test11-pr18828.so.abi +++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi @@ -1081,154 +1081,153 @@ + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1241,86 +1240,86 @@ - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + @@ -1329,9 +1328,9 @@ - - - + + + @@ -1339,439 +1338,439 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - - - - - + + + + + + - + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -1779,23 +1778,23 @@ - - - - - - - - - + + + + + + + + + - - - + + + @@ -1804,192 +1803,193 @@ - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + @@ -1999,223 +1999,223 @@ - + - - - - + + + + - - - + + + - - + + - + - + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - + - - + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - + + + + + + + @@ -2223,47 +2223,47 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2271,8 +2271,8 @@ - - + + @@ -2280,70 +2280,70 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -2354,67 +2354,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2425,11 +2425,11 @@ - - - - - + + + + + @@ -2503,29 +2503,29 @@ - + - + - + - + - + @@ -2533,21 +2533,21 @@ - + - - + + - + @@ -2565,13 +2565,13 @@ - + - + - + @@ -2607,19 +2607,19 @@ - - - + + + - - - + + + - - - + + + @@ -2627,19 +2627,19 @@ - + - + - + - + @@ -2657,16 +2657,16 @@ - + - + - + @@ -2674,20 +2674,20 @@ - - + + + + + - - - - + - + @@ -2701,8 +2701,8 @@ - - + + @@ -2710,24 +2710,24 @@ - + - + - - - - + + + + @@ -2735,10 +2735,10 @@ - - - - + + + + @@ -2750,10 +2750,10 @@ - + - + @@ -2766,7 +2766,7 @@ - + @@ -2786,13 +2786,13 @@ - + - + @@ -2806,7 +2806,7 @@ - + @@ -2863,10 +2863,10 @@ - + - + @@ -2879,7 +2879,7 @@ - + @@ -2899,13 +2899,13 @@ - + - + @@ -2919,7 +2919,7 @@ - + @@ -2984,18 +2984,18 @@ - + - + - + - + - + @@ -3006,15 +3006,15 @@ - - + + - + @@ -3022,10 +3022,10 @@ - + - + @@ -3057,30 +3057,30 @@ - - + + - + - + - - + + @@ -3095,7 +3095,7 @@ - + @@ -3115,18 +3115,18 @@ - + - + - + - + - + @@ -3137,15 +3137,15 @@ - - + + - + @@ -3153,10 +3153,10 @@ - + - + @@ -3194,30 +3194,30 @@ - - + + - + - + - - + + @@ -3232,7 +3232,7 @@ - + @@ -3252,18 +3252,18 @@ - + - + - + - + - + @@ -3274,15 +3274,15 @@ - - + + - + @@ -3290,19 +3290,19 @@ - + - + - + - + @@ -3328,30 +3328,30 @@ - - + + - + - + - - + + @@ -3366,7 +3366,7 @@ - + @@ -3386,18 +3386,18 @@ - + - + - + - + - + @@ -3408,15 +3408,15 @@ - - + + - + @@ -3436,28 +3436,28 @@ - + - + - + - + - + - + - + @@ -3477,30 +3477,30 @@ - - + + - + - + - - + + @@ -3515,7 +3515,7 @@ - + @@ -3563,13 +3563,13 @@ - + - + @@ -3605,7 +3605,7 @@ - + @@ -3622,7 +3622,7 @@ - + @@ -3669,7 +3669,7 @@ - + @@ -3704,7 +3704,7 @@ - + @@ -3716,12 +3716,12 @@ - + - + @@ -3732,7 +3732,7 @@ - + @@ -3772,12 +3772,12 @@ - + - + @@ -3790,7 +3790,7 @@ - + @@ -3802,12 +3802,12 @@ - + - + @@ -3826,7 +3826,7 @@ - + @@ -3838,12 +3838,12 @@ - + - + @@ -3862,7 +3862,7 @@ - + @@ -3874,7 +3874,7 @@ - + @@ -3885,7 +3885,7 @@ - + @@ -3897,7 +3897,7 @@ - + @@ -3908,7 +3908,7 @@ - + @@ -3920,12 +3920,12 @@ - + - + @@ -3944,7 +3944,7 @@ - + @@ -3956,17 +3956,17 @@ - + - + - + @@ -3977,7 +3977,7 @@ - + @@ -3989,17 +3989,17 @@ - + - + - + @@ -4010,7 +4010,7 @@ - + @@ -4022,19 +4022,19 @@ - + - + - + @@ -4047,7 +4047,7 @@ - + @@ -4059,19 +4059,19 @@ - + - + - + @@ -4084,7 +4084,7 @@ - + @@ -4096,7 +4096,7 @@ - + @@ -4107,7 +4107,7 @@ - + @@ -4132,7 +4132,7 @@ - + @@ -4143,7 +4143,7 @@ - + @@ -4168,7 +4168,7 @@ - + @@ -4179,7 +4179,7 @@ - + @@ -4191,7 +4191,7 @@ - + @@ -4202,7 +4202,7 @@ - + @@ -4214,7 +4214,7 @@ - + @@ -4225,7 +4225,7 @@ - + @@ -4237,10 +4237,10 @@ - + - + @@ -4251,7 +4251,7 @@ - + @@ -4276,10 +4276,10 @@ - + - + @@ -4290,7 +4290,7 @@ - + @@ -4302,19 +4302,19 @@ - + - + - + @@ -4327,7 +4327,7 @@ - + @@ -4348,7 +4348,7 @@ - + @@ -4359,12 +4359,12 @@ - + - + @@ -4383,7 +4383,7 @@ - + @@ -4395,7 +4395,7 @@ - + @@ -4406,7 +4406,7 @@ - + @@ -4418,17 +4418,17 @@ - + - + - + @@ -4439,7 +4439,7 @@ - + @@ -4451,17 +4451,17 @@ - + - + - + @@ -4472,7 +4472,7 @@ - + @@ -4484,17 +4484,17 @@ - + - + - + @@ -4505,7 +4505,7 @@ - + @@ -4527,7 +4527,7 @@ - + @@ -4535,20 +4535,20 @@ - + - + - + - + @@ -4558,10 +4558,10 @@ - + - + @@ -4569,7 +4569,7 @@ - + @@ -4584,7 +4584,7 @@ - + @@ -4593,7 +4593,7 @@ - + @@ -4607,33 +4607,33 @@ - + - + - - - + + + - - - - + + + + @@ -4641,8 +4641,8 @@ - - + + @@ -4650,16 +4650,16 @@ - + - + - + @@ -4673,8 +4673,8 @@ - - + + @@ -4686,11 +4686,11 @@ - + - + - + @@ -4710,7 +4710,7 @@ - + @@ -4724,36 +4724,36 @@ - + - + - + - + - + - + - + @@ -4764,7 +4764,7 @@ - + @@ -4775,13 +4775,13 @@ - + - + @@ -4792,24 +4792,24 @@ - + - + - + - + - + @@ -4820,24 +4820,24 @@ - + - + - + - + - + @@ -4848,8 +4848,8 @@ - - + + @@ -4857,7 +4857,7 @@ - + @@ -4880,30 +4880,30 @@ - + - + - - - + + + - + @@ -4918,7 +4918,7 @@ - + @@ -4929,8 +4929,8 @@ - - + + @@ -4938,7 +4938,7 @@ - + @@ -4961,30 +4961,30 @@ - + - + - - - + + + - + @@ -4999,7 +4999,7 @@ - + @@ -5010,9 +5010,9 @@ - + - + @@ -5047,15 +5047,15 @@ - - + + - + @@ -5070,23 +5070,23 @@ - - + + - + - - + + @@ -5094,7 +5094,7 @@ - + @@ -5102,17 +5102,17 @@ - + - + - + - + @@ -5141,15 +5141,15 @@ - - + + - + @@ -5164,23 +5164,23 @@ - - + + - + - - + + @@ -5188,7 +5188,7 @@ - + @@ -5196,26 +5196,26 @@ - + - + - + - + - + - + @@ -5238,15 +5238,15 @@ - - + + - + @@ -5260,24 +5260,24 @@ - - - + + + - + - - + + @@ -5285,15 +5285,15 @@ - + - - + + @@ -5318,49 +5318,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5371,12 +5371,12 @@ - + - + @@ -5411,24 +5411,24 @@ - + - + - + - + @@ -5437,7 +5437,7 @@ - + @@ -5455,15 +5455,15 @@ - + - + - + @@ -5472,7 +5472,7 @@ - + @@ -5490,17 +5490,17 @@ - + - + - + - + @@ -5523,15 +5523,15 @@ - - + + - + @@ -5545,24 +5545,24 @@ - - - + + + - + - - + + @@ -5570,21 +5570,21 @@ - + - - + + - - + + @@ -5594,7 +5594,7 @@ - + @@ -5620,8 +5620,8 @@ - - + + @@ -5631,15 +5631,15 @@ - - + + - + @@ -5651,8 +5651,8 @@ - - + + @@ -5663,14 +5663,14 @@ - + - + @@ -5682,8 +5682,8 @@ - - + + @@ -5693,15 +5693,15 @@ - - + + - + @@ -5713,19 +5713,19 @@ - + - + - + - + @@ -5785,7 +5785,7 @@ - + @@ -5803,7 +5803,7 @@ - + @@ -5812,10 +5812,10 @@ - + - + @@ -5875,47 +5875,47 @@ - + - + - + - + - + - + - + - + - + - + @@ -5936,16 +5936,16 @@ - - - + + + - + @@ -5959,15 +5959,15 @@ - + - - + + @@ -5975,7 +5975,7 @@ - + @@ -5984,23 +5984,23 @@ - - - + + + - - + + - + - + @@ -6011,31 +6011,31 @@ - + - - + + - - - + + + - + @@ -6049,8 +6049,8 @@ - - + + @@ -6062,8 +6062,8 @@ - - + + @@ -6097,31 +6097,31 @@ - + - - + + - + - + - + @@ -6135,8 +6135,8 @@ - - + + @@ -6144,7 +6144,7 @@ - + @@ -6152,7 +6152,7 @@ - + @@ -6164,8 +6164,8 @@ - - + + @@ -6199,31 +6199,31 @@ - + - - + + - + - + - + @@ -6237,8 +6237,8 @@ - - + + @@ -6246,7 +6246,7 @@ - + @@ -6254,7 +6254,7 @@ - + @@ -6266,8 +6266,8 @@ - - + + @@ -6301,31 +6301,31 @@ - + - - + + - + - + - + @@ -6339,8 +6339,8 @@ - - + + @@ -6348,7 +6348,7 @@ - + @@ -6356,7 +6356,7 @@ - + @@ -6368,8 +6368,8 @@ - - + + @@ -6400,31 +6400,31 @@ - + - - + + - - - + + + - + @@ -6438,8 +6438,8 @@ - - + + @@ -6447,7 +6447,7 @@ - + @@ -6455,7 +6455,7 @@ - + @@ -6467,8 +6467,8 @@ - - + + @@ -6499,31 +6499,31 @@ - + - - + + - - - + + + - + @@ -6537,8 +6537,8 @@ - - + + @@ -6546,7 +6546,7 @@ - + @@ -6554,7 +6554,7 @@ - + @@ -6566,8 +6566,8 @@ - - + + @@ -6598,31 +6598,31 @@ - + - - + + - - - + + + - + @@ -6636,8 +6636,8 @@ - - + + @@ -6645,15 +6645,15 @@ - + - - + + @@ -6693,19 +6693,19 @@ - - + + - + - + @@ -6734,35 +6734,35 @@ - + - - + + - + - - + + - + - - + + @@ -6774,14 +6774,14 @@ - - + + - + @@ -6807,8 +6807,8 @@ - - + + @@ -6839,31 +6839,31 @@ - + - - + + + - - + - + @@ -6877,8 +6877,8 @@ - - + + @@ -6886,7 +6886,7 @@ - + @@ -6894,7 +6894,7 @@ - + @@ -6944,13 +6944,13 @@ - - + + - + - + @@ -6972,21 +6972,21 @@ - + - - + + - + - + @@ -7003,7 +7003,7 @@ - + @@ -7020,7 +7020,7 @@ - + @@ -7042,15 +7042,15 @@ - + - + - + - + @@ -7064,7 +7064,7 @@ - + @@ -7078,10 +7078,10 @@ - + - + @@ -7095,7 +7095,7 @@ - + @@ -7137,9 +7137,9 @@ - + - + @@ -7150,14 +7150,14 @@ - + - + @@ -7179,11 +7179,11 @@ - + - + @@ -7203,7 +7203,7 @@ - + @@ -7224,12 +7224,12 @@ - + - + @@ -7242,14 +7242,14 @@ - + - + @@ -7269,8 +7269,8 @@ - - + + @@ -7280,14 +7280,14 @@ - + - + @@ -7313,8 +7313,8 @@ - - + + @@ -7324,14 +7324,14 @@ - + - + @@ -7351,7 +7351,7 @@ - + @@ -7364,14 +7364,14 @@ - + - + @@ -7432,36 +7432,36 @@ - + - + - + - + - + - + - + - + - + @@ -7482,17 +7482,17 @@ - + - + - + @@ -7512,8 +7512,8 @@ - - + + @@ -7521,12 +7521,12 @@ - + - + @@ -7538,14 +7538,14 @@ - - + + - - + + @@ -7556,12 +7556,12 @@ - + - + @@ -7576,11 +7576,11 @@ - - - + + + - + @@ -7591,15 +7591,15 @@ - - + + - + @@ -7613,15 +7613,15 @@ - + - - - + + + - + @@ -7633,14 +7633,14 @@ - + - + @@ -7653,16 +7653,16 @@ - + - - - + + + - + @@ -7673,15 +7673,15 @@ - - + + - + @@ -7693,9 +7693,9 @@ - + - + @@ -7705,14 +7705,14 @@ - + - + @@ -7730,9 +7730,9 @@ - + - + @@ -7742,14 +7742,14 @@ - + - + @@ -7761,11 +7761,11 @@ - + - + - + @@ -7776,14 +7776,14 @@ - + - + @@ -7803,10 +7803,10 @@ - + - + @@ -7825,7 +7825,7 @@ - + @@ -7839,10 +7839,10 @@ - + - + @@ -7859,7 +7859,7 @@ - + @@ -7874,7 +7874,7 @@ - + @@ -7896,7 +7896,7 @@ - + @@ -7908,10 +7908,10 @@ - + - + @@ -7930,7 +7930,7 @@ - + @@ -7944,10 +7944,10 @@ - + - + @@ -7964,7 +7964,7 @@ - + @@ -7979,7 +7979,7 @@ - + @@ -8001,7 +8001,7 @@ - + @@ -8013,10 +8013,10 @@ - + - + @@ -8035,7 +8035,7 @@ - + @@ -8049,10 +8049,10 @@ - + - + @@ -8069,7 +8069,7 @@ - + @@ -8084,7 +8084,7 @@ - + @@ -8106,7 +8106,7 @@ - + @@ -8118,10 +8118,10 @@ - + - + @@ -8140,7 +8140,7 @@ - + @@ -8154,10 +8154,10 @@ - + - + @@ -8174,7 +8174,7 @@ - + @@ -8189,7 +8189,7 @@ - + @@ -8211,7 +8211,7 @@ - + @@ -8223,10 +8223,10 @@ - + - + @@ -8245,7 +8245,7 @@ - + @@ -8259,10 +8259,10 @@ - + - + @@ -8279,7 +8279,7 @@ - + @@ -8294,7 +8294,7 @@ - + @@ -8316,7 +8316,7 @@ - + @@ -8328,10 +8328,10 @@ - + - + @@ -8350,7 +8350,7 @@ - + @@ -8370,7 +8370,7 @@ - + @@ -8384,10 +8384,10 @@ - + - + @@ -8404,7 +8404,7 @@ - + @@ -8419,7 +8419,7 @@ - + @@ -8441,7 +8441,7 @@ - + @@ -8473,8 +8473,8 @@ - - + + @@ -8487,8 +8487,8 @@ - - + + @@ -8501,15 +8501,15 @@ - + - + - + @@ -8528,7 +8528,7 @@ - + @@ -8542,10 +8542,10 @@ - + - + @@ -8562,7 +8562,7 @@ - + @@ -8577,7 +8577,7 @@ - + @@ -8599,7 +8599,7 @@ - + @@ -8639,7 +8639,7 @@ - + @@ -8654,7 +8654,7 @@ - + @@ -8717,7 +8717,7 @@ - + @@ -8740,7 +8740,7 @@ - + @@ -8763,8 +8763,8 @@ - - + + @@ -8830,7 +8830,7 @@ - + @@ -8845,17 +8845,17 @@ - + - + - + @@ -8869,8 +8869,8 @@ - - + + @@ -8972,7 +8972,7 @@ - + @@ -9007,7 +9007,7 @@ - + @@ -9027,7 +9027,7 @@ - + @@ -9089,7 +9089,7 @@ - + @@ -9144,13 +9144,13 @@ - + - + @@ -9187,7 +9187,7 @@ - + @@ -9207,7 +9207,7 @@ - + @@ -9227,7 +9227,7 @@ - + @@ -9244,8 +9244,8 @@ - - + + @@ -9265,7 +9265,7 @@ - + @@ -9280,12 +9280,12 @@ - + - + @@ -9293,7 +9293,7 @@ - + @@ -9302,13 +9302,13 @@ - - + + - + @@ -9316,59 +9316,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9383,7 +9383,7 @@ - + @@ -9393,10 +9393,10 @@ - + - + @@ -9407,10 +9407,10 @@ - + - + @@ -9419,7 +9419,7 @@ - + @@ -9435,15 +9435,15 @@ - - + + - + @@ -9455,9 +9455,9 @@ - + - + @@ -9471,7 +9471,7 @@ - + @@ -9479,7 +9479,7 @@ - + @@ -9491,12 +9491,12 @@ - + - + - + @@ -9507,15 +9507,15 @@ - - + + - + @@ -9527,12 +9527,12 @@ - + - + - + @@ -9546,15 +9546,15 @@ - - + + - + @@ -9566,7 +9566,7 @@ - + @@ -9590,7 +9590,7 @@ - + @@ -9668,7 +9668,7 @@ - + @@ -9679,7 +9679,7 @@ - + @@ -9704,7 +9704,7 @@ - + @@ -9715,7 +9715,7 @@ - + @@ -9726,7 +9726,7 @@ - + @@ -9737,70 +9737,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9817,17 +9817,17 @@ - + - + - + @@ -9837,14 +9837,14 @@ - - + + - - - + + + @@ -9859,7 +9859,7 @@ - + @@ -9872,19 +9872,19 @@ - + - - + + - + @@ -9896,7 +9896,7 @@ - + @@ -10000,13 +10000,13 @@ - + - + @@ -10021,17 +10021,17 @@ - - + + - + - + @@ -10041,8 +10041,8 @@ - - + + @@ -10054,11 +10054,11 @@ - + - + @@ -10069,7 +10069,7 @@ - + @@ -10094,35 +10094,35 @@ - - + + - - - - + + + + - + - + - - - + + + - - + + @@ -10145,19 +10145,19 @@ - + - - + + - + @@ -10168,7 +10168,7 @@ - + @@ -10180,17 +10180,17 @@ - - - + + + - + - + @@ -10210,17 +10210,17 @@ - - - - + + + + - - + + @@ -10228,8 +10228,8 @@ - - + + @@ -10237,8 +10237,8 @@ - - + + @@ -10246,8 +10246,8 @@ - - + + @@ -10255,8 +10255,8 @@ - - + + @@ -10269,10 +10269,10 @@ - + - + @@ -10292,15 +10292,15 @@ - + - + - + - + @@ -10311,12 +10311,12 @@ - + - + @@ -10332,17 +10332,17 @@ - - + + - - - + + + @@ -10365,8 +10365,8 @@ - - + + @@ -10454,18 +10454,18 @@ - - + + - - + + - + @@ -10480,8 +10480,8 @@ - - + + @@ -10500,8 +10500,8 @@ - - + + @@ -10514,12 +10514,12 @@ - + - + - + @@ -10530,7 +10530,7 @@ - + @@ -10542,9 +10542,9 @@ - + - + @@ -10555,7 +10555,7 @@ - + @@ -10567,9 +10567,9 @@ - + - + @@ -10580,7 +10580,7 @@ - + @@ -10592,12 +10592,12 @@ - + - + - + @@ -10608,20 +10608,20 @@ - + - - + + - + - + @@ -10637,7 +10637,7 @@ - + @@ -10649,7 +10649,7 @@ - + @@ -10704,7 +10704,7 @@ - + @@ -10735,7 +10735,7 @@ - + @@ -10744,7 +10744,7 @@ - + @@ -10755,14 +10755,14 @@ - + - + @@ -10774,14 +10774,14 @@ - + - - + + @@ -10826,13 +10826,13 @@ - + - + @@ -10842,7 +10842,7 @@ - + @@ -10851,7 +10851,7 @@ - + @@ -10862,7 +10862,7 @@ - + @@ -10980,7 +10980,7 @@ - + @@ -11002,7 +11002,7 @@ - + @@ -11031,7 +11031,7 @@ - + @@ -11093,7 +11093,7 @@ - + @@ -11107,122 +11107,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -11239,7 +11239,7 @@ - + @@ -11273,7 +11273,7 @@ - + @@ -11307,7 +11307,7 @@ - + @@ -11321,10 +11321,10 @@ - + - + @@ -11341,7 +11341,7 @@ - + @@ -11375,7 +11375,7 @@ - + @@ -11409,7 +11409,7 @@ - + @@ -11443,7 +11443,7 @@ - + @@ -11457,10 +11457,10 @@ - + - + @@ -11477,7 +11477,7 @@ - + @@ -11491,10 +11491,10 @@ - + - + @@ -11511,7 +11511,7 @@ - + @@ -11525,10 +11525,10 @@ - + - + @@ -11545,7 +11545,7 @@ - + @@ -11574,7 +11574,7 @@ - + @@ -11587,10 +11587,10 @@ - + - + @@ -11607,7 +11607,7 @@ - + @@ -11636,7 +11636,7 @@ - + @@ -11669,7 +11669,7 @@ - + @@ -11703,7 +11703,7 @@ - + @@ -11717,10 +11717,10 @@ - + - + @@ -11737,7 +11737,7 @@ - + @@ -11751,10 +11751,10 @@ - + - + @@ -11771,7 +11771,7 @@ - + @@ -11806,17 +11806,17 @@ - + - + - + @@ -11833,7 +11833,7 @@ - + @@ -11847,10 +11847,10 @@ - + - + @@ -11861,7 +11861,7 @@ - + @@ -11882,7 +11882,7 @@ - + @@ -11896,7 +11896,7 @@ - + @@ -11911,7 +11911,7 @@ - + @@ -11925,8 +11925,8 @@ - - + + @@ -11952,7 +11952,7 @@ - + @@ -11966,10 +11966,10 @@ - + - + @@ -11986,7 +11986,7 @@ - + @@ -12000,10 +12000,10 @@ - + - + @@ -12020,7 +12020,7 @@ - + @@ -12034,10 +12034,10 @@ - + - + @@ -12054,7 +12054,7 @@ - + @@ -12068,10 +12068,10 @@ - + - + @@ -12088,7 +12088,7 @@ - + @@ -12110,7 +12110,7 @@ - + @@ -12128,13 +12128,13 @@ - - + + - - + + @@ -12154,7 +12154,7 @@ - + @@ -12252,12 +12252,12 @@ - + - + @@ -12339,7 +12339,7 @@ - + @@ -12408,7 +12408,7 @@ - + @@ -12458,104 +12458,104 @@ - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - - + + - + - + - - + + - + - + @@ -12574,77 +12574,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -12656,71 +12656,71 @@ - + - + - + - + - + - + - + - + - - + + - + - + - - + + @@ -12756,7 +12756,7 @@ - + @@ -12768,8 +12768,8 @@ - - + + @@ -12791,18 +12791,18 @@ - + - - + + - + @@ -12810,84 +12810,84 @@ - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -12902,13 +12902,13 @@ - + - + @@ -12916,14 +12916,14 @@ - + - + @@ -12931,101 +12931,101 @@ - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + @@ -13038,139 +13038,139 @@ - - + + - + - - + + - - + + - + - + - + - - - - + + + + - - + + - + - - + + - + - - - - + + + + - - + + - + - + - - - - + + + + - + - + - + - + - - + + - - + + - + @@ -13179,21 +13179,21 @@ - - + + - + - + @@ -13208,26 +13208,26 @@ - + - + - + - + @@ -13239,21 +13239,21 @@ - - + + - + - + @@ -13262,110 +13262,110 @@ - + - + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - + @@ -13398,68 +13398,68 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -13467,8 +13467,8 @@ - - + + @@ -13476,7 +13476,7 @@ - + @@ -13640,39 +13640,39 @@ - - + + - + - + - - - + + + - + - + - - - - + + + + @@ -13680,10 +13680,10 @@ - - - - + + + + @@ -13691,79 +13691,79 @@ - + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - + - - - + + + @@ -13772,9 +13772,9 @@ - - - + + + @@ -13783,79 +13783,79 @@ - + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - + - - - + + + @@ -13864,9 +13864,9 @@ - - - + + + @@ -13875,107 +13875,107 @@ - + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - + - + - + - + - + - - + + - - - + + + - + - + - + @@ -13983,21 +13983,21 @@ - + - + - - - + + + - + @@ -14023,75 +14023,75 @@ - + - - + + - + - + - + - + - + - - + + - + - + - + - + - + - + @@ -14103,58 +14103,58 @@ - + - - + + - - + + - - + + - + - + - + - + - + - - + + @@ -14167,8 +14167,8 @@ - - + + @@ -14176,7 +14176,7 @@ - + @@ -14202,7 +14202,7 @@ - + @@ -14221,14 +14221,14 @@ - + - - + + @@ -14244,30 +14244,30 @@ - + - + - + - + - + - + - + - + - + @@ -14278,14 +14278,14 @@ - + - + @@ -14311,14 +14311,14 @@ - - + + - + @@ -14332,7 +14332,7 @@ - + @@ -14363,7 +14363,7 @@ - + @@ -14383,26 +14383,26 @@ - + - + - + - + @@ -14412,7 +14412,7 @@ - + @@ -14470,7 +14470,7 @@ - + @@ -14489,7 +14489,7 @@ - + @@ -14545,7 +14545,7 @@ - + @@ -14557,7 +14557,7 @@ - + @@ -14571,7 +14571,7 @@ - + @@ -14688,23 +14688,23 @@ - - + + - + - - + + - + @@ -14716,7 +14716,7 @@ - + @@ -14724,74 +14724,74 @@ - + - + - - + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - - + + @@ -14801,7 +14801,7 @@ - + @@ -14818,7 +14818,7 @@ - + @@ -14826,7 +14826,7 @@ - + @@ -14838,7 +14838,7 @@ - + @@ -14850,12 +14850,12 @@ - + - + @@ -14863,7 +14863,7 @@ - + @@ -14873,12 +14873,12 @@ - + - + @@ -14886,7 +14886,7 @@ - + @@ -14899,7 +14899,7 @@ - + @@ -14907,7 +14907,7 @@ - + @@ -14915,7 +14915,7 @@ - + @@ -14923,30 +14923,30 @@ - + - - + + - + - + - + @@ -14954,121 +14954,121 @@ - - + + - - + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - - - + + + - + - + @@ -15076,7 +15076,7 @@ - + @@ -15124,7 +15124,7 @@ - + @@ -15134,7 +15134,7 @@ - + @@ -15142,7 +15142,7 @@ - + @@ -15152,36 +15152,36 @@ - + - + - + - + - - + + - - + + - - + + - - - - - + + + + + @@ -15194,23 +15194,23 @@ - - + + - + - + - + - + - + @@ -15232,12 +15232,12 @@ - + - + @@ -15249,27 +15249,27 @@ - + - + - + - + - + - + @@ -15284,47 +15284,47 @@ - + - + - - + + - + - - + + - - + + - + - + - + - + - + @@ -15337,12 +15337,12 @@ - + - + @@ -15387,7 +15387,7 @@ - + @@ -15446,7 +15446,7 @@ - + @@ -15473,25 +15473,25 @@ - - + + - - + + - + - + @@ -15518,20 +15518,20 @@ - - - + + + - - + + - + - + @@ -15549,9 +15549,9 @@ - + - + @@ -15574,13 +15574,13 @@ - + - + @@ -15619,7 +15619,7 @@ - + @@ -15629,7 +15629,7 @@ - + @@ -15647,12 +15647,12 @@ - + - + - + @@ -15669,7 +15669,7 @@ - + @@ -15687,20 +15687,20 @@ - + - + - + - + @@ -15724,7 +15724,7 @@ - + @@ -15744,7 +15744,7 @@ - + @@ -15753,19 +15753,19 @@ - + - + - + - + - + @@ -15774,8 +15774,8 @@ - - + + @@ -15783,9 +15783,9 @@ - - - + + + @@ -15793,8 +15793,8 @@ - - + + @@ -15828,45 +15828,45 @@ - + - + - + - + - + - + - + - - - - + + + + - - - - - + + + + + @@ -15882,12 +15882,12 @@ - + - + @@ -15936,20 +15936,20 @@ - + - + - - + + @@ -15962,7 +15962,7 @@ - + @@ -15989,13 +15989,13 @@ - + - + @@ -16013,7 +16013,7 @@ - + @@ -16034,7 +16034,7 @@ - + @@ -16045,7 +16045,7 @@ - + @@ -16053,7 +16053,7 @@ - + @@ -16090,137 +16090,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -16233,7 +16233,7 @@ - + @@ -16254,10 +16254,10 @@ - + - + @@ -16276,54 +16276,54 @@ - - + + - + - + - + - + - + - + - + - - + + @@ -16333,110 +16333,110 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -16445,20 +16445,20 @@ - + - - - - + + + + - - - + + + - + @@ -16471,10 +16471,10 @@ - + - + diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/= test-read-dwarf/test12-pr18844.so.abi index abaf5ba3..fb1f31e1 100644 --- a/tests/data/test-read-dwarf/test12-pr18844.so.abi +++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi @@ -2932,108 +2932,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3831,31 +3831,31 @@ + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -4005,10 +4005,10 @@ - + - + @@ -4071,10 +4071,10 @@ - + - + @@ -4098,15 +4098,15 @@ - + - - + + @@ -4120,10 +4120,10 @@ - + - + @@ -4250,7 +4250,7 @@ - + @@ -4329,7 +4329,7 @@ - + @@ -4549,7 +4549,7 @@ - + @@ -4772,10 +4772,10 @@ - - + + - + @@ -4823,10 +4823,10 @@ - + - + @@ -4835,7 +4835,7 @@ - + @@ -4874,10 +4874,10 @@ - + - + @@ -4887,7 +4887,7 @@ - + @@ -4926,7 +4926,7 @@ - + @@ -4948,7 +4948,7 @@ - + @@ -4970,10 +4970,10 @@ - + - + @@ -4996,7 +4996,7 @@ - + @@ -5018,7 +5018,7 @@ - + @@ -5045,7 +5045,7 @@ - + @@ -5067,7 +5067,7 @@ - + @@ -6276,10 +6276,10 @@ - - + + - + @@ -6297,10 +6297,10 @@ - + - - + + @@ -6309,10 +6309,10 @@ - + - - + + @@ -6332,9 +6332,9 @@ - + - + @@ -6342,9 +6342,9 @@ - + - + @@ -6352,17 +6352,17 @@ - + - + - + - + @@ -6370,9 +6370,9 @@ - + - + @@ -6380,17 +6380,17 @@ - + - + - + - + @@ -6398,25 +6398,25 @@ - + - + - + - + - + - + @@ -6654,12 +6654,12 @@ - + - + @@ -6720,7 +6720,7 @@ - + @@ -6728,7 +6728,7 @@ - + @@ -6895,7 +6895,7 @@ - + @@ -6903,9 +6903,9 @@ - + - + @@ -7026,7 +7026,7 @@ - + @@ -7215,7 +7215,7 @@ - + @@ -7265,7 +7265,7 @@ - + @@ -7786,7 +7786,7 @@ - + @@ -7829,7 +7829,7 @@ - + @@ -7877,7 +7877,7 @@ - + @@ -7993,7 +7993,7 @@ - + @@ -8036,7 +8036,7 @@ - + @@ -8149,7 +8149,7 @@ - + @@ -8520,14 +8520,14 @@ - + - + @@ -8696,7 +8696,7 @@ - + @@ -8875,7 +8875,7 @@ - + @@ -9243,7 +9243,7 @@ - + @@ -9372,7 +9372,7 @@ - + @@ -9388,7 +9388,7 @@ - + @@ -9414,10 +9414,10 @@ - - + + - + @@ -9435,7 +9435,7 @@ - + @@ -9460,10 +9460,10 @@ - + - + @@ -9480,7 +9480,7 @@ - + @@ -9506,10 +9506,10 @@ - + - + @@ -9661,7 +9661,7 @@ - + @@ -10978,20 +10978,20 @@ - + - + - + @@ -11002,7 +11002,7 @@ - + @@ -11031,14 +11031,14 @@ - + - + @@ -11050,7 +11050,7 @@ - + @@ -11079,14 +11079,14 @@ - + - + @@ -11438,7 +11438,7 @@ - + @@ -11449,7 +11449,7 @@ - + @@ -11478,7 +11478,7 @@ - + @@ -11524,14 +11524,14 @@ - + - + @@ -11577,21 +11577,21 @@ - + - + - + @@ -12014,21 +12014,21 @@ - + - + - + @@ -12176,14 +12176,14 @@ - + - + @@ -12229,21 +12229,21 @@ - + - + - + @@ -12761,7 +12761,7 @@ - + @@ -12832,24 +12832,24 @@ - - + + - - + + - - + + @@ -13070,7 +13070,7 @@ - + @@ -13238,14 +13238,14 @@ - + - + @@ -13270,7 +13270,7 @@ - + @@ -13296,10 +13296,10 @@ - - + + - + @@ -13308,7 +13308,7 @@ - + @@ -13333,7 +13333,7 @@ - + @@ -13358,10 +13358,10 @@ - + - + @@ -13369,7 +13369,7 @@ - + @@ -13394,7 +13394,7 @@ - + @@ -13420,10 +13420,10 @@ - + - + @@ -13432,7 +13432,7 @@ - + @@ -13630,7 +13630,7 @@ - + @@ -13827,7 +13827,7 @@ - + @@ -13848,7 +13848,7 @@ - + @@ -13885,7 +13885,7 @@ - + @@ -13935,9 +13935,9 @@ - + - + @@ -13946,7 +13946,7 @@ - + @@ -13997,7 +13997,7 @@ - + @@ -14057,7 +14057,7 @@ - + @@ -14328,7 +14328,7 @@ - + @@ -14427,7 +14427,7 @@ - + @@ -14473,14 +14473,14 @@ - + - + @@ -14530,7 +14530,7 @@ - + @@ -14588,7 +14588,7 @@ - + @@ -14646,7 +14646,7 @@ - + @@ -14715,7 +14715,7 @@ - + @@ -14762,7 +14762,7 @@ - + @@ -14770,7 +14770,7 @@ - + @@ -14818,7 +14818,7 @@ - + @@ -14827,7 +14827,7 @@ - + @@ -14875,7 +14875,7 @@ - + @@ -14884,7 +14884,7 @@ - + @@ -15416,7 +15416,7 @@ - + @@ -15468,12 +15468,12 @@ - + - + @@ -15483,22 +15483,22 @@ - + - + - + - + @@ -15813,8 +15813,8 @@ - - + + @@ -15822,22 +15822,22 @@ - + - + - - + + @@ -15874,7 +15874,7 @@ - + @@ -15892,7 +15892,7 @@ - + @@ -16224,7 +16224,7 @@ - + @@ -16236,7 +16236,7 @@ - + @@ -16293,8 +16293,8 @@ - - + + @@ -16524,7 +16524,7 @@ - + @@ -16890,47 +16890,47 @@ - + - + - + - + - + - + - + - + - + @@ -16938,7 +16938,7 @@ - + @@ -17125,7 +17125,7 @@ - + @@ -17176,8 +17176,8 @@ - - + + @@ -17249,19 +17249,19 @@ - + - + - + - + @@ -17269,39 +17269,39 @@ - + - + - + - + - + - + - + - + - + @@ -17385,15 +17385,15 @@ - + - + - + @@ -17423,15 +17423,15 @@ - + - + - + @@ -17439,7 +17439,7 @@ - + @@ -17447,7 +17447,7 @@ - + @@ -17683,27 +17683,27 @@ - + - + - + - + - + - + @@ -17732,18 +17732,18 @@ - - + + - - + + - - + + @@ -17991,12 +17991,12 @@ - + - + @@ -18041,8 +18041,8 @@ - - + + @@ -18357,7 +18357,7 @@ - + @@ -18365,14 +18365,14 @@ - + - + - + @@ -18380,32 +18380,32 @@ - + - - + + - + - + - + - + - + @@ -18765,7 +18765,7 @@ - + @@ -19043,7 +19043,7 @@ - + @@ -19151,11 +19151,11 @@ - + - + @@ -19534,33 +19534,33 @@ - + - + - + - + - + @@ -19882,7 +19882,7 @@ - + @@ -20229,19 +20229,19 @@ - + - + - + @@ -20365,42 +20365,42 @@ - + - + - + - + - + - + @@ -20421,13 +20421,13 @@ - + - + @@ -20435,14 +20435,14 @@ - + - + @@ -20451,13 +20451,13 @@ - + - + @@ -20465,14 +20465,14 @@ - + - + @@ -20481,13 +20481,13 @@ - + - + @@ -20495,14 +20495,14 @@ - + - + @@ -20531,34 +20531,34 @@ - + - + - + - - + + - + @@ -20571,68 +20571,68 @@ - + - + - + - - + + - + - + - + - + - - + + - + @@ -20647,14 +20647,14 @@ - + - + @@ -20662,14 +20662,14 @@ - + - + @@ -20677,14 +20677,14 @@ - + - + @@ -20703,14 +20703,14 @@ - + - + @@ -20718,14 +20718,14 @@ - + - + @@ -20733,14 +20733,14 @@ - + - + @@ -20756,21 +20756,21 @@ - + - + - + @@ -20783,21 +20783,21 @@ - + - + - + @@ -20809,20 +20809,20 @@ - + - + - + @@ -20850,9 +20850,9 @@ - + - + @@ -20876,40 +20876,40 @@ - + - + - + - + - + - + @@ -20982,34 +20982,34 @@ - + - + - + - + - + @@ -21017,7 +21017,7 @@ - + @@ -21025,34 +21025,34 @@ - + - + - + - + - + @@ -21060,7 +21060,7 @@ - + @@ -21068,34 +21068,34 @@ - + - + - + - + - + @@ -21103,7 +21103,7 @@ - + @@ -21285,20 +21285,20 @@ - + - + - + @@ -21341,102 +21341,102 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -21454,14 +21454,14 @@ - + - + @@ -21469,7 +21469,7 @@ - + @@ -21483,48 +21483,48 @@ - + - + - + - + - + - + - + @@ -21539,28 +21539,28 @@ - + - + - + - + @@ -21574,27 +21574,27 @@ - + - + - + - + @@ -21606,28 +21606,28 @@ - + - + - - + + - - + + @@ -21639,69 +21639,69 @@ - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + @@ -21716,7 +21716,7 @@ - + @@ -21725,7 +21725,7 @@ - + @@ -21735,11 +21735,11 @@ - + - + @@ -21748,27 +21748,27 @@ - + - - + + - + - + @@ -21791,19 +21791,19 @@ - + - + - + @@ -21812,33 +21812,33 @@ - + - - + + - + - + - + @@ -21847,35 +21847,35 @@ - + - - + + - + - + - - - + + + @@ -21888,7 +21888,7 @@ - + @@ -21897,14 +21897,14 @@ - + - + @@ -21929,7 +21929,7 @@ - + @@ -21938,21 +21938,21 @@ - + - + - + @@ -21961,14 +21961,14 @@ - + - + @@ -21983,7 +21983,7 @@ - + @@ -21992,14 +21992,14 @@ - + - + @@ -22012,13 +22012,13 @@ - - + + - + @@ -22027,14 +22027,14 @@ - + - + @@ -22061,7 +22061,7 @@ - + @@ -22070,14 +22070,14 @@ - + - + @@ -22096,13 +22096,13 @@ - - + + - + @@ -22111,14 +22111,14 @@ - + - + @@ -22151,84 +22151,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -22239,26 +22239,26 @@ - + - + - + - + @@ -22276,20 +22276,20 @@ - + - + - + @@ -22297,7 +22297,7 @@ - + @@ -22318,20 +22318,20 @@ - + - + - + @@ -22339,27 +22339,27 @@ - + - + - + - + @@ -22367,7 +22367,7 @@ - + @@ -22382,21 +22382,21 @@ - + - + - + @@ -22404,7 +22404,7 @@ - + @@ -22412,27 +22412,27 @@ - + - + - + - + @@ -22440,7 +22440,7 @@ - + @@ -22448,27 +22448,27 @@ - + - + - + - + @@ -22476,7 +22476,7 @@ - + @@ -22484,15 +22484,15 @@ - + - + - + @@ -22500,14 +22500,14 @@ - + - + @@ -22515,7 +22515,7 @@ - + @@ -22531,81 +22531,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -22691,20 +22691,20 @@ - + - + - + @@ -22712,20 +22712,20 @@ - + - + - + @@ -22733,20 +22733,20 @@ - + - + - + @@ -22754,10 +22754,10 @@ - + - + @@ -22767,10 +22767,10 @@ - + - + @@ -22786,8 +22786,8 @@ - - + + @@ -22796,19 +22796,19 @@ - + - + - + @@ -22818,7 +22818,7 @@ - + @@ -22830,43 +22830,43 @@ - + - - + + - + - + - + - + - + @@ -22891,7 +22891,7 @@ - + @@ -22901,10 +22901,10 @@ - + - + @@ -22925,22 +22925,22 @@ - + - + - + - + - + - + @@ -22965,14 +22965,14 @@ - + - + @@ -22981,14 +22981,14 @@ - + - + @@ -23003,66 +23003,66 @@ - + - + - + - + - + - + - + - + - + - + - - + + - + @@ -23073,88 +23073,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -23162,21 +23162,21 @@ - + - + - + @@ -23184,7 +23184,7 @@ - + @@ -23192,14 +23192,14 @@ - + - + @@ -23246,13 +23246,13 @@ - + - + @@ -23263,7 +23263,7 @@ - + @@ -23273,13 +23273,13 @@ - + - + @@ -23290,7 +23290,7 @@ - + @@ -23300,13 +23300,13 @@ - + - + @@ -23317,7 +23317,7 @@ - + @@ -23338,13 +23338,13 @@ - + - + @@ -23353,13 +23353,13 @@ - + - + @@ -23368,13 +23368,13 @@ - + - + @@ -23391,13 +23391,13 @@ - + - + @@ -23410,13 +23410,13 @@ - + - + @@ -23430,26 +23430,26 @@ - + - + - + - + @@ -23478,7 +23478,7 @@ - + @@ -23488,7 +23488,7 @@ - + @@ -23514,7 +23514,7 @@ - + @@ -23524,7 +23524,7 @@ - + @@ -23556,20 +23556,20 @@ - + - + - + @@ -23583,14 +23583,14 @@ - + - + @@ -23598,7 +23598,7 @@ - + @@ -23631,7 +23631,7 @@ - + @@ -23646,20 +23646,20 @@ - + - + - + @@ -23685,20 +23685,20 @@ - + - + - + @@ -23715,27 +23715,27 @@ - + - + - + - - + + @@ -23745,7 +23745,7 @@ - + @@ -23757,9 +23757,9 @@ - + - + @@ -23781,8 +23781,8 @@ - - + + @@ -23790,8 +23790,8 @@ - - + + @@ -23800,8 +23800,8 @@ - - + + @@ -23809,14 +23809,14 @@ - - + + - + @@ -23828,31 +23828,31 @@ - + - + - + - + - + - + - + @@ -23860,11 +23860,11 @@ - + - + @@ -23872,7 +23872,7 @@ - + @@ -23956,7 +23956,7 @@ - + @@ -23967,7 +23967,7 @@ - + @@ -24001,7 +24001,7 @@ - + @@ -24020,7 +24020,7 @@ - + @@ -24485,26 +24485,26 @@ - + - + - + - + - + - + - + @@ -25211,19 +25211,19 @@ - + - + - + - + @@ -25240,19 +25240,19 @@ - + - + - + - + @@ -25269,19 +25269,19 @@ - + - + - + - + @@ -25324,18 +25324,18 @@ - + - + - + @@ -25348,44 +25348,44 @@ - - - - + - + - + - + - + - + + + + @@ -25696,11 +25696,11 @@ - + - - - + + + @@ -25833,17 +25833,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -25906,7 +25906,7 @@ - + @@ -25948,10 +25948,10 @@ - + - + @@ -26018,7 +26018,7 @@ - + @@ -26039,7 +26039,7 @@ - + @@ -26129,7 +26129,7 @@ - + @@ -26137,7 +26137,7 @@ - + @@ -26153,7 +26153,7 @@ - + @@ -26175,7 +26175,7 @@ - + @@ -26200,7 +26200,7 @@ - + @@ -26222,7 +26222,7 @@ - + @@ -26276,8 +26276,8 @@ - - + + @@ -26401,13 +26401,13 @@ - + - + @@ -26482,7 +26482,7 @@ - + @@ -26512,7 +26512,7 @@ - + @@ -26534,7 +26534,7 @@ - + @@ -26911,15 +26911,15 @@ - - + + - - + + @@ -26972,7 +26972,7 @@ - + @@ -26983,7 +26983,7 @@ - + @@ -27012,7 +27012,7 @@ - + @@ -27071,7 +27071,7 @@ - + @@ -27129,16 +27129,16 @@ - - + + - - + + @@ -27198,7 +27198,7 @@ - + @@ -27219,7 +27219,7 @@ - + @@ -27238,7 +27238,7 @@ - + @@ -27260,7 +27260,7 @@ - + @@ -27274,7 +27274,7 @@ - + @@ -27897,8 +27897,8 @@ - - + + @@ -27952,7 +27952,7 @@ - + @@ -27960,7 +27960,7 @@ - + @@ -27975,7 +27975,7 @@ - + @@ -28002,7 +28002,7 @@ - + @@ -28019,10 +28019,10 @@ - + - + @@ -28052,7 +28052,7 @@ - + @@ -28117,12 +28117,12 @@ - + - + @@ -28149,12 +28149,12 @@ - - + + - - + + @@ -28172,12 +28172,12 @@ - - - - + + + + @@ -28228,11 +28228,11 @@ - + - + @@ -28247,37 +28247,37 @@ - - + + - + - + - - + + - - + + - - + + - - + + @@ -28292,47 +28292,47 @@ - + - - + + - + - + - - - + + + - + - + - + - + @@ -28413,7 +28413,7 @@ - + @@ -28426,7 +28426,7 @@ - + @@ -28438,7 +28438,7 @@ - + @@ -28451,7 +28451,7 @@ - + @@ -28539,14 +28539,14 @@ - + - + @@ -28554,7 +28554,7 @@ - + @@ -28568,7 +28568,7 @@ - + @@ -28591,7 +28591,7 @@ - + @@ -28611,10 +28611,10 @@ - + - + diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/= test-read-dwarf/test13-pr18894.so.abi index a8a6ab4f..b3888eaf 100644 --- a/tests/data/test-read-dwarf/test13-pr18894.so.abi +++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi @@ -855,22 +855,22 @@ + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -910,7 +910,7 @@ - + @@ -1045,16 +1045,16 @@ - + - + - + @@ -1068,7 +1068,7 @@ - + @@ -1174,7 +1174,7 @@ - + @@ -1186,7 +1186,7 @@ - + @@ -1222,7 +1222,7 @@ - + @@ -1230,14 +1230,14 @@ - + - + @@ -1245,7 +1245,7 @@ - + @@ -1263,15 +1263,15 @@ - + - + - + @@ -1339,31 +1339,31 @@ - + - + - + - - + + - - + + @@ -1379,12 +1379,12 @@ - + - + @@ -1453,7 +1453,7 @@ - + @@ -1736,7 +1736,7 @@ - + @@ -1840,11 +1840,11 @@ - + - + @@ -1869,7 +1869,7 @@ - + @@ -1914,7 +1914,7 @@ - + @@ -1932,58 +1932,58 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -2039,7 +2039,7 @@ - + @@ -2143,11 +2143,11 @@ - + - + @@ -2368,10 +2368,10 @@ - - - - + + + + @@ -2402,19 +2402,19 @@ + + - - @@ -2448,25 +2448,25 @@ - + - + - + - + - + @@ -2477,13 +2477,13 @@ - + - + @@ -2523,42 +2523,42 @@ - + - + - + - + - + - + - + - + - + diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/= test-read-dwarf/test14-pr18893.so.abi index a1051a45..4ab5abc9 100644 --- a/tests/data/test-read-dwarf/test14-pr18893.so.abi +++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi @@ -10738,10 +10738,10 @@ + - @@ -14617,10 +14617,10 @@ - - - - + + + + @@ -14712,14 +14712,14 @@ - + - + @@ -14727,11 +14727,11 @@ - + - + @@ -14952,8 +14952,8 @@ - + diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/= test-read-dwarf/test15-pr18892.so.abi index fc9243f8..739e5931 100644 --- a/tests/data/test-read-dwarf/test15-pr18892.so.abi +++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi @@ -2990,9 +2990,6 @@ - - - @@ -3000,6 +2997,9 @@ + + + @@ -6819,266 +6819,265 @@ - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + - - - - - - - - - - - - + + + + + + + + + - + + - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - @@ -7086,28 +7085,29 @@ + - - - - - - - + + + + + + + - - + + - - + + - + - + @@ -7487,20 +7487,20 @@ - + - + - + @@ -7527,20 +7527,20 @@ - + - + - + @@ -7559,21 +7559,21 @@ - + - + - + - + @@ -7585,52 +7585,52 @@ - + - + - + - + - + - + - + - + - + @@ -7761,28 +7761,28 @@ - + - + - + - + - + - + @@ -7790,29 +7790,29 @@ - + - + - + - + - + - + @@ -7839,22 +7839,22 @@ - + - + - + - + @@ -7870,22 +7870,22 @@ - + - - + + - + - - + + @@ -7911,13 +7911,13 @@ - + - + @@ -7944,20 +7944,20 @@ - + - + - + @@ -8007,74 +8007,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -8085,7 +8085,7 @@ - + @@ -8119,14 +8119,14 @@ - + - + - + @@ -8174,38 +8174,38 @@ - + - + - + - + - + - + - - + + @@ -8215,7 +8215,7 @@ - + @@ -8251,7 +8251,7 @@ - + @@ -8285,20 +8285,20 @@ - - + + - - + + - - + + @@ -8348,33 +8348,33 @@ - + - + - - + + - - + + - - - - + + + + @@ -8383,20 +8383,20 @@ - + - + - + @@ -8405,7 +8405,7 @@ - + @@ -8610,7 +8610,7 @@ - + @@ -8717,13 +8717,13 @@ - + - + @@ -10151,7 +10151,7 @@ - + @@ -10160,34 +10160,34 @@ - + - + - + - - + + - - + + @@ -10201,7 +10201,7 @@ - + @@ -10216,7 +10216,7 @@ - + @@ -10423,9 +10423,9 @@ - - - + + + @@ -10449,9 +10449,9 @@ - - - + + + @@ -10474,24 +10474,24 @@ - + - + - + - + @@ -10576,14 +10576,14 @@ - + - + @@ -10602,14 +10602,14 @@ - + - + @@ -10645,7 +10645,7 @@ - + @@ -10654,7 +10654,7 @@ - + @@ -10662,7 +10662,7 @@ - + @@ -10671,7 +10671,7 @@ - + @@ -10816,46 +10816,46 @@ - + - + - + - + - + - + - + @@ -10863,34 +10863,34 @@ - + - + - + - + - + @@ -10914,7 +10914,7 @@ - + @@ -10924,7 +10924,7 @@ - + @@ -10975,7 +10975,7 @@ - + @@ -10985,7 +10985,7 @@ - + @@ -11047,25 +11047,25 @@ - + - - - + + + - - - + + + @@ -11602,12 +11602,12 @@ - + - + @@ -12147,7 +12147,7 @@ - + @@ -12155,7 +12155,7 @@ - + @@ -12312,9 +12312,9 @@ - - - + + + @@ -12322,15 +12322,15 @@ - - - + + + - + @@ -12339,7 +12339,7 @@ - + @@ -12356,7 +12356,7 @@ - + @@ -12365,7 +12365,7 @@ - + @@ -12443,7 +12443,7 @@ - + @@ -12453,7 +12453,7 @@ - + @@ -12462,7 +12462,7 @@ - + @@ -12472,7 +12472,7 @@ - + @@ -12494,9 +12494,9 @@ - + - + @@ -12506,103 +12506,103 @@ - + - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - - + + - + @@ -12649,101 +12649,101 @@ - + - - + + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + @@ -12752,38 +12752,38 @@ - + - + - + - + - + - + - + @@ -12806,7 +12806,7 @@ - + @@ -12817,7 +12817,7 @@ - + @@ -12828,17 +12828,17 @@ - + - + - + @@ -12847,10 +12847,10 @@ - + - + @@ -12864,7 +12864,7 @@ - + @@ -12899,7 +12899,7 @@ - + @@ -12912,7 +12912,7 @@ - + @@ -12932,7 +12932,7 @@ - + @@ -12940,7 +12940,7 @@ - + @@ -12955,7 +12955,7 @@ - + @@ -12963,7 +12963,7 @@ - + @@ -12979,7 +12979,7 @@ - + @@ -13014,18 +13014,18 @@ - + - + - + @@ -13035,12 +13035,12 @@ - - - - - - + + + + + + @@ -13248,7 +13248,7 @@ - + @@ -13269,8 +13269,8 @@ - - + + @@ -13310,8 +13310,8 @@ - - + + @@ -13444,12 +13444,12 @@ - + - + @@ -13462,12 +13462,12 @@ - + - + @@ -13588,15 +13588,15 @@ - + - + - + @@ -14025,8 +14025,8 @@ - - + + @@ -14035,7 +14035,7 @@ - + @@ -14700,523 +14700,520 @@ - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - - - + + + - - + + - + - + + + + + + - + - + - + + + + + + + - + - + - - - - - - - + - + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -15224,31 +15221,31 @@ - + - + - + - - + + - + - + - + @@ -15256,309 +15253,312 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + - + + + + + - + + + + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -15573,26 +15573,26 @@ - + - + - - - - + + + + - + - + @@ -15600,45 +15600,45 @@ - + - + + + + + + - - + + - - + + - - + + - - - - - - + @@ -15657,33 +15657,33 @@ - + - + - + - + - + - + @@ -15709,16 +15709,16 @@ - + - + - + @@ -15726,12 +15726,12 @@ - + - + @@ -16373,7 +16373,7 @@ - + @@ -17968,7 +17968,7 @@ - + @@ -19769,7 +19769,7 @@ - + @@ -21865,8 +21865,8 @@ - - + + @@ -22120,12 +22120,12 @@ - + - + @@ -23224,7 +23224,7 @@ - + @@ -25545,10 +25545,10 @@ - + - + @@ -25913,7 +25913,7 @@ - + diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/= test-read-dwarf/test16-pr18904.so.abi index a7cc8997..fff19e37 100644 --- a/tests/data/test-read-dwarf/test16-pr18904.so.abi +++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi @@ -1791,14 +1791,10 @@ - - - - - - - - + + + + @@ -1824,12 +1820,16 @@ - - - - - - + + + + + + + + + + @@ -1866,51 +1866,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - + + + + + + + - + @@ -1918,21 +1922,21 @@ - + - + - + - + @@ -1940,50 +1944,50 @@ - + - + - + - + - + - + - + - + - + @@ -1997,7 +2001,7 @@ - + @@ -2015,31 +2019,38 @@ - + - + - + + + + + + + + - + - + - + - + - + @@ -2047,52 +2058,52 @@ - + - + - - + + - + - + - + - + - + - + @@ -2104,31 +2115,11 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -2138,20 +2129,29 @@ - + + + + + + + + + + - + - + - + - + @@ -2820,7 +2820,7 @@ - + @@ -3490,7 +3490,7 @@ - + @@ -19141,42 +19141,45 @@ - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + - - - - - - - + + + + + + + @@ -19185,45 +19188,42 @@ - + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -19231,183 +19231,183 @@ - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - - + + - - + + @@ -19451,7 +19451,7 @@ - + @@ -19470,30 +19470,30 @@ - + - + - + - + - + - + @@ -19501,7 +19501,7 @@ - + @@ -19509,7 +19509,7 @@ - + @@ -19519,7 +19519,7 @@ - + @@ -19536,136 +19536,136 @@ - - + + - - + + - - + + - + - - + + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - + @@ -19678,53 +19678,53 @@ - - - + + + - - - + + + - - + + - + - - + + - - + + - + - + @@ -19819,50 +19819,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -19870,7 +19870,7 @@ - + @@ -19878,64 +19878,64 @@ - + - + - + - + - + - + - + - + - + - - + + @@ -19949,13 +19949,13 @@ - + - + - + @@ -19965,50 +19965,50 @@ - - - - + - + - + - + + + + - + - + - + - + - + @@ -20778,7 +20778,7 @@ - + @@ -20878,7 +20878,7 @@ - + diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/= test-read-dwarf/test17-pr19027.so.abi index 979622d5..c5c9654a 100644 --- a/tests/data/test-read-dwarf/test17-pr19027.so.abi +++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi @@ -1642,22 +1642,22 @@ - - - + + - + - + + + - - + @@ -1980,45 +1980,45 @@ - + - + - + - + - + - + - + - + @@ -2026,7 +2026,7 @@ - + @@ -2146,21 +2146,21 @@ - + - + - - + + - + - + @@ -2168,139 +2168,139 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2308,7 +2308,7 @@ - + @@ -2316,7 +2316,7 @@ - + @@ -2324,7 +2324,7 @@ - + @@ -2332,7 +2332,7 @@ - + @@ -3203,23 +3203,23 @@ + + + + + + + + - - - - - - - - @@ -5678,7 +5678,7 @@ - + @@ -5687,7 +5687,7 @@ - + @@ -5695,16 +5695,16 @@ - - + + - - + + @@ -5712,8 +5712,8 @@ - - + + @@ -5722,7 +5722,7 @@ - + @@ -5732,7 +5732,7 @@ - + @@ -5740,7 +5740,7 @@ - + @@ -5748,8 +5748,8 @@ - + @@ -5872,56 +5872,56 @@ - + - + - + - + - + - + - + - + - + @@ -5929,21 +5929,21 @@ - + - + - + @@ -5951,7 +5951,7 @@ - + @@ -5959,7 +5959,7 @@ - + @@ -5967,7 +5967,7 @@ - + @@ -5975,7 +5975,7 @@ - + @@ -5984,14 +5984,14 @@ - + - + @@ -6000,14 +6000,14 @@ - + - + @@ -6015,25 +6015,25 @@ - + - - + + - + - - + + - + - + @@ -6041,59 +6041,59 @@ - + - + - + - - + + - + - + - + - + - + - + - + @@ -6620,14 +6620,14 @@ - + - + - + @@ -8197,7 +8197,7 @@ - + @@ -8577,8 +8577,8 @@ - + @@ -8587,8 +8587,8 @@ - + @@ -8596,8 +8596,8 @@ - + @@ -8605,8 +8605,8 @@ - + @@ -9333,511 +9333,514 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - + + - + - - - - - + + + + + + + - + - + - + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -9846,7 +9849,7 @@ - + @@ -9856,10 +9859,7 @@ - - - - + @@ -9897,7 +9897,7 @@ - + @@ -9945,16 +9945,16 @@ - + - + @@ -9982,36 +9982,36 @@ - - + + - - + + - + - - + + - - + + @@ -10024,8 +10024,8 @@ - - + + @@ -10045,28 +10045,28 @@ - - + + - + - - + + - - + + @@ -10079,7 +10079,7 @@ - + @@ -10117,8 +10117,8 @@ - - + + @@ -10152,7 +10152,7 @@ - + @@ -10189,7 +10189,7 @@ - + @@ -10229,7 +10229,7 @@ - + @@ -10261,8 +10261,8 @@ - - + + @@ -10295,7 +10295,7 @@ - + @@ -10314,14 +10314,14 @@ - + - + @@ -10419,7 +10419,7 @@ - + @@ -10503,7 +10503,7 @@ - + @@ -10570,7 +10570,7 @@ - + @@ -10603,7 +10603,7 @@ - + @@ -10642,7 +10642,7 @@ - + @@ -10675,7 +10675,7 @@ - + @@ -10723,7 +10723,7 @@ - + @@ -10741,7 +10741,7 @@ - + @@ -10795,7 +10795,7 @@ - + @@ -10891,7 +10891,7 @@ - + @@ -10944,7 +10944,7 @@ - + @@ -10969,7 +10969,7 @@ - + @@ -11002,7 +11002,7 @@ - + @@ -11035,7 +11035,7 @@ - + @@ -11103,7 +11103,7 @@ - + @@ -11135,7 +11135,7 @@ - + @@ -11180,7 +11180,7 @@ - + @@ -11221,7 +11221,7 @@ - + @@ -11262,7 +11262,7 @@ - + @@ -11301,7 +11301,7 @@ - + @@ -11350,8 +11350,8 @@ - - + + @@ -11381,7 +11381,7 @@ - + @@ -11411,7 +11411,7 @@ - + @@ -11444,7 +11444,7 @@ - + @@ -11473,29 +11473,29 @@ - - + + - - + + - - + + - - + + @@ -11508,15 +11508,15 @@ - + - - + + @@ -11560,21 +11560,21 @@ - + - - + + - - + + @@ -11587,15 +11587,15 @@ - + - - + + @@ -11624,14 +11624,14 @@ - + - - + + @@ -11644,22 +11644,22 @@ - + - - + + - - + + @@ -11685,21 +11685,21 @@ - + - - + + - - + + @@ -11712,15 +11712,15 @@ - + - - + + @@ -11749,16 +11749,16 @@ - - + + - - + + @@ -11772,7 +11772,7 @@ - + @@ -11780,8 +11780,8 @@ - - + + @@ -11803,31 +11803,31 @@ - - + + - - + + - - + + - + @@ -11863,14 +11863,14 @@ - + - + @@ -11878,7 +11878,7 @@ - + @@ -11934,14 +11934,14 @@ - + - + @@ -11949,7 +11949,7 @@ - + @@ -11963,7 +11963,7 @@ - + @@ -11992,29 +11992,29 @@ - - + + - - + + - - + + - - + + @@ -12027,15 +12027,15 @@ - + - - + + @@ -12094,21 +12094,21 @@ - + - - + + - - + + @@ -12121,15 +12121,15 @@ - + - - + + @@ -12152,14 +12152,14 @@ - + - - + + @@ -12172,22 +12172,22 @@ - + - - + + - - + + @@ -12220,14 +12220,14 @@ - + - + @@ -12248,7 +12248,7 @@ - + @@ -12338,14 +12338,14 @@ - - + + - + @@ -12353,21 +12353,21 @@ - + - + - + @@ -12382,7 +12382,7 @@ - + @@ -12400,7 +12400,7 @@ - + @@ -12420,7 +12420,7 @@ - + @@ -12442,35 +12442,35 @@ - + - - + + - + - + - + @@ -12486,7 +12486,7 @@ - + @@ -12504,7 +12504,7 @@ - + @@ -12530,7 +12530,7 @@ - + @@ -12552,35 +12552,35 @@ - + - - + + - + - + - + @@ -12596,7 +12596,7 @@ - + @@ -12626,22 +12626,22 @@ - - + + - + - - + + @@ -12668,14 +12668,14 @@ - + - - + + @@ -12688,7 +12688,7 @@ - + @@ -12733,14 +12733,14 @@ - + - + @@ -12781,26 +12781,26 @@ - - + + - - + + - + - + @@ -12813,14 +12813,14 @@ - - + + - + @@ -12849,54 +12849,54 @@ - - + + - - + + - - + + - - + + - + - - + + - + - + @@ -12916,14 +12916,14 @@ - - + + - - + + @@ -12967,11 +12967,11 @@ - + - + @@ -12981,7 +12981,7 @@ - + @@ -12997,7 +12997,7 @@ - + @@ -13043,9 +13043,9 @@ - + - + @@ -13160,13 +13160,13 @@ - + - + @@ -13174,22 +13174,22 @@ - + - + - - + + @@ -13200,7 +13200,7 @@ - + @@ -13210,7 +13210,7 @@ - + @@ -13218,7 +13218,7 @@ - + @@ -13244,21 +13244,21 @@ - + - + - + @@ -13284,21 +13284,21 @@ - + - + - + @@ -13338,27 +13338,27 @@ - + - + - + - + - + - + @@ -13367,7 +13367,7 @@ - + @@ -13376,13 +13376,13 @@ - + - + @@ -13390,14 +13390,14 @@ - + - + - + @@ -13463,11 +13463,11 @@ - + - + @@ -13484,7 +13484,7 @@ - + @@ -13551,8 +13551,8 @@ - - + + @@ -13578,8 +13578,8 @@ - - + + @@ -13601,22 +13601,22 @@ - - + + - - + + - - + + @@ -13629,7 +13629,7 @@ - + @@ -13654,22 +13654,22 @@ - - + + - - + + - - + + @@ -13682,7 +13682,7 @@ - + @@ -13715,36 +13715,36 @@ - - + + - - + + - + - - + + - - + + @@ -13757,8 +13757,8 @@ - - + + @@ -13791,28 +13791,28 @@ - + - - + + - - + + - - + + @@ -13825,7 +13825,7 @@ - + @@ -13921,11 +13921,11 @@ - + - + @@ -13948,22 +13948,22 @@ - - + + - + - - + + @@ -14009,7 +14009,7 @@ - + @@ -14047,7 +14047,7 @@ - + @@ -14073,7 +14073,7 @@ - + @@ -14103,22 +14103,22 @@ - - + + - + - - + + @@ -14164,7 +14164,7 @@ - + @@ -14199,22 +14199,22 @@ - - + + - + - - + + @@ -14260,7 +14260,7 @@ - + @@ -14317,36 +14317,36 @@ - - + + - - + + - + - - + + - - + + @@ -14359,8 +14359,8 @@ - - + + @@ -14380,28 +14380,28 @@ - - + + - + - - + + - - + + @@ -14414,7 +14414,7 @@ - + @@ -14430,7 +14430,7 @@ - + @@ -14495,9 +14495,9 @@ - + - + @@ -14505,9 +14505,9 @@ - + - + @@ -14550,7 +14550,7 @@ - + @@ -14581,7 +14581,7 @@ - + @@ -14613,7 +14613,7 @@ - + @@ -14644,7 +14644,7 @@ - + @@ -14675,7 +14675,7 @@ - + @@ -14706,7 +14706,7 @@ - + @@ -14737,7 +14737,7 @@ - + @@ -14768,7 +14768,7 @@ - + @@ -14869,7 +14869,7 @@ - + @@ -14909,7 +14909,7 @@ - + @@ -14941,7 +14941,7 @@ - + @@ -14973,7 +14973,7 @@ - + @@ -15004,7 +15004,7 @@ - + @@ -15035,7 +15035,7 @@ - + @@ -15066,7 +15066,7 @@ - + @@ -15105,7 +15105,7 @@ - + @@ -15144,7 +15144,7 @@ - + @@ -15175,7 +15175,7 @@ - + @@ -15206,7 +15206,7 @@ - + @@ -15246,7 +15246,7 @@ - + @@ -15269,7 +15269,7 @@ - + @@ -15357,7 +15357,7 @@ - + @@ -15413,7 +15413,7 @@ - + @@ -15436,7 +15436,7 @@ - + @@ -15467,7 +15467,7 @@ - + @@ -15498,7 +15498,7 @@ - + @@ -15529,7 +15529,7 @@ - + @@ -15569,7 +15569,7 @@ - + @@ -15592,7 +15592,7 @@ - + @@ -15656,7 +15656,7 @@ - + @@ -15694,22 +15694,22 @@ - - + + - + - - + + @@ -15756,7 +15756,7 @@ - + @@ -15808,7 +15808,7 @@ - + @@ -15857,7 +15857,7 @@ - + @@ -15865,7 +15865,7 @@ - + @@ -15873,8 +15873,8 @@ - - + + @@ -15883,41 +15883,41 @@ - - + + - - + + - + - + - + - + - + @@ -15931,8 +15931,8 @@ - - + + @@ -16001,23 +16001,23 @@ - - + + - - + + - + @@ -16050,36 +16050,36 @@ - - + + - + - + - + - - + + @@ -16173,18 +16173,18 @@ - + - + - + - + @@ -16192,11 +16192,11 @@ - - + + - + @@ -16204,7 +16204,7 @@ - + @@ -16212,11 +16212,11 @@ - - + + - + @@ -16224,7 +16224,7 @@ - + @@ -16233,12 +16233,12 @@ - + - + - + @@ -16250,12 +16250,12 @@ - + - + - + @@ -16282,36 +16282,36 @@ - - + + - - + + - + - - + + - - + + @@ -16324,8 +16324,8 @@ - - + + @@ -16351,28 +16351,28 @@ - - + + - + - - + + - - + + @@ -16385,7 +16385,7 @@ - + @@ -16409,16 +16409,16 @@ - - + + - - + + @@ -16432,7 +16432,7 @@ - + @@ -16440,8 +16440,8 @@ - - + + @@ -16463,31 +16463,31 @@ - - + + - - + + - - + + - + @@ -16504,7 +16504,7 @@ - + @@ -16518,7 +16518,7 @@ - + @@ -16532,7 +16532,7 @@ - + @@ -16541,15 +16541,15 @@ - + - - + + @@ -16562,7 +16562,7 @@ - + @@ -16571,14 +16571,14 @@ - + - + - + @@ -16594,15 +16594,15 @@ - - + + - - + + @@ -16615,7 +16615,7 @@ - + @@ -16640,22 +16640,22 @@ - - + + - + - - + + @@ -16692,7 +16692,7 @@ - + @@ -16739,7 +16739,7 @@ - + @@ -16777,36 +16777,36 @@ - - + + - - + + - + - - + + - - + + @@ -16819,8 +16819,8 @@ - - + + @@ -16853,28 +16853,28 @@ - - + + - + - - + + - - + + @@ -16887,7 +16887,7 @@ - + @@ -16918,28 +16918,28 @@ - - + + - + - - + + - - + + @@ -16952,7 +16952,7 @@ - + @@ -16968,35 +16968,35 @@ - + - + - + - + - + - + @@ -17005,22 +17005,22 @@ - + - - + + - + - - + + @@ -17029,35 +17029,35 @@ - - + + - - + + - - + + - - + + - + @@ -17070,9 +17070,9 @@ - - - + + + @@ -17085,48 +17085,48 @@ - + - + - - + + - - + + - + - + - + - + @@ -17140,8 +17140,8 @@ - - + + @@ -17224,7 +17224,7 @@ - + @@ -17239,16 +17239,16 @@ - - + + - - + + @@ -17263,23 +17263,23 @@ - - + + - - + + - + @@ -17287,8 +17287,8 @@ - - + + @@ -17321,25 +17321,25 @@ - + - - + + - - + + - + @@ -17373,7 +17373,7 @@ - + @@ -17390,11 +17390,11 @@ - - + + - + @@ -17420,7 +17420,7 @@ - + @@ -17494,16 +17494,16 @@ - + - + - - + + @@ -17517,7 +17517,7 @@ - + @@ -17528,14 +17528,14 @@ - + - + @@ -17545,42 +17545,42 @@ - + - + - + - + - + - + - + @@ -17591,7 +17591,7 @@ - + @@ -17601,7 +17601,7 @@ - + @@ -17611,28 +17611,28 @@ - + - + - + - + - + @@ -17643,7 +17643,7 @@ - + @@ -17652,13 +17652,13 @@ - + - + @@ -17679,7 +17679,7 @@ - + @@ -17691,154 +17691,154 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -17858,7 +17858,7 @@ - + @@ -17866,14 +17866,14 @@ - + - + @@ -17888,7 +17888,7 @@ - + @@ -17916,7 +17916,7 @@ - + @@ -17926,15 +17926,15 @@ - + - - + + @@ -17942,7 +17942,7 @@ - + @@ -17950,8 +17950,8 @@ - + @@ -17959,8 +17959,8 @@ - + @@ -17972,9 +17972,9 @@ - + - + @@ -17999,7 +17999,7 @@ - + @@ -18008,91 +18008,91 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -18103,29 +18103,29 @@ - + - + - + - + - + @@ -18159,7 +18159,7 @@ - + @@ -18171,154 +18171,154 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -18329,27 +18329,27 @@ - + - + - + - + @@ -18361,153 +18361,153 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -18518,96 +18518,96 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -18628,7 +18628,7 @@ - + @@ -18638,91 +18638,91 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -18733,7 +18733,7 @@ - + @@ -18742,7 +18742,7 @@ - + @@ -18834,7 +18834,7 @@ - + @@ -18860,7 +18860,7 @@ - + @@ -18953,9 +18953,9 @@ - - - + + + @@ -19000,42 +19000,42 @@ - + - + - + - + - + - - + + - - + + - + - + @@ -19339,10 +19339,10 @@ - - - - + + + + @@ -19606,7 +19606,7 @@ - + @@ -19736,10 +19736,10 @@ - + - + @@ -19751,7 +19751,7 @@ - + @@ -19799,16 +19799,16 @@ - + - + @@ -19871,8 +19871,8 @@ - - + + @@ -19885,8 +19885,8 @@ - - + + @@ -19908,8 +19908,8 @@ + - @@ -20316,8 +20316,8 @@ - - + + @@ -20354,16 +20354,16 @@ - - + + - - + + diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_prof= iler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_pro= filer.so.abi index 6b4789fc..31ea116e 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 @@ -5013,92 +5013,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - - - - - - - - + + + + + + + + @@ -5131,7 +5131,7 @@ - + @@ -5144,13 +5144,13 @@ - + - + @@ -5158,24 +5158,24 @@ - + - + - + - + @@ -5183,14 +5183,14 @@ - + - + @@ -5215,31 +5215,31 @@ - + - + - + - + - + @@ -5248,7 +5248,7 @@ - + @@ -5273,21 +5273,21 @@ - + - + - + @@ -5299,34 +5299,34 @@ - + - + - + - + - + - + @@ -5336,7 +5336,7 @@ - + @@ -5349,13 +5349,13 @@ - + - + @@ -5363,24 +5363,24 @@ - + - + - + - + @@ -5388,21 +5388,21 @@ - + - + - + @@ -5420,31 +5420,31 @@ - + - + - + - + - + @@ -5453,7 +5453,7 @@ - + @@ -5466,7 +5466,7 @@ - + @@ -5481,7 +5481,7 @@ - + @@ -5494,7 +5494,7 @@ - + @@ -5506,48 +5506,48 @@ - + - + - + - + - + - + - + - + @@ -5557,7 +5557,7 @@ - + @@ -5570,13 +5570,13 @@ - + - + @@ -5584,24 +5584,24 @@ - + - + - + - + @@ -5609,27 +5609,27 @@ - + - + - + - + @@ -5647,31 +5647,31 @@ - + - + - + - + - + @@ -5680,7 +5680,7 @@ - + @@ -5693,7 +5693,7 @@ - + @@ -5708,7 +5708,7 @@ - + @@ -5727,55 +5727,55 @@ - + - + - + - + - + - + - + - + - + @@ -5785,7 +5785,7 @@ - + @@ -5798,13 +5798,13 @@ - + - + @@ -5812,24 +5812,24 @@ - + - + - + - + @@ -5837,27 +5837,27 @@ - + - + - + - + @@ -5893,39 +5893,39 @@ - + - + - + - + - + - + @@ -5937,13 +5937,13 @@ - + - + @@ -5952,7 +5952,7 @@ - + @@ -5965,7 +5965,7 @@ - + @@ -5978,14 +5978,14 @@ - - + + - - + + @@ -5996,14 +5996,14 @@ - + - + @@ -6012,14 +6012,14 @@ - + - + - + @@ -6030,20 +6030,20 @@ - + - + - + @@ -6051,14 +6051,14 @@ - + - + @@ -6080,31 +6080,31 @@ - + - + - + - + - + @@ -6117,13 +6117,13 @@ - + - + @@ -6131,7 +6131,7 @@ - + @@ -6139,7 +6139,7 @@ - + @@ -6149,7 +6149,7 @@ - + @@ -6161,31 +6161,31 @@ - + - + - + - + - + @@ -6194,7 +6194,7 @@ - + @@ -6204,7 +6204,7 @@ - + @@ -6213,7 +6213,7 @@ - + @@ -6221,7 +6221,7 @@ - + @@ -6230,7 +6230,7 @@ - + @@ -6270,7 +6270,7 @@ - + @@ -6295,7 +6295,7 @@ - + @@ -6342,13 +6342,13 @@ - + - + @@ -6356,35 +6356,35 @@ - + - + - + - + - + - + @@ -6398,13 +6398,13 @@ - + - + @@ -6412,49 +6412,49 @@ - + - + - + - + - + - + - + - + @@ -6467,13 +6467,13 @@ - + - + @@ -6481,26 +6481,26 @@ - + - + - + - + @@ -6513,7 +6513,7 @@ - + @@ -6521,9 +6521,9 @@ - + - + @@ -6533,13 +6533,13 @@ - + - + @@ -6547,14 +6547,14 @@ - + - + @@ -6567,9 +6567,9 @@ - + - + @@ -6577,20 +6577,20 @@ - + - + - + @@ -6599,27 +6599,27 @@ - + - + - + - + @@ -6658,19 +6658,19 @@ - + - + - + @@ -6682,27 +6682,27 @@ - + - - + + - + - + @@ -6710,7 +6710,7 @@ - + @@ -6735,7 +6735,7 @@ - + @@ -6758,7 +6758,7 @@ - + @@ -6796,7 +6796,7 @@ - + @@ -6804,7 +6804,7 @@ - + @@ -6813,20 +6813,20 @@ - + - + - + @@ -6835,14 +6835,14 @@ - + - + @@ -6869,33 +6869,33 @@ - + - + - + - + - + @@ -6924,20 +6924,20 @@ - + - + - + @@ -6950,8 +6950,8 @@ - - + + @@ -6963,20 +6963,20 @@ - + - + - + @@ -6994,20 +6994,20 @@ - + - + - + @@ -7032,20 +7032,20 @@ - + - + - + @@ -7070,20 +7070,20 @@ - + - + - + @@ -7096,8 +7096,8 @@ - - + + @@ -7114,34 +7114,34 @@ - + - + - + - - + + - - + + @@ -7151,13 +7151,13 @@ - + - + @@ -7171,8 +7171,8 @@ - - + + @@ -7182,13 +7182,13 @@ - + - + @@ -7202,8 +7202,8 @@ - - + + @@ -7219,13 +7219,13 @@ - + - + @@ -7239,8 +7239,8 @@ - - + + @@ -7263,13 +7263,13 @@ - + - + @@ -7282,8 +7282,8 @@ - - + + @@ -7302,20 +7302,20 @@ - - + + - + - + @@ -7365,7 +7365,7 @@ - + @@ -7378,13 +7378,13 @@ - + - + @@ -7392,24 +7392,24 @@ - + - + - + - + @@ -7417,14 +7417,14 @@ - + - + @@ -7436,14 +7436,14 @@ - + - + @@ -7452,26 +7452,26 @@ - + - + - + - + - + - + @@ -7479,24 +7479,24 @@ - + - + - + - + @@ -7504,7 +7504,7 @@ - + @@ -7517,29 +7517,29 @@ - - + + - - + + - + - + - + @@ -7552,13 +7552,13 @@ - + - + @@ -7566,24 +7566,24 @@ - + - + - + - + @@ -7591,7 +7591,7 @@ - + @@ -7604,7 +7604,7 @@ - + @@ -7612,13 +7612,13 @@ - + - + @@ -7683,8 +7683,8 @@ - - + + @@ -7715,8 +7715,8 @@ - - + + @@ -7744,7 +7744,7 @@ - + @@ -7757,10 +7757,10 @@ - + - + @@ -7887,13 +7887,13 @@ - + - + @@ -7909,20 +7909,20 @@ - + - + - + @@ -7931,20 +7931,20 @@ - + - + - + @@ -7953,20 +7953,20 @@ - + - + - + @@ -7975,20 +7975,20 @@ - + - + - + @@ -7997,20 +7997,20 @@ - + - + - + @@ -8019,13 +8019,13 @@ - + - + @@ -8143,10 +8143,10 @@ - - - - + + + + @@ -8155,10 +8155,10 @@ - - - - + + + + @@ -8167,10 +8167,10 @@ - - - - + + + + @@ -8179,10 +8179,10 @@ - - - - + + + + @@ -8197,10 +8197,10 @@ - - - - + + + + @@ -8215,10 +8215,10 @@ - - - - + + + + @@ -8227,8 +8227,8 @@ - - + + @@ -8244,9 +8244,9 @@ - - - + + + @@ -8275,10 +8275,10 @@ - - - - + + + + @@ -8302,11 +8302,11 @@ - - - - - + + + + + @@ -8316,11 +8316,11 @@ - - - - - + + + + + @@ -8570,7 +8570,7 @@ - + @@ -8581,20 +8581,20 @@ - + - + - + @@ -8659,7 +8659,7 @@ - + @@ -8669,21 +8669,21 @@ - + - - + + - + @@ -8925,11 +8925,11 @@ - + - + @@ -9157,13 +9157,13 @@ - + - + @@ -9243,13 +9243,13 @@ - + - + @@ -9806,13 +9806,13 @@ - + - + @@ -9872,13 +9872,13 @@ - + - + @@ -11968,13 +11968,13 @@ - + - + @@ -14195,13 +14195,13 @@ - + - + @@ -14261,13 +14261,13 @@ - + - + @@ -17168,8 +17168,8 @@ - - + + @@ -17320,10 +17320,10 @@ - - - - + + + + @@ -17362,10 +17362,10 @@ - - - - + + + + @@ -17412,10 +17412,10 @@ - - - - + + + + @@ -17498,13 +17498,13 @@ - + - + @@ -17679,7 +17679,7 @@ - + diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/= test-read-dwarf/test21-pr19092.so.abi index c55e6440..d0efa871 100644 --- a/tests/data/test-read-dwarf/test21-pr19092.so.abi +++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi @@ -1096,10 +1096,10 @@ - - - - + + + + @@ -1426,7 +1426,7 @@ - + @@ -1519,23 +1519,23 @@ - - - - + - + + + + @@ -2927,11 +2927,11 @@ + - + - @@ -2993,12 +2993,12 @@ - + - + @@ -5660,17 +5660,17 @@ + - + - - + + - @@ -5780,12 +5780,12 @@ - + - + @@ -5829,11 +5829,11 @@ - + - + @@ -6961,9 +6961,9 @@ - + @@ -7241,7 +7241,7 @@ - + diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.= so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.a= bi index 2ade2cff..751afce2 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 @@ -27671,8 +27671,8 @@ - - + + @@ -28136,7 +28136,7 @@ - + @@ -29168,13 +29168,13 @@ - + - + @@ -29209,168 +29209,168 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - + - + @@ -29379,103 +29379,103 @@ - + - - + + - + - - + + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - + - - + + - - + + @@ -29520,12 +29520,12 @@ - + - + @@ -29539,14 +29539,14 @@ - + - + @@ -29558,123 +29558,123 @@ - - + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - + - - - + + + - - + + - - + + - - + + - + - - - + + + - - + + - - + + @@ -29688,10 +29688,10 @@ - + - + @@ -29701,20 +29701,20 @@ - + - + - + @@ -29722,36 +29722,36 @@ - + - + - + - - + + - + - - + + @@ -29765,7 +29765,7 @@ - + @@ -29798,7 +29798,7 @@ - + @@ -29825,221 +29825,221 @@ - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - - - + + + - + - + - - - + + + - - + + - - + + - - - + + + - + - - - + + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - + - + @@ -30049,22 +30049,22 @@ - + - + - + - + @@ -30105,11 +30105,11 @@ - + - + @@ -30121,11 +30121,11 @@ - + - + @@ -30133,7 +30133,7 @@ - + @@ -48044,7 +48044,12 @@ - + + + + + + @@ -48052,11 +48057,6 @@ - - - - - @@ -59858,7 +59858,12 @@ - + + + + + + @@ -59866,11 +59871,6 @@ - - - - - diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read= -dwarf/test7.so.abi index 7de73cb8..706a74bb 100644 --- a/tests/data/test-read-dwarf/test7.so.abi +++ b/tests/data/test-read-dwarf/test7.so.abi @@ -19,11 +19,11 @@ - - + + - - + + @@ -40,7 +40,7 @@ - + @@ -51,8 +51,8 @@ - - + + diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test= -read-dwarf/test7.so.hash.abi index 8451151d..d451ff0f 100644 --- a/tests/data/test-read-dwarf/test7.so.hash.abi +++ b/tests/data/test-read-dwarf/test7.so.hash.abi @@ -19,12 +19,12 @@ + + + - - - @@ -40,7 +40,7 @@ - + @@ -52,7 +52,7 @@ - + --=20 2.39.3 --=20 =09=09Dodji