From 2cf9a18e8c3418ccc51bb70651b4aa3c7a59ae22 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Thu, 9 May 2019 15:19:05 +0200 Subject: [PATCH] Better handle several anonymous types of the same kind This is a follow-up patch for the commit: 43d56de Handle several member anonymous types of the same kind It allows support for severan anonymous types even when these are not members of a class/unions. The patch introduces the concept of a scoped name. It's a qualified name for a decl made of the name of the decl appended to the *unqualified* name of its scope. Unlike for qualified names, the scoped name won't have a "__anonymous_*__" string in its name if its directly containing scope is not anonymous; a qualified name might still have that string in its name because the decl has a parent scope (not necessarily its directly containing scope though) that is anonymous. The patch goes on to update the logic for comparison of decls that are anonymous. For a decl which direct scope is *NOT* anonymous, the scoped name is what's used in the comparison. Otherwise, only the name of the decl is used. The patch also updates how we detect changes in data members and member types, in the comparison engine. It now uses the names of the data members, rather than their qualified name. This is in the scope of the current class/union anyway. The improvement is that the fact that the class/union itself is anonymous (even if its anonymous name changes to another anonymous name) won't have any spurious impact on the detection of name change of the members. The patch considers the change of an anonymous decl name which anonymous name changes to another anonymous name as being harmless. The patch updates the logic of category propagation in the comparison engine. Although a public typedef to private underlying type needs to stay public and thus not propagate the PRIVATE_TYPE_CATEGORY from its child diff node to himself, it still needs to suppress the changes to the private underlying diff node that were suppressed (because of the private-ness), unless that typedef has local changes. * include/abg-ir.h (decl_base::get_scoped_name): Declare new member function. (scope_decl::get_num_anonymous_member_{classes, unions, enums}): Declare new virtual member functions. (class_decl::get_num_anonymous_member_{classes, unions, enums}): Adjust to make these virtual. It's not necessary but I feel redundancy is a kind of self-documentation here. * src/abg-comp-filter.cc (has_harmless_name_change): Consider anonymous name changes as harmless. * src/abg-comparison.cc (class_or_union_diff::ensure_lookup_tables_populated): Consider the names of the members rather than their qualified names. (suppression_categorization_visitor::visit_end): Suppress the changes to the private underlying diff node that were suppressed because of the private-ness, unless that typedef has local changes. * src/abg-dwarf-reader.cc (build_enum_type) (add_or_update_class_type, add_or_update_union_type): Handle anonymous types in namespaces as well, not just in class/unions. * src/abg-ir.cc (decl_base::priv::scoped_name_): Define new data member. (decl_base::get_scoped_name): Define new member function. (equals): For the decl_base overload, use scoped name in the comparison, unless the decl belongs to an anonymous type. For the class_or_union_diff, only consider scoped_name during comparison. Avoid name comparison between anonymous types. (scope_decl::get_num_anonymous_member_{classes, unions, enums}): Define new member functions. (types_have_similar_structure): Do not compare names between anonymous types. (qualified_name_setter::do_update): Update scoped names too. * tests/data/test-abidiff/test-PR18791-report0.txt: Adjust. * tests/data/test-annotate/libtest23.so.abi: Likewise. * tests/data/test-annotate/test13-pr18894.so.abi: Likewise. * tests/data/test-annotate/test14-pr18893.so.abi: Likewise. * tests/data/test-annotate/test15-pr18892.so.abi: Likewise. * tests/data/test-annotate/test21-pr19092.so.abi: Likewise. * tests/data/test-diff-dwarf/test43-PR22913-report-0.txt: Likewise. * tests/data/test-diff-dwarf/test46-rust-report-0.txt: Likewise. * tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt: Likewise. * tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt: Likewise. * tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt: Likewise. * tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt: Likewise. * tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt: Likewise. * tests/data/test-diff-filter/test33-report-0.txt: Likewise. * tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt: Likewise. * tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt: Likewise. * 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: Likewise. * tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt: Likewise. * tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt: Likewise. * tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt: Likewise. * tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt: Likewise. * tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt: Likewise. * tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi: Likewise. * tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise. * tests/data/test-read-dwarf/libtest23.so.abi: Likewise. * tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise. * tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise. * tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise. * tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise. * tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise. * tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise. * tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise. * tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise. * tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi: Likewise. * tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise. Signed-off-by: Dodji Seketeli --- include/abg-ir.h | 18 +- src/abg-comp-filter.cc | 11 +- src/abg-comparison.cc | 82 +- src/abg-dwarf-reader.cc | 18 +- src/abg-ir.cc | 148 +- tests/data/test-abidiff/test-PR18791-report0.txt | 46 +- tests/data/test-annotate/libtest23.so.abi | 8 +- tests/data/test-annotate/test13-pr18894.so.abi | 6 +- tests/data/test-annotate/test14-pr18893.so.abi | 8 +- tests/data/test-annotate/test15-pr18892.so.abi | 22 +- tests/data/test-annotate/test21-pr19092.so.abi | 1856 +-- .../test-diff-dwarf/test43-PR22913-report-0.txt | 2 +- .../data/test-diff-dwarf/test46-rust-report-0.txt | 2 - .../test30-pr18904-rvalueref-report0.txt | 67 +- .../test30-pr18904-rvalueref-report1.txt | 67 +- .../test30-pr18904-rvalueref-report2.txt | 67 +- .../test31-pr18535-libstdc++-report-0.txt | 15 +- .../test31-pr18535-libstdc++-report-1.txt | 15 +- tests/data/test-diff-filter/test33-report-0.txt | 3 + .../test35-pr18754-no-added-syms-report-0.txt | 67 +- .../test44-anonymous-data-member-report-0.txt | 20 +- ...igc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt | 44 +- .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt | 18 +- ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt | 22 +- ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt | 22 +- ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 26 +- ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt | 18 +- .../PR22015-libboost_iostreams.so.abi | 766 +- tests/data/test-read-dwarf/PR22122-libftdc.so.abi | 8145 ++++++------ tests/data/test-read-dwarf/libtest23.so.abi | 2 +- .../data/test-read-dwarf/test10-pr18818-gcc.so.abi | 132 +- tests/data/test-read-dwarf/test11-pr18828.so.abi | 10 +- tests/data/test-read-dwarf/test12-pr18844.so.abi | 12873 ++++++++++--------- tests/data/test-read-dwarf/test13-pr18894.so.abi | 2 +- tests/data/test-read-dwarf/test14-pr18893.so.abi | 4 +- tests/data/test-read-dwarf/test15-pr18892.so.abi | 22 +- tests/data/test-read-dwarf/test16-pr18904.so.abi | 32 +- tests/data/test-read-dwarf/test21-pr19092.so.abi | 1799 +-- .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 6 +- .../test-read-dwarf/test9-pr18818-clang.so.abi | 3255 ++--- 40 files changed, 15048 insertions(+), 14698 deletions(-) diff --git a/include/abg-ir.h b/include/abg-ir.h index 93a1d84..b3616e0 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -1341,6 +1341,9 @@ public: virtual const interned_string& get_qualified_name(bool internal = false) const; + virtual const interned_string& + get_scoped_name() const; + bool get_is_in_public_symbol_table() const; @@ -1510,6 +1513,15 @@ public: declarations& get_member_decls(); + virtual size_t + get_num_anonymous_member_classes() const; + + virtual size_t + get_num_anonymous_member_unions() const; + + virtual size_t + get_num_anonymous_member_enums() const; + scopes& get_member_scopes(); @@ -3621,13 +3633,13 @@ public: const member_types& get_member_types() const; - size_t + virtual size_t get_num_anonymous_member_classes() const; - size_t + virtual size_t get_num_anonymous_member_unions() const; - size_t + virtual size_t get_num_anonymous_member_enums() const; type_base_sptr diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index 1a1eb0d..6d9c592 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -420,11 +420,14 @@ has_harmless_name_change(const decl_base_sptr& f, const decl_base_sptr& s) { // So, a harmless name change is either ... return (decl_name_changed(f, s) - && (// ... a typedef name change, without having the + && (// ... an anonymous decl name changed into another + // anonymous decl name ... + (f->get_is_anonymous() && s->get_is_anonymous()) + // ... a typedef name change, without having the // underlying type changed ... - (is_typedef(f) - && is_typedef(s) - && (is_typedef(f)->get_underlying_type() + || (is_typedef(f) + && is_typedef(s) + && (is_typedef(f)->get_underlying_type() == is_typedef(s)->get_underlying_type())) // .. or a data member name change, without having its // type changed ... diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index ed5e058..2cc3c69 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -4587,8 +4587,8 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const class_or_union_sptr record_type = is_class_or_union_type(d); if (record_type && record_type->get_is_declaration_only()) continue; - string qname = d->get_qualified_name(); - priv_->deleted_member_types_[qname] = d; + string name = d->get_name(); + priv_->deleted_member_types_[name] = d; } for (vector::const_iterator it = e.insertions().begin(); @@ -4606,19 +4606,19 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const class_or_union_sptr record_type = is_class_or_union_type(d); if (record_type && record_type->get_is_declaration_only()) continue; - string qname = d->get_qualified_name(); + string name = d->get_name(); string_decl_base_sptr_map::const_iterator j = - priv_->deleted_member_types_.find(qname); + priv_->deleted_member_types_.find(name); if (j != priv_->deleted_member_types_.end()) { if (*j->second != *d) - priv_->changed_member_types_[qname] = + priv_->changed_member_types_[name] = compute_diff(j->second, d, context()); priv_->deleted_member_types_.erase(j); } else - priv_->inserted_member_types_[qname] = d; + priv_->inserted_member_types_[name] = d; } } } @@ -4632,10 +4632,10 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const { unsigned i = it->index(); decl_base_sptr d = first_class_or_union()->get_non_static_data_members()[i]; - string qname = d->get_qualified_name(); - ABG_ASSERT(priv_->deleted_data_members_.find(qname) + string name = d->get_name(); + ABG_ASSERT(priv_->deleted_data_members_.find(name) == priv_->deleted_data_members_.end()); - priv_->deleted_data_members_[qname] = d; + priv_->deleted_data_members_[name] = d; } for (vector::const_iterator it = e.insertions().begin(); @@ -4651,23 +4651,23 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const decl_base_sptr d = second_class_or_union()->get_non_static_data_members()[i]; var_decl_sptr dm = is_var_decl(d); - string qname = dm->get_qualified_name(); - ABG_ASSERT(priv_->inserted_data_members_.find(qname) + string name = dm->get_name(); + ABG_ASSERT(priv_->inserted_data_members_.find(name) == priv_->inserted_data_members_.end()); string_decl_base_sptr_map::const_iterator j = - priv_->deleted_data_members_.find(qname); + priv_->deleted_data_members_.find(name); if (j != priv_->deleted_data_members_.end()) { if (*j->second != *d) { var_decl_sptr old_dm = is_var_decl(j->second); - priv_->subtype_changed_dm_[qname]= + priv_->subtype_changed_dm_[name]= compute_diff(old_dm, dm, context()); } priv_->deleted_data_members_.erase(j); } else - priv_->inserted_data_members_[qname] = d; + priv_->inserted_data_members_[name] = d; } } @@ -4716,9 +4716,9 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const priv_->deleted_dm_by_offset_.erase(i->first); priv_->inserted_dm_by_offset_.erase(i->first); priv_->deleted_data_members_.erase - (i->second->first_var()->get_qualified_name()); + (i->second->first_var()->get_name()); priv_->inserted_data_members_.erase - (i->second->second_var()->get_qualified_name()); + (i->second->second_var()->get_name()); } } sort_string_data_member_diff_sptr_map(priv_->subtype_changed_dm_, @@ -4737,10 +4737,10 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const decl_base_sptr d = first_class_or_union()->get_member_class_templates()[i]-> as_class_tdecl(); - string qname = d->get_qualified_name(); - ABG_ASSERT(priv_->deleted_member_class_tmpls_.find(qname) + string name = d->get_name(); + ABG_ASSERT(priv_->deleted_member_class_tmpls_.find(name) == priv_->deleted_member_class_tmpls_.end()); - priv_->deleted_member_class_tmpls_[qname] = d; + priv_->deleted_member_class_tmpls_[name] = d; } for (vector::const_iterator it = e.insertions().begin(); @@ -4756,20 +4756,20 @@ class_or_union_diff::ensure_lookup_tables_populated(void) const decl_base_sptr d = second_class_or_union()->get_member_class_templates()[i]-> as_class_tdecl(); - string qname = d->get_qualified_name(); - ABG_ASSERT(priv_->inserted_member_class_tmpls_.find(qname) + string name = d->get_name(); + ABG_ASSERT(priv_->inserted_member_class_tmpls_.find(name) == priv_->inserted_member_class_tmpls_.end()); string_decl_base_sptr_map::const_iterator j = - priv_->deleted_member_class_tmpls_.find(qname); + priv_->deleted_member_class_tmpls_.find(name); if (j != priv_->deleted_member_class_tmpls_.end()) { if (*j->second != *d) - priv_->changed_member_types_[qname]= + priv_->changed_member_types_[name]= compute_diff(j->second, d, context()); priv_->deleted_member_class_tmpls_.erase(j); } else - priv_->inserted_member_class_tmpls_[qname] = d; + priv_->inserted_member_class_tmpls_[name] = d; } } } @@ -5063,10 +5063,10 @@ class_diff::ensure_lookup_tables_populated(void) const unsigned i = it->index(); class_decl::base_spec_sptr b = first_class_decl()->get_base_specifiers()[i]; - string qname = b->get_base_class()->get_qualified_name(); - ABG_ASSERT(get_priv()->deleted_bases_.find(qname) + string name = b->get_base_class()->get_name(); + ABG_ASSERT(get_priv()->deleted_bases_.find(name) == get_priv()->deleted_bases_.end()); - get_priv()->deleted_bases_[qname] = b; + get_priv()->deleted_bases_[name] = b; } for (vector::const_iterator it = e.insertions().begin(); @@ -5081,20 +5081,20 @@ class_diff::ensure_lookup_tables_populated(void) const unsigned i = *iit; class_decl::base_spec_sptr b = second_class_decl()->get_base_specifiers()[i]; - string qname = b->get_base_class()->get_qualified_name(); - ABG_ASSERT(get_priv()->inserted_bases_.find(qname) + string name = b->get_base_class()->get_name(); + ABG_ASSERT(get_priv()->inserted_bases_.find(name) == get_priv()->inserted_bases_.end()); string_base_sptr_map::const_iterator j = - get_priv()->deleted_bases_.find(qname); + get_priv()->deleted_bases_.find(name); if (j != get_priv()->deleted_bases_.end()) { if (j->second != b) - get_priv()->changed_bases_[qname] = + get_priv()->changed_bases_[name] = compute_diff(j->second, b, context()); get_priv()->deleted_bases_.erase(j); } else - get_priv()->inserted_bases_[qname] = b; + get_priv()->inserted_bases_[name] = b; } } } @@ -10857,6 +10857,24 @@ struct suppression_categorization_visitor : public diff_node_visitor if (canonical_diff != d) canonical_diff->add_to_category(PRIVATE_TYPE_CATEGORY); } + + // If the underlying type of a typedef is private and carries + // changes (that are implicitely suppressed because it's + // private) then the typedef must be suppressed too, so that + // those changes to the underlying type are not seen. + if (is_typedef_diff(d) + && !d->has_local_changes() + && has_private_child + && has_non_empty_child) + { + d->add_to_category(SUPPRESSED_CATEGORY|PRIVATE_TYPE_CATEGORY); + // If a node was suppressed, all the other nodes of its class + // of equivalence are suppressed too. + diff *canonical_diff = d->get_canonical_diff(); + if (canonical_diff != d) + canonical_diff->add_to_category + (SUPPRESSED_CATEGORY|PRIVATE_TYPE_CATEGORY); + } } } }; //end struct suppression_categorization_visitor diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index a6f51b9..a4ab1b7 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -13466,10 +13466,8 @@ build_enum_type(read_context& ctxt, // But we remember that the type is anonymous. enum_is_anonymous = true; - if (class_or_union * cl = is_class_or_union_type(scope)) - if (size_t s = cl->get_num_anonymous_member_enums()) - // TODO: handle anonymous enums in non-class scopes. - name = build_internal_anonymous_die_name(name, s); + if (size_t s = scope->get_num_anonymous_member_enums()) + name = build_internal_anonymous_die_name(name, s); } bool use_odr = ctxt.odr_is_relevant(die); @@ -13979,10 +13977,8 @@ add_or_update_class_type(read_context& ctxt, // But we remember that the type is anonymous. is_anonymous = true; - if (class_or_union * cl = is_class_or_union_type(scope)) - if (size_t s = cl->get_num_anonymous_member_classes()) - // TODO: handle anonymous classes in non-class scopes. - name = build_internal_anonymous_die_name(name, s); + if (size_t s = scope->get_num_anonymous_member_classes()) + name = build_internal_anonymous_die_name(name, s); } if (!is_anonymous) @@ -14330,10 +14326,8 @@ add_or_update_union_type(read_context& ctxt, // But we remember that the type is anonymous. is_anonymous = true; - if (class_or_union *cl = is_class_or_union_type(scope)) - if (size_t s = cl->get_num_anonymous_member_unions()) - // TODO: handle anonymous unions in non-class scopes. - name = build_internal_anonymous_die_name(name, s); + if (size_t s = scope->get_num_anonymous_member_unions()) + name = build_internal_anonymous_die_name(name, s); } // If the type has location, then associate it to its diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 55c588f..c139ee6 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -2891,7 +2891,17 @@ struct decl_base::priv // canonicalized. Once the type is canonicalized, the cached use is // the data member qualified_parent_name_ above. interned_string temporary_qualified_name_; + // This is the fully qualified name of the decl. It contains the + // name of the decl and the qualified name of its scope. So if in + // the parent scopes of the decl, there is one anonymous struct, + // somewhere in the name, there is going to by an + // __anonymous_struct__ string, even if the anonymous struct is not + // the direct containing scope of this decl. interned_string qualified_name_; + // Unline qualified_name_, scoped_name_ contains the name of the + // decl and the name of its scope; not the qualified name of the + // scope. + interned_string scoped_name_; interned_string linkage_name_; visibility visibility_; @@ -3253,7 +3263,14 @@ string decl_base::get_pretty_representation(bool internal) const {return get_qualified_name(internal);} -/// Compute the qualified name of the decl. +/// Return the qualified name of the decl. +/// +/// This is the fully qualified name of the decl. It's made of the +/// concatenation of the name of the decl with the qualified name of +/// its scope. +/// +/// Note that the value returned by this function is computed by @ref +/// update_qualified_name when the decl is added to its scope. /// /// @param internal set to true if the call is intended for an /// internal use (for technical use inside the library itself), false @@ -3265,6 +3282,20 @@ const interned_string& decl_base::get_qualified_name(bool /*internal*/) const {return priv_->qualified_name_;} +/// Return the scoped name of the decl. +/// +/// This is made of the concatenation of the name of the decl with the +/// name of its scope. It doesn't contain the qualified name of its +/// scope, unlike what is returned by decl_base::get_qualified_name. +/// +/// Note that the value returned by this function is computed by @ref +/// update_qualified_name when the decl is added to its scope. +/// +/// @return the scoped name of the decl. +const interned_string& +decl_base::get_scoped_name() const +{return priv_->scoped_name_;} + change_kind operator|(change_kind l, change_kind r) { @@ -3341,7 +3372,25 @@ equals(const decl_base& l, const decl_base& r, change_kind* k) } } - if (l.get_qualified_name() != r.get_qualified_name()) + // This is the name of the decls that we want to compare. The kind + // of name we want to consider depends on if the containing scopes + // are anonymous or not. + interned_string ln = l.get_scoped_name(), rn = r.get_scoped_name(); + scope_decl *lscope = l.get_scope(), *rscope = r.get_scope(); + if (// If the two scopes are anonymous then only consider the name + // of the decl, not its scope name. This is because the two + // scope (internal) names might be different even though they + // are both anonymous. In that case, the internal name of the + // scope is irrelevant so we want to ignore it. + lscope && lscope->get_is_anonymous() + && rscope && rscope->get_is_anonymous()) + { + ln = l.get_name(); + rn = r.get_name(); + } + + if (!l.get_is_anonymous() && !r.get_is_anonymous() + && ln != rn) { result = false; if (k) @@ -5048,6 +5097,60 @@ scope_decl::declarations& scope_decl::get_member_decls() {return priv_->members_;} +/// Getter for the number of anonymous classes contained in this +/// scope. +/// +/// @return the number of anonymous classes contained in this scope. +size_t +scope_decl::get_num_anonymous_member_classes() const +{ + int result = 0; + for (declarations::const_iterator it = get_member_decls().begin(); + it != get_member_decls().end(); + ++it) + if (class_decl_sptr t = is_class_type(*it)) + if (t->get_is_anonymous()) + ++result; + + return result; +} + +/// Getter for the number of anonymous unions contained in this +/// scope. +/// +/// @return the number of anonymous unions contained in this scope. +size_t +scope_decl::get_num_anonymous_member_unions() const +{ + int result = 0; + for (declarations::const_iterator it = get_member_decls().begin(); + it != get_member_decls().end(); + ++it) + if (union_decl_sptr t = is_union_type(*it)) + if (t->get_is_anonymous()) + ++result; + + return result; +} + +/// Getter for the number of anonymous enums contained in this +/// scope. +/// +/// @return the number of anonymous enums contained in this scope. +size_t +scope_decl::get_num_anonymous_member_enums() const +{ + int result = 0; + for (declarations::const_iterator it = get_member_decls().begin(); + it != get_member_decls().end(); + ++it) + if (enum_type_decl_sptr t = is_enum_type(*it)) + if (t->get_is_anonymous()) + ++result; + + return result; +} + /// Getter for the scopes carried by the current scope. /// /// @return the scopes carried by the current scope. @@ -17201,7 +17304,7 @@ class_or_union::get_num_anonymous_member_unions() const size_t class_or_union::get_num_anonymous_member_enums() const { - int result = 0; + int result = 0; for (member_types::const_iterator it = get_member_types().begin(); it != get_member_types().end(); ++it) @@ -17614,10 +17717,12 @@ equals(const class_or_union& l, const class_or_union& r, change_kind* k) if (!def1 || !def2) { - if (l.get_environment()->decl_only_class_equals_definition()) + if (l.get_environment()->decl_only_class_equals_definition() + && !l.get_is_anonymous() + && !r.get_is_anonymous()) { - const interned_string& q1 = l.get_qualified_name(); - const interned_string& q2 = r.get_qualified_name(); + const interned_string& q1 = l.get_scoped_name(); + const interned_string& q2 = r.get_scoped_name(); if (q1 == q2) // Not using RETURN(true) here, because that causes // performance issues. We don't need to do @@ -21227,7 +21332,8 @@ types_have_similar_structure(const type_base* first, const type_base* second) if (ty2 == 0) return false; - if (ty1->get_name() != ty2->get_name()) + if (!ty1->get_is_anonymous() && !ty2->get_is_anonymous() + && ty1->get_name() != ty2->get_name()) return false; if (!was_indirect_type) @@ -21262,7 +21368,8 @@ types_have_similar_structure(const type_base* first, const type_base* second) if (ty2 == 0) return false; - if (ty1->get_name() != ty2->get_name()) + if (!ty1->get_is_anonymous() && !ty2->get_is_anonymous() + && ty1->get_name() != ty2->get_name()) return false; if (!was_indirect_type) @@ -21842,8 +21949,8 @@ fns_to_str(vector::const_iterator a_begin, namespace { -/// Update the qualified parent name and qualified name of a tree decl -/// node. +/// Update the qualified parent name, qualified name and scoped name +/// of a tree decl node. /// /// @return true if the tree walking should continue, false otherwise. /// @@ -21852,22 +21959,33 @@ bool qualified_name_setter::do_update(abigail::ir::decl_base* d) { std::string parent_qualified_name; - if (abigail::ir::scope_decl* parent = d->get_scope()) + abigail::ir::scope_decl* parent = d->get_scope(); + if (parent) d->priv_->qualified_parent_name_ = parent->get_qualified_name(); else d->priv_->qualified_parent_name_ = abigail::interned_string(); + abigail::environment* env = d->get_environment(); + ABG_ASSERT(env); if (!d->priv_->qualified_parent_name_.empty()) { if (d->get_name().empty()) d->priv_->qualified_name_ = abigail::interned_string(); else - { - abigail::environment* env = d->get_environment(); - ABG_ASSERT(env); d->priv_->qualified_name_ = env->intern(d->priv_->qualified_parent_name_ + "::" + d->get_name()); - } + } + + if (d->priv_->scoped_name_.empty()) + { + if (parent + && !parent->get_is_anonymous() + && !parent->get_name().empty()) + d->priv_->scoped_name_ = + env->intern(parent->get_name() + "::" + d->get_name()); + else + d->priv_->scoped_name_ = + env->intern(d->get_name()); } if (!is_scope_decl(d)) diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt index 0d31743..d5f1e52 100644 --- a/tests/data/test-abidiff/test-PR18791-report0.txt +++ b/tests/data/test-abidiff/test-PR18791-report0.txt @@ -32,10 +32,30 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable underlying type 'class std::list >' changed: type name changed from 'std::list >' to 'std::__cxx11::list >' type size changed from 128 to 192 (in bits) - 1 base class deletion: - class std::_List_base > - 1 base class insertion: - class std::__cxx11::_List_base > + 1 base class change: + 'class std::_List_base >' changed: + type name changed from 'std::_List_base >' to 'std::__cxx11::_List_base >' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::_List_base >::_List_impl std::_List_base >::_M_impl' changed: + type name changed from 'std::_List_base >::_List_impl' to 'std::__cxx11::_List_base >::_List_impl' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::__detail::_List_node_base std::_List_base >::_List_impl::_M_node' changed: + type name changed from 'std::__detail::_List_node_base' to 'std::_List_node' + type size changed from 128 to 192 (in bits) + 1 base class insertion: + struct std::__detail::_List_node_base + 2 data member deletions: + 'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits) + + 'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits) + + 1 data member insertion: + 'unsigned long int std::_List_node::_M_data', at offset 128 (in bits) + and name of 'std::_List_base >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base >::_List_impl::_M_node' + and name of 'std::_List_base >::_M_impl' changed to 'std::__cxx11::_List_base >::_M_impl' + 'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits) @@ -103,10 +123,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable type of 'std::list > sigc::internal::signal_impl::slots_' changed: type name changed from 'std::list >' to 'std::__cxx11::list >' type size changed from 128 to 192 (in bits) - 1 base class deletion: - class std::_List_base > - 1 base class insertion: - class std::__cxx11::_List_base > + 1 base class change: + 'class std::_List_base >' changed: + type name changed from 'std::_List_base >' to 'std::__cxx11::_List_base >' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::_List_base >::_List_impl std::_List_base >::_M_impl' changed: + type name changed from 'std::_List_base >::_List_impl' to 'std::__cxx11::_List_base >::_List_impl' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::__detail::_List_node_base std::_List_base >::_List_impl::_M_node' changed: + details were reported earlier + and name of 'std::_List_base >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base >::_List_impl::_M_node' + and name of 'std::_List_base >::_M_impl' changed to 'std::__cxx11::_List_base >::_M_impl' + [C]'method sigc::signal_base::iterator_type sigc::signal_base::insert(sigc::signal_base::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes: diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi index c117a7b..287bdf2 100644 --- a/tests/data/test-annotate/libtest23.so.abi +++ b/tests/data/test-annotate/libtest23.so.abi @@ -859,12 +859,12 @@ - - + + - + - + diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi index f9ec5f2..6c666dc 100644 --- a/tests/data/test-annotate/test13-pr18894.so.abi +++ b/tests/data/test-annotate/test13-pr18894.so.abi @@ -1400,14 +1400,14 @@ - - + + - + diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi index 317cb44..97a0096 100644 --- a/tests/data/test-annotate/test14-pr18893.so.abi +++ b/tests/data/test-annotate/test14-pr18893.so.abi @@ -1112,7 +1112,7 @@ - + @@ -1124,7 +1124,7 @@ - + @@ -1217,7 +1217,7 @@ - + @@ -1230,7 +1230,7 @@ - + diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi index b9d3a7f..ba5d051 100644 --- a/tests/data/test-annotate/test15-pr18892.so.abi +++ b/tests/data/test-annotate/test15-pr18892.so.abi @@ -40767,7 +40767,7 @@ - + @@ -40797,7 +40797,7 @@ - + @@ -40810,7 +40810,7 @@ - + @@ -40825,7 +40825,7 @@ - + @@ -40845,7 +40845,7 @@ - + @@ -40865,7 +40865,7 @@ - + @@ -40913,7 +40913,7 @@ - + @@ -40924,21 +40924,21 @@ - + - + - + @@ -40949,7 +40949,7 @@ - + diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi index d267f0b..c38fc5e 100644 --- a/tests/data/test-annotate/test21-pr19092.so.abi +++ b/tests/data/test-annotate/test21-pr19092.so.abi @@ -2163,7 +2163,7 @@ - + @@ -2173,23 +2173,23 @@ - - + + - + - + - + @@ -2232,7 +2232,7 @@ - + @@ -2247,8 +2247,8 @@ - - + + @@ -2265,7 +2265,7 @@ - + @@ -4202,6 +4202,24 @@ + + + + + + + + + + + + + + + + + + @@ -4502,14 +4520,14 @@ - + - + - + @@ -4533,18 +4551,18 @@ - + - + - + - + @@ -4560,36 +4578,36 @@ - + - + - + - + - + - + - + - + - + - - + + @@ -4601,7 +4619,7 @@ - + @@ -4640,7 +4658,7 @@ - + @@ -4649,7 +4667,7 @@ - + @@ -4667,14 +4685,14 @@ - - + + - + @@ -4711,7 +4729,7 @@ - + @@ -4727,14 +4745,14 @@ - + - + @@ -4776,13 +4794,13 @@ - + - + - + @@ -4861,9 +4879,9 @@ - + - + @@ -4895,28 +4913,28 @@ - + - + - + - + - + - + @@ -4927,10 +4945,10 @@ - + - + @@ -4987,11 +5005,11 @@ - + - + @@ -5005,13 +5023,13 @@ - + - + - + @@ -5020,13 +5038,13 @@ - + - + - + @@ -5052,11 +5070,11 @@ - + - + @@ -5077,16 +5095,16 @@ - + - + - + @@ -5133,13 +5151,13 @@ - + - + - + @@ -5147,51 +5165,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -5206,19 +5224,19 @@ - + - + - + - + @@ -5244,7 +5262,7 @@ - + @@ -5255,7 +5273,7 @@ - + @@ -5264,7 +5282,7 @@ - + @@ -5275,7 +5293,7 @@ - + @@ -5291,7 +5309,7 @@ - + @@ -5300,7 +5318,7 @@ - + @@ -5316,7 +5334,7 @@ - + @@ -5325,11 +5343,11 @@ - + - + @@ -5338,7 +5356,7 @@ - + @@ -5349,7 +5367,7 @@ - + @@ -5362,7 +5380,7 @@ - + @@ -5382,21 +5400,21 @@ - + - + - + - + - + @@ -5406,19 +5424,19 @@ - + - + - + - + @@ -5426,31 +5444,31 @@ - + - + - + - + - + - + - + @@ -5462,23 +5480,23 @@ - + - + - + - + - + @@ -5490,7 +5508,7 @@ - + @@ -5510,11 +5528,11 @@ - + - + @@ -5526,11 +5544,11 @@ - + - + @@ -5542,7 +5560,7 @@ - + @@ -5550,23 +5568,23 @@ - + - + - + - + - + @@ -5578,15 +5596,15 @@ - + - + - + @@ -5598,31 +5616,31 @@ - + - + - + - + - + - + - + @@ -5630,7 +5648,7 @@ - + @@ -5646,7 +5664,7 @@ - + @@ -5654,11 +5672,11 @@ - + - + @@ -5666,9 +5684,9 @@ - + - + @@ -5691,7 +5709,7 @@ - + @@ -5707,11 +5725,11 @@ - + - + @@ -5719,7 +5737,7 @@ - + @@ -5743,15 +5761,15 @@ - + - + - + @@ -5762,13 +5780,13 @@ - + - + - + - + @@ -5787,23 +5805,23 @@ - + - + - + - + - + @@ -5839,16 +5857,16 @@ - + - + - + - + - + @@ -5872,40 +5890,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -5913,17 +5931,17 @@ - + - + - + - + - + - + @@ -5982,49 +6000,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6037,20 +6055,20 @@ - + - + - + - + @@ -6060,48 +6078,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6116,41 +6134,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6162,14 +6180,14 @@ - + - + - + - + @@ -6181,7 +6199,7 @@ - + @@ -6193,11 +6211,11 @@ - + - + @@ -6209,147 +6227,147 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + - + - + + + - + - + - + - - - + - + + + - + - + - + - + - - - + - + + + - + - + - + - + @@ -6361,7 +6379,7 @@ - + @@ -6377,28 +6395,28 @@ - + - + - + - + - + - + - + - + - + - + @@ -6410,15 +6428,15 @@ - + - + - + - + @@ -6444,7 +6462,7 @@ - + @@ -6612,7 +6630,7 @@ - + @@ -6624,7 +6642,7 @@ - + @@ -6664,14 +6682,14 @@ - + - + @@ -6687,7 +6705,7 @@ - + @@ -6695,7 +6713,7 @@ - + @@ -6714,14 +6732,14 @@ - + - + - + - + @@ -6733,7 +6751,7 @@ - + @@ -6743,17 +6761,17 @@ - - + + - - - + + + - + - + @@ -6761,7 +6779,7 @@ - + @@ -6781,11 +6799,11 @@ - + - + @@ -6794,41 +6812,41 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -6837,11 +6855,11 @@ - + - + @@ -6850,11 +6868,11 @@ - + - + @@ -6863,21 +6881,21 @@ - + - + - + @@ -6886,7 +6904,7 @@ - + @@ -6895,23 +6913,23 @@ - + - + - + - + - + @@ -6925,7 +6943,7 @@ - + @@ -6936,7 +6954,7 @@ - + @@ -6945,7 +6963,7 @@ - + @@ -6958,18 +6976,18 @@ - + - + - + - + @@ -6978,7 +6996,7 @@ - + @@ -6990,14 +7008,14 @@ - + - + @@ -7011,20 +7029,20 @@ - + - + - + - + - + @@ -7033,7 +7051,7 @@ - + @@ -7080,72 +7098,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7153,98 +7171,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7256,52 +7274,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -7317,7 +7335,7 @@ - + @@ -7333,7 +7351,7 @@ - + @@ -7345,7 +7363,7 @@ - + @@ -7354,41 +7372,41 @@ - + - + - + - + - + - + - + - + - + - + @@ -7405,51 +7423,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7458,32 +7476,32 @@ - + - + - + - + - + - + - + - + - + @@ -7494,49 +7512,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -7546,14 +7564,14 @@ - + - + - + @@ -7562,16 +7580,16 @@ - + - + - + - + @@ -7583,15 +7601,15 @@ - + - + - + @@ -7600,14 +7618,14 @@ - + - + @@ -7616,14 +7634,14 @@ - + - + - + - + @@ -7631,20 +7649,20 @@ - + - + - + - + @@ -7657,7 +7675,7 @@ - + @@ -7666,14 +7684,14 @@ - + - + @@ -7682,7 +7700,7 @@ - + @@ -7691,7 +7709,7 @@ - + @@ -7700,14 +7718,14 @@ - + - + @@ -7720,17 +7738,17 @@ - + - + - + @@ -7739,7 +7757,7 @@ - + @@ -7756,92 +7774,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7850,7 +7868,7 @@ - + @@ -7859,7 +7877,7 @@ - + @@ -7868,7 +7886,7 @@ - + @@ -7877,7 +7895,7 @@ - + @@ -7886,7 +7904,7 @@ - + @@ -7896,14 +7914,14 @@ - + - + @@ -7914,16 +7932,16 @@ - + - + - + @@ -7939,7 +7957,7 @@ - + @@ -7948,7 +7966,7 @@ - + @@ -7968,7 +7986,7 @@ - + @@ -7978,20 +7996,20 @@ - + - + - + @@ -8002,7 +8020,7 @@ - + @@ -8011,16 +8029,16 @@ - + - + - + @@ -8029,32 +8047,32 @@ - + - + - + - + - + - + - + - + @@ -8063,7 +8081,7 @@ - + @@ -8072,14 +8090,14 @@ - + - + - + @@ -8093,9 +8111,9 @@ - + - + @@ -8108,7 +8126,7 @@ - + @@ -8191,93 +8209,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -8286,7 +8304,7 @@ - + @@ -8295,7 +8313,7 @@ - + @@ -8306,28 +8324,28 @@ - + - + - + - + @@ -8338,14 +8356,14 @@ - + - + @@ -8354,11 +8372,11 @@ - + - + - + @@ -8367,28 +8385,28 @@ - + - + - + - + - + - + @@ -8397,7 +8415,7 @@ - + @@ -8434,7 +8452,7 @@ - + @@ -8461,9 +8479,9 @@ - + - + @@ -8473,48 +8491,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -8533,29 +8551,29 @@ - + - + - + - + - + - + - + @@ -8571,7 +8589,7 @@ - + @@ -8583,7 +8601,7 @@ - + @@ -8620,7 +8638,7 @@ - + @@ -8632,15 +8650,15 @@ - + - + - + @@ -8678,7 +8696,7 @@ - + @@ -8691,23 +8709,23 @@ - + - + - + - + @@ -8718,7 +8736,7 @@ - + @@ -8727,29 +8745,29 @@ - + - + - + - + - + - + - + - + @@ -8760,7 +8778,7 @@ - + @@ -8772,10 +8790,10 @@ - + - + @@ -8787,7 +8805,7 @@ - + @@ -8798,29 +8816,29 @@ - + - + - + - + - + - + @@ -8836,7 +8854,7 @@ - + @@ -8845,25 +8863,25 @@ - + - + - + - + - + @@ -8878,12 +8896,12 @@ - + - + @@ -8892,15 +8910,15 @@ - + - + - + @@ -8908,30 +8926,30 @@ - + - + - + - + - + - + - + @@ -8942,7 +8960,7 @@ - + @@ -8950,9 +8968,9 @@ - + - + @@ -8977,14 +8995,14 @@ - + - + @@ -8995,7 +9013,7 @@ - + @@ -9004,20 +9022,20 @@ - + - + - + - + @@ -9028,7 +9046,7 @@ - + @@ -9037,7 +9055,7 @@ - + @@ -9046,7 +9064,7 @@ - + @@ -9059,9 +9077,9 @@ - + - + @@ -9070,9 +9088,9 @@ - + - + @@ -9085,7 +9103,7 @@ - + @@ -9101,53 +9119,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9156,9 +9174,9 @@ - + - + @@ -9167,21 +9185,21 @@ - + - + - + - + - + @@ -9193,50 +9211,50 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -9245,14 +9263,14 @@ - + - + @@ -9261,7 +9279,7 @@ - + @@ -9269,13 +9287,13 @@ - + - + - + @@ -9295,7 +9313,7 @@ - + @@ -9312,16 +9330,16 @@ - + - + - + @@ -9344,37 +9362,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -9487,18 +9505,18 @@ - + - + - + - + @@ -9573,58 +9591,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9635,14 +9653,14 @@ - + - + - + @@ -9661,52 +9679,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -9714,18 +9732,18 @@ - + - + - + - + @@ -9733,14 +9751,14 @@ - + - + - + @@ -9759,11 +9777,11 @@ - + - + @@ -9777,11 +9795,11 @@ - + - + - + @@ -9792,35 +9810,35 @@ - + - + - + - + - + - + - + @@ -9830,7 +9848,7 @@ - + @@ -9841,38 +9859,38 @@ - + - + - + - + - + - + - + - + - + @@ -9891,7 +9909,7 @@ - + @@ -9903,7 +9921,7 @@ - + @@ -9919,7 +9937,7 @@ - + @@ -9927,41 +9945,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -9972,11 +9990,11 @@ - + - + @@ -9989,7 +10007,7 @@ - + @@ -10000,7 +10018,7 @@ - + @@ -10011,7 +10029,7 @@ - + @@ -10022,33 +10040,33 @@ - + - + - + - + - + - + - + - + @@ -10059,7 +10077,7 @@ - + @@ -10072,30 +10090,30 @@ - + - + - + - + - + - + - + @@ -10103,33 +10121,33 @@ - + - + - + - + - + - + - + - + - + @@ -10142,7 +10160,7 @@ - + @@ -10153,14 +10171,14 @@ - + - + @@ -10512,20 +10530,20 @@ - + - + - + @@ -10550,7 +10568,7 @@ - + @@ -10621,7 +10639,7 @@ - + @@ -10629,7 +10647,7 @@ - + @@ -10657,7 +10675,7 @@ - + @@ -10665,13 +10683,13 @@ - + - + - + - + @@ -10690,64 +10708,64 @@ - + - + - + - + - + - + - + - + - + - + - + - - - + - + - + - + - + + + - + - + @@ -10757,7 +10775,7 @@ - + @@ -10818,12 +10836,12 @@ - + - + @@ -10834,7 +10852,7 @@ - + @@ -10845,7 +10863,7 @@ - + @@ -10854,7 +10872,7 @@ - + @@ -10865,7 +10883,7 @@ - + @@ -10885,33 +10903,33 @@ - + - + - + - + - + - + - + - + @@ -10920,7 +10938,7 @@ - + @@ -10939,10 +10957,10 @@ - + - + @@ -10950,22 +10968,22 @@ - + - + - + - + @@ -10980,7 +10998,7 @@ - + @@ -10991,18 +11009,18 @@ - + - + - + - + - + @@ -11062,48 +11080,48 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -11118,7 +11136,7 @@ - + @@ -11137,7 +11155,7 @@ - + @@ -11170,19 +11188,19 @@ - + - + - + - + - + - + @@ -11210,13 +11228,13 @@ - + - + - + diff --git a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt index 6a803a2..345f7e9 100644 --- a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt +++ b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt @@ -5,7 +5,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable [C]'function char f1(Struct1Ptr)' has some indirect sub-type changes: parameter 1 of type 'typedef Struct1Ptr' has sub-type changes: - underlying type '__anonymous_struct__*' changed: + underlying type '__anonymous_struct__1*' changed: in pointed to type 'struct {char m1; char m2;}': type size changed from 16 to 8 (in bits) 1 data member deletion: diff --git a/tests/data/test-diff-dwarf/test46-rust-report-0.txt b/tests/data/test-diff-dwarf/test46-rust-report-0.txt index 87544b6..c31efd4 100644 --- a/tests/data/test-diff-dwarf/test46-rust-report-0.txt +++ b/tests/data/test-diff-dwarf/test46-rust-report-0.txt @@ -10,8 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable type size changed from 32 to 64 (in bits) 1 data member insertion: 'u32 two::Foo::b', at offset 32 (in bits) - 1 data member change: - name of 'one::Foo::a' changed to 'two::Foo::a' parameter 2 of type 'u32' was added diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt index f93f25b..d35b958 100644 --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt @@ -1175,31 +1175,31 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen 6 functions with some indirect sub-type change: [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes: - parameter 1 of type 'typedef error_types' has sub-type changes: + parameter 1 of type 'typedef error_types' changed: underlying type 'enum __anonymous_enum__' changed: type size hasn't changed 21 enumerator insertions: - '__anonymous_enum__::c_process_set_cache_size' value '32' - '__anonymous_enum__::c_bad_ptr_mem_alloc' value '56' - '__anonymous_enum__::c_incorrect_affinity' value '69' - '__anonymous_enum__::c_cannot_set_affinity' value '70' - '__anonymous_enum__::c_report_myosupportsfeature' value '127' - '__anonymous_enum__::c_report_myosharedarenacreate' value '128' - '__anonymous_enum__::c_report_myosharedalignedarenamalloc' value '129' - '__anonymous_enum__::c_report_myosharedalignedarenafree' value '130' - '__anonymous_enum__::c_report_myoarenaacquire' value '131' - '__anonymous_enum__::c_report_myoarenarelease' value '132' - '__anonymous_enum__::c_in_with_preallocated' value '134' - '__anonymous_enum__::c_report_no_host_exe' value '135' - '__anonymous_enum__::c_report_path_buff_overflow' value '136' - '__anonymous_enum__::c_create_pipeline_for_stream' value '137' - '__anonymous_enum__::c_offload_no_stream' value '138' - '__anonymous_enum__::c_get_engine_info' value '139' - '__anonymous_enum__::c_clear_cpu_mask' value '140' - '__anonymous_enum__::c_set_cpu_mask' value '141' - '__anonymous_enum__::c_report_state_stream' value '142' - '__anonymous_enum__::c_report_stream' value '143' - '__anonymous_enum__::c_unload_library' value '144' + '__anonymous_enum__1::c_process_set_cache_size' value '32' + '__anonymous_enum__1::c_bad_ptr_mem_alloc' value '56' + '__anonymous_enum__1::c_incorrect_affinity' value '69' + '__anonymous_enum__1::c_cannot_set_affinity' value '70' + '__anonymous_enum__1::c_report_myosupportsfeature' value '127' + '__anonymous_enum__1::c_report_myosharedarenacreate' value '128' + '__anonymous_enum__1::c_report_myosharedalignedarenamalloc' value '129' + '__anonymous_enum__1::c_report_myosharedalignedarenafree' value '130' + '__anonymous_enum__1::c_report_myoarenaacquire' value '131' + '__anonymous_enum__1::c_report_myoarenarelease' value '132' + '__anonymous_enum__1::c_in_with_preallocated' value '134' + '__anonymous_enum__1::c_report_no_host_exe' value '135' + '__anonymous_enum__1::c_report_path_buff_overflow' value '136' + '__anonymous_enum__1::c_create_pipeline_for_stream' value '137' + '__anonymous_enum__1::c_offload_no_stream' value '138' + '__anonymous_enum__1::c_get_engine_info' value '139' + '__anonymous_enum__1::c_clear_cpu_mask' value '140' + '__anonymous_enum__1::c_set_cpu_mask' value '141' + '__anonymous_enum__1::c_report_state_stream' value '142' + '__anonymous_enum__1::c_report_stream' value '143' + '__anonymous_enum__1::c_unload_library' value '144' 92 enumerator changes: '__anonymous_enum__::c_process_get_func_handles' from value '32' to '33' @@ -1300,31 +1300,24 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen parameter 1 of type 'VarDesc*' has sub-type changes: in pointed to type 'struct VarDesc': type size hasn't changed - 2 data member changes: + 1 data member changes (1 filtered): type of 'union {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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed: type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags' type size hasn't changed - 1 data member deletion: - '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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}' + 1 data member changes (1 filtered): + anonymous data member at offset 0 (in bits) changed from: + 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 alloc_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 preallocated; 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; uint32_t always_delete; uint32_t pin;} - 1 data member insertion: - 'struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; 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; uint32_t always_delete; uint32_t pin;}' - no data member change (1 filtered); - - while looking at anonymous data member 'union {int64_t count; int64_t disp;}': - the internal name of that anonymous data memberchanged from: - VarDesc::__anonymous_union__3 - to: - VarDesc::__anonymous_union__2 - This is usually due to an anonymous member type being added or removed from the containing type [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes: parameter 1 of type 'InitTableEntry*' changed: in pointed to type 'struct InitTableEntry': entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' - type name changed from 'InitTableEntry' to '__anonymous_struct__' + type name changed from 'InitTableEntry' to '__anonymous_struct__2' type size hasn't changed 1 data member change: @@ -1332,7 +1325,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen in pointed to type 'function type void ()': parameter 1 of type 'typedef MyoArena' was added - and name of 'InitTableEntry::func' changed to '__anonymous_struct__::func' + and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes: parameter 1 of type 'typedef OFFLOAD' has sub-type changes: diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt index 83d2761..9bc7612 100644 --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt @@ -1175,31 +1175,31 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen 6 functions with some indirect sub-type change: [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes: - parameter 1 of type 'typedef error_types' has sub-type changes: + parameter 1 of type 'typedef error_types' changed: underlying type 'enum __anonymous_enum__' at liboffload_error_codes.h:38:1 changed: type size hasn't changed 21 enumerator insertions: - '__anonymous_enum__::c_process_set_cache_size' value '32' - '__anonymous_enum__::c_bad_ptr_mem_alloc' value '56' - '__anonymous_enum__::c_incorrect_affinity' value '69' - '__anonymous_enum__::c_cannot_set_affinity' value '70' - '__anonymous_enum__::c_report_myosupportsfeature' value '127' - '__anonymous_enum__::c_report_myosharedarenacreate' value '128' - '__anonymous_enum__::c_report_myosharedalignedarenamalloc' value '129' - '__anonymous_enum__::c_report_myosharedalignedarenafree' value '130' - '__anonymous_enum__::c_report_myoarenaacquire' value '131' - '__anonymous_enum__::c_report_myoarenarelease' value '132' - '__anonymous_enum__::c_in_with_preallocated' value '134' - '__anonymous_enum__::c_report_no_host_exe' value '135' - '__anonymous_enum__::c_report_path_buff_overflow' value '136' - '__anonymous_enum__::c_create_pipeline_for_stream' value '137' - '__anonymous_enum__::c_offload_no_stream' value '138' - '__anonymous_enum__::c_get_engine_info' value '139' - '__anonymous_enum__::c_clear_cpu_mask' value '140' - '__anonymous_enum__::c_set_cpu_mask' value '141' - '__anonymous_enum__::c_report_state_stream' value '142' - '__anonymous_enum__::c_report_stream' value '143' - '__anonymous_enum__::c_unload_library' value '144' + '__anonymous_enum__1::c_process_set_cache_size' value '32' + '__anonymous_enum__1::c_bad_ptr_mem_alloc' value '56' + '__anonymous_enum__1::c_incorrect_affinity' value '69' + '__anonymous_enum__1::c_cannot_set_affinity' value '70' + '__anonymous_enum__1::c_report_myosupportsfeature' value '127' + '__anonymous_enum__1::c_report_myosharedarenacreate' value '128' + '__anonymous_enum__1::c_report_myosharedalignedarenamalloc' value '129' + '__anonymous_enum__1::c_report_myosharedalignedarenafree' value '130' + '__anonymous_enum__1::c_report_myoarenaacquire' value '131' + '__anonymous_enum__1::c_report_myoarenarelease' value '132' + '__anonymous_enum__1::c_in_with_preallocated' value '134' + '__anonymous_enum__1::c_report_no_host_exe' value '135' + '__anonymous_enum__1::c_report_path_buff_overflow' value '136' + '__anonymous_enum__1::c_create_pipeline_for_stream' value '137' + '__anonymous_enum__1::c_offload_no_stream' value '138' + '__anonymous_enum__1::c_get_engine_info' value '139' + '__anonymous_enum__1::c_clear_cpu_mask' value '140' + '__anonymous_enum__1::c_set_cpu_mask' value '141' + '__anonymous_enum__1::c_report_state_stream' value '142' + '__anonymous_enum__1::c_report_stream' value '143' + '__anonymous_enum__1::c_unload_library' value '144' 92 enumerator changes: '__anonymous_enum__::c_process_get_func_handles' from value '32' to '33' at liboffload_error_codes.h:38:1 @@ -1300,31 +1300,24 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen parameter 1 of type 'VarDesc*' has sub-type changes: in pointed to type 'struct VarDesc' at offload_common.h:254:1: type size hasn't changed - 2 data member changes: + 1 data member changes (1 filtered): type of 'union {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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed: type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags' type size hasn't changed - 1 data member deletion: - '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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}' + 1 data member changes (1 filtered): + anonymous data member at offset 0 (in bits) changed from: + 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 alloc_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 preallocated; 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; uint32_t always_delete; uint32_t pin;} - 1 data member insertion: - 'struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; 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; uint32_t always_delete; uint32_t pin;}' - no data member change (1 filtered); - - while looking at anonymous data member 'union {int64_t count; int64_t disp;}': - the internal name of that anonymous data memberchanged from: - VarDesc::__anonymous_union__3 - to: - VarDesc::__anonymous_union__2 - This is usually due to an anonymous member type being added or removed from the containing type [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes: parameter 1 of type 'InitTableEntry*' changed: in pointed to type 'struct InitTableEntry' at offload_table.h:296:1: entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1 - type name changed from 'InitTableEntry' to '__anonymous_struct__' + type name changed from 'InitTableEntry' to '__anonymous_struct__2' type size hasn't changed 1 data member change: @@ -1332,7 +1325,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen in pointed to type 'function type void ()': parameter 1 of type 'typedef MyoArena' was added - and name of 'InitTableEntry::func' changed to '__anonymous_struct__::func' at offload_table.h:295:1 + and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1 [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes: parameter 1 of type 'typedef OFFLOAD' has sub-type changes: diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt index 43a4c75..2b6aaec 100644 --- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt +++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt @@ -1175,31 +1175,31 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen 6 functions with some indirect sub-type change: [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes: - parameter 1 of type 'typedef error_types' has sub-type changes: + parameter 1 of type 'typedef error_types' changed: underlying type 'enum __anonymous_enum__' at liboffload_error_codes.h:38:1 changed: type size hasn't changed 21 enumerator insertions: - '__anonymous_enum__::c_process_set_cache_size' value '32' - '__anonymous_enum__::c_bad_ptr_mem_alloc' value '56' - '__anonymous_enum__::c_incorrect_affinity' value '69' - '__anonymous_enum__::c_cannot_set_affinity' value '70' - '__anonymous_enum__::c_report_myosupportsfeature' value '127' - '__anonymous_enum__::c_report_myosharedarenacreate' value '128' - '__anonymous_enum__::c_report_myosharedalignedarenamalloc' value '129' - '__anonymous_enum__::c_report_myosharedalignedarenafree' value '130' - '__anonymous_enum__::c_report_myoarenaacquire' value '131' - '__anonymous_enum__::c_report_myoarenarelease' value '132' - '__anonymous_enum__::c_in_with_preallocated' value '134' - '__anonymous_enum__::c_report_no_host_exe' value '135' - '__anonymous_enum__::c_report_path_buff_overflow' value '136' - '__anonymous_enum__::c_create_pipeline_for_stream' value '137' - '__anonymous_enum__::c_offload_no_stream' value '138' - '__anonymous_enum__::c_get_engine_info' value '139' - '__anonymous_enum__::c_clear_cpu_mask' value '140' - '__anonymous_enum__::c_set_cpu_mask' value '141' - '__anonymous_enum__::c_report_state_stream' value '142' - '__anonymous_enum__::c_report_stream' value '143' - '__anonymous_enum__::c_unload_library' value '144' + '__anonymous_enum__1::c_process_set_cache_size' value '32' + '__anonymous_enum__1::c_bad_ptr_mem_alloc' value '56' + '__anonymous_enum__1::c_incorrect_affinity' value '69' + '__anonymous_enum__1::c_cannot_set_affinity' value '70' + '__anonymous_enum__1::c_report_myosupportsfeature' value '127' + '__anonymous_enum__1::c_report_myosharedarenacreate' value '128' + '__anonymous_enum__1::c_report_myosharedalignedarenamalloc' value '129' + '__anonymous_enum__1::c_report_myosharedalignedarenafree' value '130' + '__anonymous_enum__1::c_report_myoarenaacquire' value '131' + '__anonymous_enum__1::c_report_myoarenarelease' value '132' + '__anonymous_enum__1::c_in_with_preallocated' value '134' + '__anonymous_enum__1::c_report_no_host_exe' value '135' + '__anonymous_enum__1::c_report_path_buff_overflow' value '136' + '__anonymous_enum__1::c_create_pipeline_for_stream' value '137' + '__anonymous_enum__1::c_offload_no_stream' value '138' + '__anonymous_enum__1::c_get_engine_info' value '139' + '__anonymous_enum__1::c_clear_cpu_mask' value '140' + '__anonymous_enum__1::c_set_cpu_mask' value '141' + '__anonymous_enum__1::c_report_state_stream' value '142' + '__anonymous_enum__1::c_report_stream' value '143' + '__anonymous_enum__1::c_unload_library' value '144' 92 enumerator changes: '__anonymous_enum__::c_process_get_func_handles' from value '32' to '33' at liboffload_error_codes.h:38:1 @@ -1300,31 +1300,24 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen parameter 1 of type 'VarDesc*' has sub-type changes: in pointed to type 'struct VarDesc' at offload_common.h:254:1: type size hasn't changed - 2 data member changes: + 1 data member changes (1 filtered): type of 'union {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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed: type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags' type size hasn't changed - 1 data member deletion: - '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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}' + 1 data member changes (1 filtered): + anonymous data member at offset 0 (in bytes) changed from: + 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 alloc_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 preallocated; 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; uint32_t always_delete; uint32_t pin;} - 1 data member insertion: - 'struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; 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; uint32_t always_delete; uint32_t pin;}' - no data member change (1 filtered); - - while looking at anonymous data member 'union {int64_t count; int64_t disp;}': - the internal name of that anonymous data memberchanged from: - VarDesc::__anonymous_union__3 - to: - VarDesc::__anonymous_union__2 - This is usually due to an anonymous member type being added or removed from the containing type [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes: parameter 1 of type 'InitTableEntry*' changed: in pointed to type 'struct InitTableEntry' at offload_table.h:296:1: entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1 - type name changed from 'InitTableEntry' to '__anonymous_struct__' + type name changed from 'InitTableEntry' to '__anonymous_struct__2' type size hasn't changed 1 data member change: @@ -1332,7 +1325,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen in pointed to type 'function type void ()': parameter 1 of type 'typedef MyoArena' was added - and name of 'InitTableEntry::func' changed to '__anonymous_struct__::func' at offload_table.h:295:1 + and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1 [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes: parameter 1 of type 'typedef OFFLOAD' has sub-type changes: 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 57dbe4d..b106d94 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 @@ -1,4 +1,4 @@ -Functions changes summary: 0 Removed, 3 Changed (62 filtered out), 13 Added functions +Functions changes summary: 0 Removed, 2 Changed (63 filtered out), 13 Added functions Variables changes summary: 0 Removed, 0 Changed, 0 Added variable Function symbols changes summary: 0 Removed, 0 Added function symbol not referenced by debug info Variable symbols changes summary: 0 Removed, 6 Added variable symbols not referenced by debug info @@ -25,7 +25,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere 'function std::unexpected_handler std::get_unexpected()' 'method std::regex_error::regex_error(std::regex_constants::error_type)' -3 functions with some indirect sub-type change: +2 functions with some indirect sub-type change: [C]'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes: return type changed: @@ -48,17 +48,6 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere 'std::regex_constants::error_type::_S_error_last' value '13' - [C]'method std::random_device* std::random_device::_M_init(const std::string&)' has some indirect sub-type changes: - return type changed: - in pointed to type 'class std::random_device': - type size hasn't changed - 1 data member change: - anonymous data member at offset 0 (in bits) changed from: - union {FILE* _M_file; std::mt19937 _M_mt;} - to: - union {void* _M_file; std::mt19937 _M_mt;} - - 6 Added variable symbols not referenced by debug info: 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 5caec64..89d6ca7 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 @@ -1,4 +1,4 @@ -Functions changes summary: 0 Removed, 3 Changed (62 filtered out), 13 Added functions +Functions changes summary: 0 Removed, 2 Changed (63 filtered out), 13 Added functions Variables changes summary: 0 Removed, 0 Changed, 0 Added variable Function symbols changes summary: 0 Removed, 0 Added function symbol not referenced by debug info Variable symbols changes summary: 0 Removed, 6 Added variable symbols not referenced by debug info @@ -25,7 +25,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere 'function std::unexpected_handler std::get_unexpected()' 'method std::regex_error::regex_error(std::regex_constants::error_type)' -3 functions with some indirect sub-type change: +2 functions with some indirect sub-type change: [C]'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes: return type changed: @@ -48,17 +48,6 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere 'std::regex_constants::error_type::_S_error_last' value '13' - [C]'method std::random_device* std::random_device::_M_init(const std::string&)' at random.h:1634:1 has some indirect sub-type changes: - return type changed: - in pointed to type 'class std::random_device' at random.h:1577:1: - type size hasn't changed - 1 data member change: - anonymous data member at offset 0 (in bits) changed from: - union {FILE* _M_file; std::mt19937 _M_mt;} - to: - union {void* _M_file; std::mt19937 _M_mt;} - - 6 Added variable symbols not referenced by debug info: diff --git a/tests/data/test-diff-filter/test33-report-0.txt b/tests/data/test-diff-filter/test33-report-0.txt index e69de29..433f950 100644 --- a/tests/data/test-diff-filter/test33-report-0.txt +++ b/tests/data/test-diff-filter/test33-report-0.txt @@ -0,0 +1,3 @@ +Functions changes summary: 0 Removed, 0 Changed (16 filtered out), 0 Added functions +Variables changes summary: 0 Removed, 0 Changed, 0 Added variable + diff --git 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 index b33226b..f0f512d 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 @@ -91,31 +91,31 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen 6 functions with some indirect sub-type change: [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes: - parameter 1 of type 'typedef error_types' has sub-type changes: + parameter 1 of type 'typedef error_types' changed: underlying type 'enum __anonymous_enum__' changed: type size hasn't changed 21 enumerator insertions: - '__anonymous_enum__::c_process_set_cache_size' value '32' - '__anonymous_enum__::c_bad_ptr_mem_alloc' value '56' - '__anonymous_enum__::c_incorrect_affinity' value '69' - '__anonymous_enum__::c_cannot_set_affinity' value '70' - '__anonymous_enum__::c_report_myosupportsfeature' value '127' - '__anonymous_enum__::c_report_myosharedarenacreate' value '128' - '__anonymous_enum__::c_report_myosharedalignedarenamalloc' value '129' - '__anonymous_enum__::c_report_myosharedalignedarenafree' value '130' - '__anonymous_enum__::c_report_myoarenaacquire' value '131' - '__anonymous_enum__::c_report_myoarenarelease' value '132' - '__anonymous_enum__::c_in_with_preallocated' value '134' - '__anonymous_enum__::c_report_no_host_exe' value '135' - '__anonymous_enum__::c_report_path_buff_overflow' value '136' - '__anonymous_enum__::c_create_pipeline_for_stream' value '137' - '__anonymous_enum__::c_offload_no_stream' value '138' - '__anonymous_enum__::c_get_engine_info' value '139' - '__anonymous_enum__::c_clear_cpu_mask' value '140' - '__anonymous_enum__::c_set_cpu_mask' value '141' - '__anonymous_enum__::c_report_state_stream' value '142' - '__anonymous_enum__::c_report_stream' value '143' - '__anonymous_enum__::c_unload_library' value '144' + '__anonymous_enum__1::c_process_set_cache_size' value '32' + '__anonymous_enum__1::c_bad_ptr_mem_alloc' value '56' + '__anonymous_enum__1::c_incorrect_affinity' value '69' + '__anonymous_enum__1::c_cannot_set_affinity' value '70' + '__anonymous_enum__1::c_report_myosupportsfeature' value '127' + '__anonymous_enum__1::c_report_myosharedarenacreate' value '128' + '__anonymous_enum__1::c_report_myosharedalignedarenamalloc' value '129' + '__anonymous_enum__1::c_report_myosharedalignedarenafree' value '130' + '__anonymous_enum__1::c_report_myoarenaacquire' value '131' + '__anonymous_enum__1::c_report_myoarenarelease' value '132' + '__anonymous_enum__1::c_in_with_preallocated' value '134' + '__anonymous_enum__1::c_report_no_host_exe' value '135' + '__anonymous_enum__1::c_report_path_buff_overflow' value '136' + '__anonymous_enum__1::c_create_pipeline_for_stream' value '137' + '__anonymous_enum__1::c_offload_no_stream' value '138' + '__anonymous_enum__1::c_get_engine_info' value '139' + '__anonymous_enum__1::c_clear_cpu_mask' value '140' + '__anonymous_enum__1::c_set_cpu_mask' value '141' + '__anonymous_enum__1::c_report_state_stream' value '142' + '__anonymous_enum__1::c_report_stream' value '143' + '__anonymous_enum__1::c_unload_library' value '144' 92 enumerator changes: '__anonymous_enum__::c_process_get_func_handles' from value '32' to '33' @@ -216,31 +216,24 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen parameter 1 of type 'VarDesc*' has sub-type changes: in pointed to type 'struct VarDesc': type size hasn't changed - 2 data member changes: + 1 data member changes (1 filtered): type of 'union {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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed: type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags' type size hasn't changed - 1 data member deletion: - '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 alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}' + 1 data member changes (1 filtered): + anonymous data member at offset 0 (in bits) changed from: + 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 alloc_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 preallocated; 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; uint32_t always_delete; uint32_t pin;} - 1 data member insertion: - 'struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; 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; uint32_t always_delete; uint32_t pin;}' - no data member change (1 filtered); - - while looking at anonymous data member 'union {int64_t count; int64_t disp;}': - the internal name of that anonymous data memberchanged from: - VarDesc::__anonymous_union__3 - to: - VarDesc::__anonymous_union__2 - This is usually due to an anonymous member type being added or removed from the containing type [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes: parameter 1 of type 'InitTableEntry*' changed: in pointed to type 'struct InitTableEntry': entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' - type name changed from 'InitTableEntry' to '__anonymous_struct__' + type name changed from 'InitTableEntry' to '__anonymous_struct__2' type size hasn't changed 1 data member change: @@ -248,7 +241,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen in pointed to type 'function type void ()': parameter 1 of type 'typedef MyoArena' was added - and name of 'InitTableEntry::func' changed to '__anonymous_struct__::func' + and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes: parameter 1 of type 'typedef OFFLOAD' has sub-type changes: diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt index d533b1c..cc3b267 100644 --- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt +++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt @@ -1,30 +1,18 @@ -Functions changes summary: 0 Removed, 2 Changed, 0 Added functions +Functions changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added functions Variables changes summary: 0 Removed, 0 Changed, 0 Added variable -2 functions with some indirect sub-type change: +1 function with some indirect sub-type change: [C]'function int bar(S2*)' at test44-anonymous-data-member-v1.c:26:1 has some indirect sub-type changes: parameter 1 of type 'S2*' has sub-type changes: in pointed to type 'struct S2' at test44-anonymous-data-member-v1.c:11:1: type size changed from 128 to 160 (in bits) - 1 data member change: - 'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits) - 1 data member change: + 2 data member changes: anonymous data member at offset 32 (in bits) changed from: struct {int b; float c;} to: struct {int b; float c; char e;} - - [C]'function int foo(S1*)' at test44-anonymous-data-member-v1.c:22:1 has some indirect sub-type changes: - parameter 1 of type 'S1*' has sub-type changes: - in pointed to type 'struct S1' at test44-anonymous-data-member-v1.c:1:1: - type size hasn't changed - 1 data member change: - anonymous data member at offset 32 (in bits) changed from: - union {int b; float c;} - to: - union {int b; float c; char e;} - + 'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits) diff --git 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 index fa978bc..385f918 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 @@ -38,10 +38,30 @@ underlying type 'class std::list >' changed: type name changed from 'std::list >' to 'std::__cxx11::list >' type size changed from 128 to 192 (in bits) - 1 base class deletion: - class std::_List_base > - 1 base class insertion: - class std::__cxx11::_List_base > + 1 base class change: + 'class std::_List_base >' changed: + type name changed from 'std::_List_base >' to 'std::__cxx11::_List_base >' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::_List_base >::_List_impl std::_List_base >::_M_impl' changed: + type name changed from 'std::_List_base >::_List_impl' to 'std::__cxx11::_List_base >::_List_impl' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::__detail::_List_node_base std::_List_base >::_List_impl::_M_node' changed: + type name changed from 'std::__detail::_List_node_base' to 'std::_List_node' + type size changed from 128 to 192 (in bits) + 1 base class insertion: + struct std::__detail::_List_node_base + 2 data member deletions: + 'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits) + + 'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits) + + 1 data member insertion: + 'unsigned long int std::_List_node::_M_data', at offset 128 (in bits) + and name of 'std::_List_base >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base >::_List_impl::_M_node' + and name of 'std::_List_base >::_M_impl' changed to 'std::__cxx11::_List_base >::_M_impl' + 'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits) @@ -57,10 +77,18 @@ type of 'std::list > sigc::internal::signal_impl::slots_' changed: type name changed from 'std::list >' to 'std::__cxx11::list >' type size changed from 128 to 192 (in bits) - 1 base class deletion: - class std::_List_base > - 1 base class insertion: - class std::__cxx11::_List_base > + 1 base class change: + 'class std::_List_base >' changed: + type name changed from 'std::_List_base >' to 'std::__cxx11::_List_base >' + type size changed from 128 to 192 (in bits) + 1 data member change: + type of 'std::_List_base >::_List_impl std::_List_base >::_M_impl' changed: + type name changed from 'std::_List_base >::_List_impl' to 'std::__cxx11::_List_base >::_List_impl' + type size changed from 128 to 192 (in bits) + 1 data member change: + name of 'std::_List_base >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base >::_List_impl::_M_node' + and name of 'std::_List_base >::_M_impl' changed to 'std::__cxx11::_List_base >::_M_impl' + diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt index c87590e..9b78ca9 100644 --- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt +++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt @@ -6,20 +6,20 @@ [C]'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2199:1 has some indirect sub-type changes: parameter 2 of type 'typedef SECOidTag' has sub-type changes: - underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed: + underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed: type size hasn't changed 1 enumerator insertion: - '__anonymous_enum__::SEC_OID_TLS_ECDHE_PSK' value '347' + '__anonymous_enum__1::SEC_OID_TLS_ECDHE_PSK' value '347' 1 enumerator change: - '__anonymous_enum__::SEC_OID_TOTAL' from value '347' to '348' at secoidt.h:34:1 + '__anonymous_enum__1::SEC_OID_TOTAL' from value '347' to '348' at secoidt.h:34:1 ================ end of changes of 'libnss3.so'=============== ================ changes of 'libssl3.so'=============== - Functions changes summary: 0 Removed, 2 Changed (7 filtered out), 1 Added functions + Functions changes summary: 0 Removed, 2 Changed (12 filtered out), 1 Added functions Variables changes summary: 0 Removed, 1 Changed, 0 Added variable 1 Added function: @@ -33,7 +33,7 @@ underlying type 'enum __anonymous_enum__' at sslt.h:38:1 changed: type size hasn't changed 1 enumerator insertion: - '__anonymous_enum__::ssl_kea_ecdh_psk' value '5' + '__anonymous_enum__1::ssl_kea_ecdh_psk' value '5' 1 enumerator change: '__anonymous_enum__::ssl_kea_size' from value '5' to '6' at sslt.h:40:1 @@ -46,7 +46,7 @@ type size hasn't changed 1 data member insertion: 'SSLAuthType SSLCipherSuiteInfoStr::authType', at offset 736 (in bits) at sslt.h:250:1 - 1 data member changes (1 filtered): + 1 data member changes (3 filtered): type of 'SSLAuthType SSLCipherSuiteInfoStr::authAlgorithm' changed: underlying type 'enum __anonymous_enum__' at sslt.h:87:1 changed: type size hasn't changed @@ -110,13 +110,13 @@ type size hasn't changed 1 data member change: type of 'SECOidTag SECOidDataStr::offset' changed: - underlying type 'enum __anonymous_enum__' at secoidt.h:34:1 changed: + underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed: type size hasn't changed 1 enumerator insertion: - '__anonymous_enum__::SEC_OID_TLS_ECDHE_PSK' value '347' + '__anonymous_enum__1::SEC_OID_TLS_ECDHE_PSK' value '347' 1 enumerator change: - '__anonymous_enum__::SEC_OID_TOTAL' from value '347' to '348' at secoidt.h:34:1 + '__anonymous_enum__1::SEC_OID_TOTAL' from value '347' to '348' at secoidt.h:34:1 diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt index 364f2e2..4fd9139 100644 --- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt +++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt @@ -22,18 +22,18 @@ [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes: return type changed: typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1 - underlying type 'enum __anonymous_enum__' at spice.h:471:1 changed: - type name changed from '__anonymous_enum__' to 'SpiceImageCompression' + underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed: + type name changed from '__anonymous_enum__2' to 'SpiceImageCompression' type size hasn't changed 7 enumerator deletions: - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_INVALID' value '0' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_OFF' value '1' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_QUIC' value '4' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_GLZ' value '5' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_LZ' value '6' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_INVALID' value '0' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_OFF' value '1' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_QUIC' value '4' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_GLZ' value '5' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_LZ' value '6' 9 enumerator insertions: 'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_INVALID' value '0' @@ -50,8 +50,8 @@ [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes: parameter 2 of type 'typedef spice_image_compression_t' changed: typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1 - underlying type 'enum __anonymous_enum__' at spice.h:471:1 changed: - enum type 'enum __anonymous_enum__' changed at spice.h:471:1, as reported earlier + underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed: + enum type 'enum __anonymous_enum__2' changed at spice.h:471:1, as reported earlier diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt index 364f2e2..4fd9139 100644 --- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt +++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt @@ -22,18 +22,18 @@ [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes: return type changed: typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1 - underlying type 'enum __anonymous_enum__' at spice.h:471:1 changed: - type name changed from '__anonymous_enum__' to 'SpiceImageCompression' + underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed: + type name changed from '__anonymous_enum__2' to 'SpiceImageCompression' type size hasn't changed 7 enumerator deletions: - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_INVALID' value '0' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_OFF' value '1' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_QUIC' value '4' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_GLZ' value '5' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_LZ' value '6' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_INVALID' value '0' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_OFF' value '1' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_QUIC' value '4' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_GLZ' value '5' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_LZ' value '6' 9 enumerator insertions: 'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_INVALID' value '0' @@ -50,8 +50,8 @@ [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes: parameter 2 of type 'typedef spice_image_compression_t' changed: typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1 - underlying type 'enum __anonymous_enum__' at spice.h:471:1 changed: - enum type 'enum __anonymous_enum__' changed at spice.h:471:1, as reported earlier + underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed: + enum type 'enum __anonymous_enum__2' changed at spice.h:471:1, as reported earlier diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.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 3831e0f..d1ef267 100644 --- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.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 @@ -60,7 +60,7 @@ in pointed to type 'typedef SpiceServer' at spice-server.h:38:1: underlying type 'struct RedsState' at reds-private.h:127:1 changed: type size hasn't changed - 2 data member changes: + 2 data member changes (1 filtered): type of 'VDIPortState RedsState::agent_state' changed: underlying type 'struct VDIPortState' at reds-private.h:46:1 changed: type size hasn't changed @@ -107,7 +107,7 @@ in pointed to type 'typedef RedChannelClient' at red_channel.h:131:1: underlying type 'struct RedChannelClient' at red_channel.h:247:1 changed: type size hasn't changed - 1 data member changes (1 filtered): + 1 data member changes (3 filtered): type of 'RedsStream* RedChannelClient::stream' changed: in pointed to type 'typedef RedsStream' at reds_stream.h:31:1: underlying type 'struct RedsStream' at reds.h:68:1 changed: @@ -330,18 +330,18 @@ [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes: return type changed: typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1 - underlying type 'enum __anonymous_enum__' at spice.h:471:1 changed: - type name changed from '__anonymous_enum__' to 'SpiceImageCompression' + underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed: + type name changed from '__anonymous_enum__2' to 'SpiceImageCompression' type size hasn't changed 7 enumerator deletions: - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_INVALID' value '0' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_OFF' value '1' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_QUIC' value '4' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_GLZ' value '5' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_LZ' value '6' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_INVALID' value '0' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_OFF' value '1' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_QUIC' value '4' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_GLZ' value '5' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_LZ' value '6' 9 enumerator insertions: 'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_INVALID' value '0' @@ -388,8 +388,8 @@ [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes: parameter 2 of type 'typedef spice_image_compression_t' changed: typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1 - underlying type 'enum __anonymous_enum__' at spice.h:471:1 changed: - enum type 'enum __anonymous_enum__' changed at spice.h:471:1, as reported earlier + underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed: + enum type 'enum __anonymous_enum__2' changed at spice.h:471:1, as reported earlier diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.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 5cdbc77..75ba0a5 100644 --- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.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 @@ -19,18 +19,18 @@ Leaf changes summary: 11 artifacts changed (7 filtered out) [A] 'function void spice_server_set_playback_rate(SpicePlaybackInstance*, uint32_t)' {spice_server_set_playback_rate@@SPICE_SERVER_0.12.5} [A] 'function void spice_server_set_record_rate(SpiceRecordInstance*, uint32_t)' {spice_server_set_record_rate@@SPICE_SERVER_0.12.5} - 'enum __anonymous_enum__ at spice.h:471:1' changed: - type name changed from '__anonymous_enum__' to 'SpiceImageCompression' + 'enum __anonymous_enum__2 at spice.h:471:1' changed: + type name changed from '__anonymous_enum__2' to 'SpiceImageCompression' type size hasn't changed 7 enumerator deletions: - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_INVALID' value '0' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_OFF' value '1' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_QUIC' value '4' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_GLZ' value '5' - '__anonymous_enum__::SPICE_IMAGE_COMPRESS_LZ' value '6' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_INVALID' value '0' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_OFF' value '1' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_GLZ' value '2' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_AUTO_LZ' value '3' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_QUIC' value '4' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_GLZ' value '5' + '__anonymous_enum__2::SPICE_IMAGE_COMPRESS_LZ' value '6' 9 enumerator insertions: 'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_INVALID' value '0' diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi index c7a77f0..29551b7 100644 --- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi +++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi @@ -1387,7 +1387,7 @@ - + @@ -2499,7 +2499,7 @@ - + @@ -2773,8 +2773,8 @@ - - + + @@ -2796,7 +2796,7 @@ - + @@ -2804,11 +2804,11 @@ - + - + @@ -2819,16 +2819,16 @@ - - + + - + - + @@ -2856,22 +2856,22 @@ - - + + - + - + - + @@ -2879,10 +2879,10 @@ - + - + @@ -2910,185 +2910,185 @@ - + - + - + - + - + - - + + - + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - - + + + - + - + - + - - + + - + - - + + - - + + - + - - + + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + - - - + + + @@ -3101,16 +3101,16 @@ - - - + + + - + @@ -3145,14 +3145,14 @@ - - - + + + - + - - + + @@ -3160,10 +3160,10 @@ - - + + - + @@ -3172,18 +3172,18 @@ - - + + - + - - + + - + - + @@ -3191,44 +3191,44 @@ - - + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + - + @@ -3238,75 +3238,75 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - - + + - + @@ -3314,10 +3314,10 @@ - - + + - + @@ -3376,83 +3376,83 @@ - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - - + + + + - - - + + + - - + + - - + + - + - + @@ -3572,51 +3572,51 @@ - - + + - + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + @@ -3666,10 +3666,10 @@ - + - + @@ -3685,10 +3685,10 @@ - + - + @@ -3721,48 +3721,48 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -3770,62 +3770,62 @@ - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -3833,14 +3833,14 @@ - - - + + + - - - + + + @@ -3849,16 +3849,16 @@ - - - - + + + + - - - - + + + + @@ -3866,14 +3866,14 @@ - - - + + + - - - + + + @@ -3881,14 +3881,14 @@ - - - + + + - - - + + + @@ -3896,25 +3896,25 @@ - - - + + + - - - + + + - + - + @@ -3922,23 +3922,23 @@ - - + + - - + + - + - + @@ -3946,11 +3946,11 @@ - + - + @@ -3958,47 +3958,47 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -4006,11 +4006,11 @@ - + - + @@ -4019,23 +4019,23 @@ - + - + - - + + - - + + @@ -4043,29 +4043,29 @@ - - - + + + - - - + + + - + - - - + + + - - - + + + @@ -4073,56 +4073,56 @@ - - - + + + - - - + + + - + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - - + + @@ -4130,14 +4130,14 @@ - + - + - + - + @@ -4145,75 +4145,75 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - + @@ -4222,9 +4222,9 @@ - - - + + + diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi index 1867a03..2fde01b 100644 --- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi +++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi @@ -249,20 +249,20 @@ - + - + - + @@ -270,69 +270,69 @@ - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -376,302 +376,302 @@ - + - + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - + - - - + + + - - - + + + - + - + - + - + - + - - + + - - - - + + + + - - - - + + + + - - - + + + - + - + - - + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - + - - - + + + - + - + - - + + - - + + - + - + @@ -679,581 +679,582 @@ - + - + - + - + - - + + - + - - - + + + - + - - + + - + - - + + - - + + - + - - + + - - - - + + + + - + - - + + - + - + - + - - - + + + - + - - - + + + - + - + - + - + - - - + + + - - + + - - + + - + - + - - + + - + - + + - - + - + - - - + + + - + - - + + - + - + - - + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - - + + - + - + + - + - + - - + + - + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - + - - - + + + - - + + - - + + - + - - + + - + - - - - + + + + - + - - - - + + + + - + - + - + - - + + - - + + - + - + - + - + - + - + - - + + + - - + - + - - + + - + - - + + - + - + - + - - + + - + - - - + + + - + - - - + + + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - - - + + + - + - - + + - + - - + + - - + + - + - + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - + + + + - - + + - - + + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - + - + - - + + - - - + + + - + - - - - + + + + - - + + - - + + @@ -1261,1834 +1262,1831 @@ - - - + + + - + - + - + - + - - + + - - - + + + - + - + - + - + - + - + - + - - - + + + - - - - + + + + + + - - - + + + - - - + - + - - - - + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - - - + + + + - - - + + + + - - + - - - + + + - - - + + + - - - + + + - - + + - + - - + + - + - - + + - + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - + + - - + + - - + + - - - - - + + + + + + - - + - - + + - - - + + + - + - - + + - + - - - + + + - - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - - + + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - - + + + + - + - - - - + + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + + + - - - - + + - - - + + + - - + + - - - + + + - + - + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - - - + + + + + - - - + + - + - + + - - + - + - - + + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - + + + - + - - + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - + + + - - + + - + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - + - - - - + + + + - - + + - - - + + + - - + + - - - - - + + + + + - - + + - + - + - + - + - - - + + + - - + + - - + + - - + + - - - + + + - + - + - + - - + + - - - - - + + + + + - - + + - + - - + + - + - + - - + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - - - + + + - - + + - - + + - + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - - - - + + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - + + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - - - - + + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - + + + - + - + - - - - - - - + + + + @@ -3104,22 +3102,22 @@ - - + + - + - + @@ -3139,306 +3137,306 @@ - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + + - + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - + - + - + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - + - - - + + + - - + + - - + + - - + + - + + - - + - - - - + + + + - - + + - - + - - - - + + + + - - + + - - + + - + - - + + @@ -3446,313 +3444,313 @@ - - + + - - + + - - - + + + - - + + - + - + - - + + - + - - + + - + - - + + - - - + + + - + - + - - - + + + - - - + + + - - + + - - + + - + - + - - + + - + - - - - + + + + - + - - + + - + - + - + - + - - + + - + - - + + - - + + - - + + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - - - + + + - + - - + + - + - + - + - + - + - - + + - + - - + + - + - - + + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - - - + + + - + - - - + + + @@ -3760,217 +3758,228 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - - + + + + - + - - - - + + + + - - + + - - + - + + - + - - - + + + - - + + + + + + + - - + + - - + + - - + + - + - - + + - - + + + + + + + - - - + + + - - + + - - - - + + + + - - - - - + + + + + - - + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4003,37 +4012,41 @@ - + - + - + - + - + - + - + - - - + + + + + + + - - + + @@ -4041,27 +4054,27 @@ - - + + - + - + - + - + - + - - - + + + @@ -4070,259 +4083,259 @@ - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + - - - - - - + + + - - - - - - - - + + + + - - - - + + + + + + + + + + - + - - + + - - + + - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - + + - - + + - - + + - + - + - + - + - + - - + + - + - - - + + + - - - - + + + + - - - + + + - - + + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - - + + - + - + - + - - + + - + - - - + + + - + - - + + - - + + - + - - + + - + - + - + - + @@ -4338,327 +4351,327 @@ - + - - + + - + - - + + - + - - - - - - - - - - - - - + + + - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - + + + - + - - + + - + - + - - - + + + + + + + + + + - + - - - + + + - - + + - + - + + - - + - - + + - + - - + + - + - + - + - + - - - + + + - + - - - + + + - - - + + + - - - - - - + + + + + + - - + + - - + + - - - - + + + + - - - - + + + + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - + - + - - - + + + - + - - + + - + - - - + + + - + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - - - + + + + - + - - + + - - + + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -4675,625 +4688,626 @@ - + - + - - - + + + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - - - - + + + + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - + - - - + + + - - - - + + + + - + - + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - - - + + + - + - - - - - + + + + + - + - + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - + - - + + - + - - - + + + - + - + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - - + + - + - + - + - - + + - - - - + + + + - + - - - - + + + + - - + + - - + + - + - + - + - - + + - - + + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + - + - + - - - + + + - + - - + + - + - - - + + + - + - + - - + + - - + + - - + + + - - + + - - + + - - + + - + - - - + + + - - + + - - + + - + - + - + - + - - - + + + - + - + - + - + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - + - + - + - - + + @@ -5301,185 +5315,191 @@ - + - - + + - - - + + + - + - + - + - - + + - + - - + + - + - + - + - + - - - - - - - + + + + + + + + + + + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - - + + - + - + - - + + + - - - - + + + + - - - + + + - + - - + + @@ -5489,65 +5509,66 @@ - + - - - + + + - - - + + + - - - + + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5564,49 +5585,52 @@ - + - + - - - - - - - - - - - - + + + + + + + - + - + - + - + - + + + + + + + + + + - - - - - - + + + + + @@ -5616,650 +5640,655 @@ - - - - - - - - - - - - - - - - + + + + + - - - - + + + + - - - - - + + + + - - - + + + + + + + + + + - - - - - - + + + + - - - - + + + - - - - - - - + + + + - - - - - + + + + + + + + + + + + + - - - - + + + + - - - + + + + - + - + - + - + - - - + - + + + + + + + + - - - - + + + - - - - - - + + + + - - - - + + + + + - - - - - - - - - - + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - + + + + + - + + + + - + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + - - - + + - - - - + + + + - - - - + + + + - + - - + + - - + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - + - + - - - - - - + + + + + + - - - + + + - + - - - - - + + + + + - + - + - + - + - + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - - - - - + + + + + - - - - - + + + + + - + - + - - - + + + - - - + + + - + - + - - - - - - - - - - - - + + + + + + + - + - - - - - - + + + + + + + + + + + + - - - + + + - + - - - + + + - + - - + - + - - - + + + + + + + + + - - - + + + - + - - - + + + - + - - - - + + + + - + - + - + - + - + - - + + - + - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + @@ -6268,51 +6297,51 @@ - + - + - - + + - - + + - - + + - - + + - + - - - + + + - - + + - + @@ -6324,96 +6353,97 @@ - - + + + - + - + - - + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - - + + - + - - - + + + - + - - + + - + @@ -6424,86 +6454,88 @@ - + - + - + - - + + - + - - + + - - - - + + + + + + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + @@ -6512,644 +6544,682 @@ - + - + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - + + - + - + - - - + + - + - - + + - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + - + - + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - - - + + + - + - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + - - + + - - - + + + - - + + - - - + + + - + - + - - + + - - - - - - - - - - - - - - - + + + + - + - - + + - - - - - + + + + + - - + + - + - - + + - - - + + + - + - - - - - + + + + + + - + - - - + + + + - + - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - + - + - - + + - - - + + + - - - + + + - + - - + + - + - + - - - + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - + + + - + + + + + + + - + - + - - - - + + + + - + - - + + - + - - - - - + + + + + - - + + - - + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - + + - - + + - + - + - - - + + + - + - + - - - - + + + + - - + + - + - - + + - - + + - + - - - - - - - + + + + + + + - + - - - + + + + + + + + - + - - + + - - + + @@ -7157,67 +7227,75 @@ - - - + + + - + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - + - + + + + + + + + + @@ -7227,34 +7305,40 @@ - + - + - - + + - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + @@ -7264,398 +7348,410 @@ - + - - + + - + - + - + - - - + + + - + - + - + - + - + - + - - - + + + - - + + - - - + + + - - - - - + + + + + - + - - - + + + - + + + + - - + + - - - - - - + + + + + - + - - + + - - - - + + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - - + + + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - - - + + + + - - + + - - - + + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - + - + - - + + - + - - + + - + - - + + - + - - - + + + - + - + - + - + - - - + + + - - + + - - - - - - - + + + + + + + + - + - + - + - + - - - + + + - - + - + + - + - - - + + + - - - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - + + - + - - + + - + - - + + - + @@ -7672,68 +7768,70 @@ - + - + - + - + - + - + - - - + + + + + - + - + - + - + - + - - - - - + + + + + @@ -7741,179 +7839,203 @@ - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + + - + - + - - - + + + - + - + - - - + + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - - + + - + - + - - - + + + - + - - - - - - - + + + + + + + + + + + + - - + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + + + + + + + + + + + - + - - - + + + - - + + - + - + - - + + - + - - - + + + @@ -7931,17 +8053,21 @@ - - - - + + + + + + + + - - - - - - + + + + + + @@ -7950,844 +8076,853 @@ - + - + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - - - - + + + + + - + - - - - - - - + + + + + + - - + + - - - + + + - - - + + + - + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - + + + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + - + + - + - - - + + + - + - - + - + + - + - - - + + + - + - - - - + + + + - + - - - + + + - - + + - + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - + + + - + - - + + - + - - - + + + - + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - - + + + + + - + - - - - - - + + + + + + - + - - - - + + + + - + - - + + - + - + - - - + + + - + - - - + + + - + - - - - + + + + - - + + + + + - - - - + + + + - - + + - - + + - - + + - - - + + + - + - - - + + + - + - + - + - + + - - + - - + + + + + + + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - - - + + + + - - - + + + - + - - - + + + - + - - - + + + - - + + - + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - + - - + + - + - - + + - + - - - - - - + + + + + + - - + + - - + + diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi index 510aba5..c21ade6 100644 --- a/tests/data/test-read-dwarf/libtest23.so.abi +++ b/tests/data/test-read-dwarf/libtest23.so.abi @@ -510,7 +510,7 @@ - + diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi index 92b568b..5eb0dd7 100644 --- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi +++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi @@ -2042,7 +2042,7 @@ - + @@ -2548,7 +2548,7 @@ - + @@ -3186,7 +3186,7 @@ - + @@ -3652,7 +3652,7 @@ - + @@ -9832,22 +9832,40 @@ + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - + @@ -9917,7 +9935,7 @@ - + @@ -9942,7 +9960,7 @@ - + @@ -9952,7 +9970,7 @@ - + @@ -9999,7 +10017,7 @@ - + @@ -10020,7 +10038,7 @@ - + @@ -10068,13 +10086,13 @@ - + - + @@ -10089,100 +10107,100 @@ - + - + - - + + - - + + - + - + - + - - + + - + - + - - + + - + - - + + - + - + - + - + - - + + @@ -10191,7 +10209,7 @@ - + @@ -10199,12 +10217,12 @@ - - - - + + + + - + @@ -10217,17 +10235,17 @@ - + - - - - - - - - + + + + + + + + diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi index 74345c7..c63fd4f 100644 --- a/tests/data/test-read-dwarf/test11-pr18828.so.abi +++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi @@ -34816,7 +34816,7 @@ - + @@ -35287,7 +35287,7 @@ - + @@ -35305,7 +35305,7 @@ - + @@ -35444,7 +35444,7 @@ - + @@ -35944,7 +35944,7 @@ - + diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi index 0962218..f47a18d 100644 --- a/tests/data/test-read-dwarf/test12-pr18844.so.abi +++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi @@ -20985,71 +20985,71 @@ - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -21078,31 +21078,31 @@ - - - + + + - - - - + + + + - - - + + + - + @@ -21113,117 +21113,117 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -21253,30 +21253,30 @@ - - + + - - - + + + - - + + - + @@ -21290,7 +21290,7 @@ - + @@ -21304,7 +21304,7 @@ - + @@ -21312,41 +21312,41 @@ - + - + - + - + - + - + - + - - + + - + - + - - - + + + @@ -21355,17 +21355,17 @@ - + - + - + @@ -21379,7 +21379,7 @@ - + @@ -21388,27 +21388,27 @@ - + - + - + - + - + - + @@ -21417,21 +21417,21 @@ - + - + - + - - + + @@ -21441,422 +21441,422 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + + - - - + + - - + + - - + + - - + + - - - + + + - + - + + - - - - + + + - - - + + + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + - - + + - - + + @@ -21869,636 +21869,636 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - - + + + - - - + + + - + - - - + + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - - + + - + + - - - + + - - + + - - + + - + - + - - + + - - - + + + - - - + + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - + - - + + - + - - + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - + + - - + + - - + + - - - + + + - + - - + + - - + + - + - + - + - + - + - + @@ -22510,7 +22510,7 @@ - + @@ -22524,7 +22524,7 @@ - + @@ -22538,7 +22538,7 @@ - + @@ -22551,55 +22551,55 @@ - + - + - - + + - + - - + + - + - + - + - + - + - + @@ -22609,364 +22609,364 @@ - + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - + - - + + - + - - - - + + + + - - + + - + - - - - - - - + + + + + + + - - + + - + - - + + - - - + + + - + - + - + + - - + + + - - - - + + + + - - - - + + - - + + - - - + + + - - + + - + + - - - + + - + - + - + - + - + - + - - + + - - - + + + - + - + - - + + - + - + - - - + + + - - - + + + - + - - - - + + + + - + - + - - + + - - - + + + - + - + - - + + - - - + + + - + + - - - + + - + + - - + - + @@ -22986,194 +22986,194 @@ - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + @@ -23182,229 +23182,229 @@ - + - + - - + + - - + + - - + + - + - - + + - + - - - - + + + + - - + + - - - + + + - + - - - + + + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - - + + - + - - + + @@ -23413,14 +23413,14 @@ - + - + @@ -23428,123 +23428,123 @@ - - + + - + - + - + - + - - + + - + - - + + - + - + - + - + - - + + - - - + + + - + - + - - + + - - - + + + - + - + - + - + - + - + - + - - + + @@ -23553,7 +23553,7 @@ - + @@ -23562,8 +23562,8 @@ - - + + @@ -23571,222 +23571,222 @@ - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - + @@ -23951,198 +23951,198 @@ - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - + + - - + + - + - - + + - + - + - + - + - - + + - - + + - - + + - + @@ -24151,7 +24151,7 @@ - + @@ -24166,7 +24166,7 @@ - + @@ -24174,19 +24174,19 @@ - + - + - + @@ -24223,19 +24223,19 @@ - + - + - - + + - + @@ -24250,8 +24250,8 @@ + - @@ -24277,7 +24277,7 @@ - + @@ -24286,7 +24286,7 @@ - + @@ -24295,59 +24295,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -24355,7 +24355,7 @@ - + @@ -24368,43 +24368,43 @@ - - + + - + + - - + - - + + - - + + - + - + @@ -24423,16 +24423,16 @@ - - + + - - - + + + @@ -24453,8 +24453,8 @@ + - @@ -24464,7 +24464,7 @@ - + @@ -24516,13 +24516,13 @@ - + - + @@ -24536,8 +24536,8 @@ - - + + @@ -24550,24 +24550,24 @@ - - + + - - - + + + - - + + @@ -24585,8 +24585,8 @@ - - + + @@ -24599,7 +24599,7 @@ - + @@ -24607,54 +24607,54 @@ - + - + - + - + - + - + - + - + @@ -24710,12 +24710,12 @@ - + - + - + @@ -24728,8 +24728,8 @@ - - + + @@ -24741,7 +24741,7 @@ - + @@ -24754,8 +24754,8 @@ - - + + @@ -24765,501 +24765,501 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + + + - - - - + + - + + + - - - + - + - + - + - + - + - + - - + + + - - + - - + + - + - + - - + + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - + - + - + - + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - - + + - + - + - + - - + + - - - + + + - + - + - - + + - + - + - + - - + + - - - + + + @@ -25268,229 +25268,229 @@ - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - + - + - - - + + + - - + + - + @@ -25498,78 +25498,78 @@ - - + + - + - + - + - - + + - - - + + + - + - + - + - + - + - + - + - + - + @@ -25582,253 +25582,253 @@ - - + + - - - + + + - + - + - + - + - + - + - + - - + + - + - + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + @@ -25839,7 +25839,7 @@ - + @@ -25852,343 +25852,343 @@ - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - + + - - + + - - - + + + - + - + - - + + - - + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - + - + - + - + - + - - - - + + + + - - + - - + + + - - - - + + + + - - + - - + + + - - - - + + + + - - + - - + + + - - - - + + + + - - + - - + + + - - - - + + + + - - + - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -26198,73 +26198,73 @@ - + - + - + - - + + - - + + - - - + + + - - + + - + - - + + - - + + - + @@ -26272,8 +26272,8 @@ - - + + @@ -26282,8 +26282,8 @@ - - + + @@ -26291,466 +26291,466 @@ - - - + + + - - - + + + - + - - + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - + + - - - - + + + - + - + - - + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - + - - + + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + - - + - + - + - + - + - + - + - + @@ -26763,166 +26763,166 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + @@ -26930,8 +26930,8 @@ - - + + @@ -26940,8 +26940,8 @@ - - + + @@ -26949,421 +26949,421 @@ - + - - + + - - - + + + - + - + - + - + - - + + - - - + + + - + - + - - + + - + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + - - + + - + - - + + - - + + - + @@ -27371,169 +27371,169 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - + - - + + @@ -27554,106 +27554,106 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - + - - + + - + - - + + - + - + - + @@ -27679,7 +27679,7 @@ - + @@ -27689,7 +27689,7 @@ - + @@ -27698,34 +27698,34 @@ - + - - + + - - + + - - + + - + @@ -27733,166 +27733,166 @@ - + - + - + - - + + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - - - + + + + + - + - - + + - - + + - + - + - - + + - + @@ -27901,14 +27901,14 @@ - - + + - + @@ -27916,70 +27916,70 @@ - - + + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + @@ -27991,21 +27991,21 @@ - - + + - - - + + + - + @@ -28013,58 +28013,58 @@ - + - + - + - + - + - - + + - - + + - + - + @@ -28074,12 +28074,12 @@ - + - - + + @@ -28087,54 +28087,54 @@ - + - - + + - - + + - - + + - + - + - + - + - - + + @@ -28142,54 +28142,54 @@ - + - + - + - + - + - + - + - + - - + + @@ -28197,296 +28197,296 @@ - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -28496,14 +28496,14 @@ - + - + - + @@ -28527,14 +28527,14 @@ - - - + + + - + - + @@ -28544,13 +28544,13 @@ - + - + - + @@ -28598,69 +28598,69 @@ - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + @@ -28669,82 +28669,82 @@ - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + @@ -28753,220 +28753,220 @@ - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + @@ -28974,82 +28974,82 @@ - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + @@ -29059,75 +29059,75 @@ - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + @@ -29135,7 +29135,7 @@ - + @@ -29143,75 +29143,75 @@ - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + @@ -29221,7 +29221,7 @@ - + @@ -29234,109 +29234,109 @@ - + - + - + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + - + @@ -29349,331 +29349,331 @@ - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - + + - - + + - - - + + + - - + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -29683,2137 +29683,2137 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - + - + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - + + + + - - + - + + - - - - + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - - + + - - - + + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - - - - - - + + + + + + - - - - + + + + - + - - - - - - + + + + + + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - - - - + + + + + - - + + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - + + + + + + + + + + - - + + - - + + - - + + - - + + - - - + + + - + @@ -31830,56 +31830,56 @@ - + - + - + - + - + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - + - + @@ -31887,13 +31887,13 @@ - + - + - + @@ -31907,252 +31907,252 @@ - + - + - + - + - - + + - - + + - - + + - - + + - + - - - - - + + + + + - - + + - - - - - - - - + + + + + + + + - + - - - + + + - - - - - + + + + + - - - - - + + + + + - - + + - - + + - - + + - - - - - - + + + + + + - + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - - - - - - - - - - + + + + + + + + + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - + - - - - - + + + + + - - - - - + + + + + - - + + - - + + - - + + - - - - - - + + + + + + - + - - + + - - + + - - - - + + + + - - + + - - - - - - + + + + + + - + - - + + - - + + - - - + + + @@ -32160,106 +32160,106 @@ - - - - + + + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + @@ -32267,137 +32267,137 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -32405,222 +32405,222 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - - + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + - + - + @@ -32628,240 +32628,240 @@ - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -32869,193 +32869,193 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + @@ -33106,47 +33106,47 @@ - - + + - - + + - - - + + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + @@ -33230,8 +33230,8 @@ - - + + @@ -33261,201 +33261,201 @@ - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - + + + - + - + - + - + - - - + + + - - + + - - - - + + + + - + - - + + - - + + - - - + + + - - + + - + - - + + - - + + - - + + - + - - + + - + - + @@ -33463,73 +33463,73 @@ - + - - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - + + - + - + - - - - - + + + + + - - + + - - + + - - - + + + - - + + - - - + + + - + @@ -33543,76 +33543,76 @@ - - + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - + + - - + + - + - - - - + + + + - - - + + + - - + + - - + + - - - + + + - - - + + + - + @@ -33647,180 +33647,180 @@ - - - + + + - - - - - + + + + + - - + + - - - - + + + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - + + - - - - + + + + - - + + - - + + - - - - + + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - + + - + - - + + - + - + - - + + - + @@ -33895,7 +33895,7 @@ - + @@ -33905,27 +33905,27 @@ - - + + - - - + + + - - + + - - + + - + @@ -33937,13 +33937,13 @@ - + - + @@ -33951,38 +33951,38 @@ - + - + - + - + - - - - + + + + - - - + + + - - - + + + @@ -33994,28 +33994,28 @@ - + - + - + - + - + - + @@ -34025,14 +34025,14 @@ - - - - + + + + - - + + @@ -34040,41 +34040,41 @@ - - + + - - - + + + - + - + - + - + - + - + - + - + - + @@ -34101,29 +34101,30 @@ - - - - + + + + + - + - + - + - - + + - + @@ -34133,27 +34134,27 @@ - + - + - - - + + + - + - - + + - + @@ -34163,11 +34164,11 @@ - - + + - + @@ -34175,11 +34176,11 @@ - - - + + + - + @@ -34189,15 +34190,15 @@ - - + + - + @@ -34228,31 +34229,31 @@ - + - + - + - + - - + + - - + + @@ -34260,8 +34261,8 @@ - - + + @@ -34270,200 +34271,200 @@ - - + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - + + + - + - + - - + + - - + + - + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -34471,62 +34472,62 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + @@ -34534,15 +34535,15 @@ - - - + + + - - - - + + + + @@ -34551,15 +34552,15 @@ - - - - + + + + - - - + + + @@ -34567,14 +34568,14 @@ - - - + + + - - - + + + @@ -34582,14 +34583,14 @@ - - - + + + - - - + + + @@ -34597,12 +34598,12 @@ - - - + + + - + @@ -34610,83 +34611,83 @@ - + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -34694,11 +34695,11 @@ - + - + @@ -34706,12 +34707,12 @@ - + - + @@ -34719,24 +34720,24 @@ - + - - + + - - + + - - - + + + @@ -34744,29 +34745,29 @@ - - - + + + - - - + + + - + - - - + + + - - - + + + @@ -34774,56 +34775,56 @@ - - - + + + - - - - + + + + - + - - - - + + + + - - + + - - + + - - + + - - + + - + - + @@ -34831,14 +34832,14 @@ - + - + - + - + @@ -34846,68 +34847,68 @@ - + - + - - + + - - + + - - + + - - + + - + - + - - - + + + - + - + - - - + + + @@ -34920,56 +34921,56 @@ - - - + + + - + - + - + - - - - + + + + - + - - - - + + + + - + - - - + + + - - - - + + + + @@ -34991,536 +34992,536 @@ - - + + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - - + + + + - - - + + + - - + + - - + + - + - + - + - - + + - - - - - + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - + + - - + + - - + + - + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - - + + + + + - - + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - - - + + + + + - + - - + + - - - - + + + + - - + + - - - + + + - - + + - - + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - + + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -35546,7 +35547,7 @@ - + @@ -35554,9 +35555,9 @@ - - + + @@ -35564,12 +35565,12 @@ - + - + - + @@ -35603,47 +35604,47 @@ - - - + + + - - - + + + - + - + - + - - - + + + - - - + + + - + @@ -35659,21 +35660,21 @@ - + - + - + - + @@ -35684,75 +35685,75 @@ - + - + - - + + - + - + - - + + - + - + - - + + - - + + - - + + - - + + - + @@ -35760,52 +35761,52 @@ - - + + - + - + - - + + - - + + - - + + - - + + - + @@ -35813,534 +35814,534 @@ - - + + - + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - + - - - - - - - + + + + + + + - - + + - - + + - - - - - - - - - + + + + + + + + + - - + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - + - + - + - + - + @@ -36349,59 +36350,59 @@ - + - + - - + + - - - + + + - - + + - + - + - + - + - + @@ -36409,13 +36410,13 @@ - + - + @@ -36423,71 +36424,71 @@ - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - - + + - + @@ -36495,53 +36496,53 @@ - + - + - + - + - + - - + + - - + + - + @@ -36549,660 +36550,660 @@ - + - + - - - + + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - + - + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + + - - - + + - - + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - + + + - - - - + + + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + @@ -37210,118 +37211,118 @@ - - + + - - - + + + - - - - + + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - - + + - - + + - + @@ -37329,355 +37330,355 @@ - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - + - - + + - + - + - + - + @@ -37685,115 +37686,115 @@ - - + + - + - + - + - + - + - + - - + + - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - - + + - - + + - - + + - + @@ -37801,172 +37802,172 @@ - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + - - + + - - + + - + - + - + - + - - + + - - + + - - + + - + - - + + - + - + - + - - + + - - + + - + + - - + - + - + - - + + - + @@ -37974,104 +37975,104 @@ - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - - + + - - + + @@ -38079,469 +38080,469 @@ - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + + - - - + + - - + + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - + + + - - - - + + + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + @@ -38549,402 +38550,402 @@ - - + + - - - + + + - - - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - + - - + + - - + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + + - + - - + + - + - + - + - + - - + + - - + + - - + + - + - + - + - + - - + + - - + + - - + + - + - - + + - + - + - + - - + + - - + + - + + - - + - + - + - - + + - + @@ -38952,143 +38953,143 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - + - + - + - + @@ -39096,79 +39097,79 @@ - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -39201,89 +39202,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -39312,220 +39313,220 @@ - - - + + + - - - - + + + + - - - + + + - - + + - - + + - - + + - + - - + + - - - + + + - + - + - - + + - + - - + + - + - + - + - + - + - - + + - + - + - + - + - - - - - + + + + + - + - - - + + + - + - + - + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - - - - + - - + + + + + - + - + - - - - - + + + + + - + - + @@ -39533,87 +39534,87 @@ - - + + - - + + - - - + + + - - - + + + - - + + - + - - + + - + - + - + - - + + - - + + - + - + @@ -39621,383 +39622,383 @@ - - + + - - + + - - - + + + - - - + + + - - + + - + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - - + + + - - - + + + - - + + - - - - + + + + - + - + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - - - - - + + + + + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - + + - - - - + + + + - - + + - + - - + + @@ -40005,281 +40006,281 @@ - + - - - + + + - - + + - + - + - + - + - - + + - + - + - + - + - - + + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -40308,122 +40309,122 @@ - - - + + + - - - - + + + + - - - + + + - - + + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - - - + + + - + - + - + - + - + - - + + - - + + - + - - - - + + + + - + @@ -40433,39 +40434,39 @@ - + - - + + - + - - + + - + - + - - + + - - + + - + @@ -40475,27 +40476,27 @@ - + - - + + - + - + - - + + - - + + @@ -40506,89 +40507,89 @@ - - + + - + - + - + - + - + - + - - + + - + - - - + + + - + - - + + - + - + - + - + - + @@ -40596,54 +40597,54 @@ - - - - - - + + + + + + - - + + - - + + - - + + - + - + - + - + - + - + - - + + - - + + @@ -40678,37 +40679,37 @@ - - + + - + - + - + - + - + - + - - + + - - + + @@ -40743,77 +40744,77 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40822,31 +40823,31 @@ - + - + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi index 3d6d05b..d71df25 100644 --- a/tests/data/test-read-dwarf/test13-pr18894.so.abi +++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi @@ -828,7 +828,7 @@ - + diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi index c9b2b71..75b1f8f 100644 --- a/tests/data/test-read-dwarf/test14-pr18893.so.abi +++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi @@ -683,7 +683,7 @@ - + @@ -747,7 +747,7 @@ - + diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi index 7f5d3e0..265e97c 100644 --- a/tests/data/test-read-dwarf/test15-pr18892.so.abi +++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi @@ -24101,7 +24101,7 @@ - + @@ -24122,7 +24122,7 @@ - + @@ -24131,7 +24131,7 @@ - + @@ -24142,7 +24142,7 @@ - + @@ -24158,7 +24158,7 @@ - + @@ -24174,7 +24174,7 @@ - + @@ -24211,7 +24211,7 @@ - + @@ -24219,17 +24219,17 @@ - + - + - + @@ -24237,7 +24237,7 @@ - + diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi index a500122..6ce8a11 100644 --- a/tests/data/test-read-dwarf/test16-pr18904.so.abi +++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi @@ -2378,7 +2378,7 @@ - + @@ -2496,7 +2496,7 @@ - + @@ -5089,7 +5089,7 @@ - + @@ -5564,7 +5564,7 @@ - + @@ -5582,7 +5582,7 @@ - + @@ -5721,7 +5721,7 @@ - + @@ -6127,7 +6127,7 @@ - + @@ -6135,7 +6135,7 @@ - + @@ -6201,7 +6201,7 @@ - + @@ -25057,7 +25057,7 @@ - + @@ -37553,13 +37553,13 @@ - + - + @@ -37841,7 +37841,7 @@ - + @@ -37966,7 +37966,7 @@ - + @@ -38004,12 +38004,12 @@ - + - + diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi index a800595..fd4a5af 100644 --- a/tests/data/test-read-dwarf/test21-pr19092.so.abi +++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi @@ -1258,7 +1258,7 @@ - + @@ -1266,7 +1266,7 @@ - + @@ -1276,7 +1276,7 @@ - + @@ -1314,7 +1314,7 @@ - + @@ -2847,6 +2847,23 @@ + + + + + + + + + + + + + + + + + @@ -3018,12 +3035,12 @@ - + - + - + @@ -3041,15 +3058,15 @@ - + - + - + - + @@ -3061,31 +3078,31 @@ - - - - - - - + + + + + + + - + - - + + - + @@ -3111,12 +3128,12 @@ - + - + @@ -3130,10 +3147,10 @@ - + - + @@ -3155,7 +3172,7 @@ - + @@ -3164,11 +3181,11 @@ - + - + @@ -3193,10 +3210,10 @@ - - + + - + @@ -3241,8 +3258,8 @@ - - + + @@ -3260,26 +3277,26 @@ - - + + - - - + + + - + - + - + @@ -3312,9 +3329,9 @@ - + - + @@ -3322,18 +3339,18 @@ - - + + - + - - + + - + @@ -3349,9 +3366,9 @@ - + - + @@ -3366,12 +3383,12 @@ - + - + - + @@ -3406,44 +3423,44 @@ - + - - + + - - + + - + - - + + - + - - + + - + - + - + - + @@ -3451,14 +3468,14 @@ - + - - + + - + @@ -3472,24 +3489,24 @@ - + - + - + - + @@ -3498,12 +3515,12 @@ - + - + @@ -3512,32 +3529,32 @@ - + - + - + - + - + - + @@ -3549,17 +3566,17 @@ - + - + - + - + - + @@ -3567,40 +3584,40 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -3609,19 +3626,19 @@ - + - + - + - + - + @@ -3630,7 +3647,7 @@ - + @@ -3645,10 +3662,10 @@ - + - + @@ -3657,10 +3674,10 @@ - + - + @@ -3669,25 +3686,25 @@ - + - + - + - + - + - + @@ -3696,13 +3713,13 @@ - + - + - + @@ -3711,31 +3728,31 @@ - + - + - + - + - + - + - + - + @@ -3747,23 +3764,23 @@ - + - + - + - - + + @@ -3780,7 +3797,7 @@ - + @@ -3792,16 +3809,16 @@ - + - + - + @@ -3819,13 +3836,13 @@ - + - + - + @@ -3833,10 +3850,10 @@ - - - - + + + + @@ -3850,19 +3867,19 @@ - + - + - + - + - + @@ -3889,12 +3906,12 @@ - - - - + + + + - + @@ -3912,40 +3929,40 @@ - + - + - + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + @@ -3989,37 +4006,37 @@ - + - + - + - + - + - - - + + + - + - + - + - + - + @@ -4029,17 +4046,17 @@ - + - + - + - + @@ -4047,36 +4064,36 @@ - + - + - + - + - + - + - + - + - + - - - - + + + + @@ -4087,28 +4104,28 @@ - - - - + + + + - - - - - - + + + + - + + + - + - + @@ -4117,11 +4134,11 @@ - - - + + + - + @@ -4130,7 +4147,7 @@ - + @@ -4139,10 +4156,10 @@ - + - + @@ -4151,99 +4168,99 @@ - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + - - - - + + + + - - - - - + + + + + - + + - + - + - + @@ -4252,7 +4269,7 @@ - + @@ -4264,19 +4281,19 @@ - - - - - - - - + + + + + + + + - + - + @@ -4285,12 +4302,12 @@ - - + + - + - + @@ -4310,7 +4327,7 @@ - + @@ -4436,7 +4453,7 @@ - + @@ -4445,7 +4462,7 @@ - + @@ -4475,13 +4492,13 @@ - + - + @@ -4496,14 +4513,14 @@ - + - + @@ -4517,11 +4534,11 @@ - - - + + + - + @@ -4530,7 +4547,7 @@ - + @@ -4538,18 +4555,18 @@ - - - - + + + + - + - + @@ -4564,78 +4581,78 @@ - + - + - - - + + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + @@ -4643,47 +4660,47 @@ - + - + - + - + - + - - + + - + - + - + @@ -4691,19 +4708,19 @@ - - + + - - + + - + - + @@ -4738,130 +4755,130 @@ - - - + + + - - + + - + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - - - + + + - + - - - + + + - + - + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - - + + - - + + - + @@ -4870,7 +4887,7 @@ - + @@ -4879,38 +4896,38 @@ - + - + - + - + - + - - - + + + - - + + - - + + @@ -4919,99 +4936,99 @@ - - + + - + - + - + - - + + - + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - + - - + + - + - - + + - - + + - + - + @@ -5020,96 +5037,96 @@ - + - - + + - + - + - - - + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5118,100 +5135,100 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -5220,12 +5237,12 @@ - + - + @@ -5236,7 +5253,7 @@ - + @@ -5244,62 +5261,62 @@ - + - + - + - + - - + + - + - - + + - - + + - + - - + + - + - + - + - - + + @@ -5307,8 +5324,8 @@ - - + + @@ -5316,7 +5333,7 @@ - + @@ -5364,122 +5381,122 @@ - + - - - + + + - - + + - + - - + + - + - + - + - - - + + + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - + + + - + - - + + - - + + - + - + @@ -5500,7 +5517,7 @@ - + @@ -5515,35 +5532,35 @@ - - + + - + - - - + + + - + - + - - - + + + - - - + + + - + - + @@ -5557,21 +5574,21 @@ - + - - + + - + - - + + - + @@ -5580,13 +5597,13 @@ - + - + @@ -5606,18 +5623,18 @@ - + - - + + - + @@ -5638,7 +5655,7 @@ - + @@ -5646,55 +5663,55 @@ - + - - + + - + - + - + - - + + - - + + - - - + + + - + - + - + @@ -5703,7 +5720,7 @@ - + @@ -5711,19 +5728,19 @@ - + - - + + - + - + - + @@ -5732,22 +5749,22 @@ - + - - - + + + - + - + @@ -5759,50 +5776,50 @@ - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + @@ -5817,45 +5834,45 @@ - + - + - + - + - - + + - + - + - + - + @@ -5863,21 +5880,21 @@ - - + + - - + + - + @@ -5887,50 +5904,50 @@ - + - + - - - + + + - + - - - + + + - - + + - - + + - + - - + + - + - + - - - + + + @@ -5938,54 +5955,54 @@ - - + + - - - - + + + + - - + + - + - + - + - + - + - + - - + + - + @@ -5997,7 +6014,7 @@ - + @@ -6012,12 +6029,12 @@ - - + + - + @@ -6030,27 +6047,27 @@ - - + + - + - + - + - - + + - - + + - - + + @@ -6114,15 +6131,15 @@ - + - + - + - + @@ -6196,45 +6213,45 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6242,12 +6259,12 @@ - + - + - + @@ -6261,65 +6278,65 @@ - - - + + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + @@ -6333,10 +6350,10 @@ - + - + @@ -6349,9 +6366,9 @@ - - - + + + @@ -6359,57 +6376,57 @@ - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - + @@ -6423,7 +6440,7 @@ - + @@ -6432,7 +6449,7 @@ - + @@ -6444,87 +6461,87 @@ - + - - + + - - + + - + - + - - - - + + + + - - + + - + - + - + - + - + - + - + - - + + - + - - + + - + - + @@ -6532,62 +6549,62 @@ - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + - + - + - + - + @@ -6787,14 +6804,14 @@ - + - + - + @@ -6809,7 +6826,7 @@ - + @@ -6858,13 +6875,13 @@ - + - + @@ -6885,16 +6902,16 @@ - + - - - - + + + + @@ -6908,50 +6925,50 @@ - - + + - + - + - + - + - + - + - + - + - + - - - + + + - + @@ -6984,33 +7001,33 @@ - + - + - + - + - + - + @@ -7020,27 +7037,27 @@ - + - + - + - + - + - + - + - + - + @@ -7051,26 +7068,26 @@ - + - + - + - + - + - + @@ -7081,7 +7098,7 @@ - + @@ -7089,14 +7106,14 @@ - - - + + + - + - + @@ -7141,31 +7158,31 @@ - + - + - - + + - - + + - - + + - + - + - + @@ -7173,7 +7190,7 @@ - + @@ -7184,7 +7201,7 @@ - + @@ -7204,14 +7221,14 @@ - - + + - - - - + + + + @@ -7229,10 +7246,10 @@ - - + + - + diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi index 1327de8..a1e2437 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 @@ -12694,7 +12694,7 @@ - + @@ -23940,7 +23940,7 @@ - + @@ -23958,7 +23958,7 @@ - + diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi index 060f9cc..6285fd8 100644 --- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi +++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi @@ -917,7 +917,7 @@ - + @@ -941,7 +941,7 @@ - + @@ -1049,7 +1049,7 @@ - + @@ -1154,14 +1154,14 @@ - + - + - + @@ -1169,45 +1169,45 @@ - + - + - - + + - - - - + + + + - + - + - - + + - + - - + + - + - + @@ -1237,7 +1237,7 @@ - + @@ -1251,47 +1251,47 @@ - - + + - + - + - + - + - + - + - + @@ -1319,7 +1319,7 @@ - + @@ -1354,14 +1354,14 @@ - - - + + + - + @@ -1386,13 +1386,13 @@ - - + + - + - + @@ -1400,33 +1400,33 @@ - - + + - + - + - + - + - + @@ -1502,18 +1502,18 @@ - + - + - + @@ -1523,10 +1523,10 @@ - - + + - + @@ -1584,115 +1584,116 @@ - - + + - + - + - + - + - + - + - - - - - + + + + + + - - + + - + - + - + - + - + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - + @@ -1713,7 +1714,7 @@ - + @@ -1734,7 +1735,7 @@ - + @@ -1743,12 +1744,12 @@ - + - + @@ -1767,7 +1768,7 @@ - + @@ -1775,24 +1776,24 @@ - + - + - + - + - + @@ -1803,27 +1804,27 @@ - + - + - + - + - + @@ -1842,10 +1843,10 @@ - + - + @@ -1880,13 +1881,13 @@ - - - - + + + + - + @@ -1899,64 +1900,64 @@ - + - + - - + + - + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - - - - + + + + @@ -1967,7 +1968,7 @@ - + @@ -1979,29 +1980,29 @@ - + - + - + - - + + - + - + - + - + @@ -2010,9 +2011,9 @@ - + - + @@ -2022,752 +2023,752 @@ - + - + - + - - + + - + - + - + - + - + - - + + - - + + - - - + + + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - - + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - + - - - + + + - + - + - + - - + + - + @@ -2775,225 +2776,225 @@ - - - + + + - - - + + + - + - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -3008,8 +3009,8 @@ - - + + @@ -3033,15 +3034,15 @@ - - + + - + - + - + @@ -3049,271 +3050,271 @@ - + - - + + - - - + + + - - - - + + + + - - + + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - - + + - - - + + + - + - - - + + + - - + + - + - - + + - - - + + + - + - - - + + + - - - + + + - - + + - - + + - + - - - + + + - - - + + + - + - - - + + + - + - - - - + + + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - + - + - + - - - + + + - - + + - + - + - - + + - + - + @@ -3322,8 +3323,8 @@ - - + + @@ -3332,22 +3333,22 @@ - + - + - + - + @@ -3355,7 +3356,7 @@ - + @@ -3363,16 +3364,16 @@ - + - + - + @@ -3381,167 +3382,167 @@ - + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - - - + + + - - + + - + - - + + - - + + - - - + + + - - + + - + - + - + - + - - + + - - + + - + - - + + - - + + - - + + @@ -3549,121 +3550,121 @@ - + - + - + - + - + - + - + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - + - + - + - - + + - + - - + + - - + + - + @@ -3672,184 +3673,184 @@ - - + + - - - + + + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - - + + - - + + - - + + - + - - - + + + - - - + + + - - + + - + - + - - + + - + - + - + - + - + - - - + + + @@ -3857,739 +3858,739 @@ - - - + + + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - + + - + - - + + - + - + - - + + - + - - + + - - + + - - - + + + - + - + - + - + - + - - + + - + - - + + - - - + + + - - + + - + - - + + - + - - + + - + - - + + - - - + + + - - + + - + - - + + - + - + - + - + - + - + - - + + - - - + + + - - + + - - - + + + - - + + - + - - + + - - + + - - - + + + - - + + - + - + - + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - + - + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - + - + - - - + + + - - - + + + - - - + + + - + - + - + - - - + + + - - - + + + - - + + - + - - - + + + - + - + - - + + - - - + + + - - + + - - + + - + - + - + - - - + + + - + - + - + - - + + - + - + - - + + - + - - - + + + - + - - + + - - - + + + - + - + - - + + - + - + - - + + - + - + @@ -4597,382 +4598,382 @@ - + - + - + - + - + - - - + + + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - - + + - + - - + + - - + + - + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - - - + + + + - + - - - + + + - + - - + + - - + + - - + + - + - - + + @@ -4988,172 +4989,172 @@ - - + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -5212,7 +5213,7 @@ - + @@ -5228,10 +5229,10 @@ - + - + @@ -5628,19 +5629,19 @@ - + - + - + @@ -5734,8 +5735,8 @@ - - + + @@ -5838,45 +5839,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + @@ -5887,62 +5888,62 @@ - - - - + + + + - + - + - + - + - - + + - - + + - - - + + + - + - + - + - + - + @@ -5951,160 +5952,160 @@ - - - + + + - - + + - - - + + + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - - + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - + - - + + @@ -6114,299 +6115,299 @@ - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - - - - - + - + + + + + + - - - - - - - + + - + + + + + + - + - - + + @@ -6424,15 +6425,15 @@ - - + + - - + + @@ -6441,114 +6442,132 @@ - + - - + + - - - + + + - - + + - - + + - + - + - + - - - + + + - + - + - + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6556,7 +6575,7 @@ - + @@ -6569,27 +6588,27 @@ - + - + - + - + - + - + @@ -6602,16 +6621,16 @@ - + - + - + - + @@ -6619,137 +6638,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + @@ -6758,121 +6777,121 @@ - - - - - - - + + + + + + + - - + + - - + + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - + - + - - + + - + - + @@ -6883,75 +6902,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -6999,14 +7018,14 @@ - - + + - - + + @@ -7014,17 +7033,17 @@ - - - - + + + + - + - + @@ -7032,20 +7051,20 @@ - + - - - - - - + + + + + + - - - + + + -- 2.7.4