diff --git a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp index d3ff80db4..d44bb27b0 100644 --- a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp +++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp @@ -117,7 +117,7 @@ bool ABIWrapper::SetupTemplateArguments(const clang::TemplateArgumentList *tl, } clang::QualType type = arg.getAsType(); template_info.AddTemplateElement( - repr::TemplateElementIR(GetTypeId(type))); + repr::TemplateElementIR(GetTypeUniqueId(type))); if (!CreateBasicNamedAndTypedDecl(type, source_file)) { llvm::errs() << "Setting up template arguments failed\n"; return false; @@ -135,7 +135,7 @@ bool ABIWrapper::SetupFunctionParameter( return false; } functionp->AddParameter(repr::ParamIR( - GetTypeId(qual_type), has_default_arg, is_this_ptr)); + GetTypeUniqueId(qual_type), has_default_arg, is_this_ptr)); return true; } @@ -204,28 +204,6 @@ static clang::QualType GetReferencedType(const clang::QualType qual_type) { return qual_type.getNonReferenceType(); } -static clang::QualType GetFinalReferencedType(clang::QualType qual_type) { - while (IsReferencingType(qual_type)) { - qual_type = GetReferencedType(qual_type); - } - return qual_type; -} - -std::string ABIWrapper::GetTypeId(clang::QualType qual_type) { - return ast_caches_->GetTypeId(GetKeyForTypeId(qual_type)); -} - -std::string ABIWrapper::GetKeyForTypeId(clang::QualType qual_type) { - clang::QualType canonical_qual_type = qual_type.getCanonicalType(); - clang::QualType final_destination_type = - GetFinalReferencedType(canonical_qual_type); - // Get the tag id for final destionation and add that to the type name with - // final destination. This helps in avoiding aliasing of types when fully - // qualified type-name doesn't expand all template parameters with their - // namespaces. - return QualTypeToString(qual_type) + GetTypeUniqueId(final_destination_type); -} - bool ABIWrapper::CreateAnonymousRecord(const clang::RecordDecl *record_decl) { RecordDeclWrapper record_decl_wrapper(mangle_contextp_, ast_contextp_, cip_, record_decl, module_, ast_caches_); @@ -279,9 +257,9 @@ bool ABIWrapper::CreateBasicNamedAndTypedDecl( // This type has a reference type if its a pointer / reference OR it has CVR // qualifiers. clang::QualType referenced_type = GetReferencedType(canonical_type); - typep->SetReferencedType(GetTypeId(referenced_type)); + typep->SetReferencedType(GetTypeUniqueId(referenced_type)); - typep->SetSelfType(GetTypeId(canonical_type)); + typep->SetSelfType(mangled_name); // Create the type for referenced type. return CreateBasicNamedAndTypedDecl(referenced_type, source_file); @@ -291,7 +269,6 @@ bool ABIWrapper::CreateBasicNamedAndTypedDecl( // its own. bool ABIWrapper::CreateBasicNamedAndTypedDecl(clang::QualType qual_type, const std::string &source_file) { - const std::string &type_key = GetKeyForTypeId(qual_type); const clang::QualType canonical_type = qual_type.getCanonicalType(); const clang::Type *base_type = canonical_type.getTypePtr(); bool is_builtin = base_type->isBuiltinType(); @@ -300,7 +277,7 @@ bool ABIWrapper::CreateBasicNamedAndTypedDecl(clang::QualType qual_type, base_type->isFunctionType() || (GetAnonymousRecord(canonical_type) != nullptr); if (!should_continue_with_recursive_type_creation || - !ast_caches_->type_cache_.insert(type_key).second) { + !ast_caches_->converted_qual_types_.insert(qual_type).second) { return true; } @@ -423,7 +400,8 @@ FunctionTypeWrapper::FunctionTypeWrapper( bool FunctionTypeWrapper::SetupFunctionType( repr::FunctionTypeIR *function_type_ir) { // Add ReturnType - function_type_ir->SetReturnType(GetTypeId(function_type_->getReturnType())); + function_type_ir->SetReturnType( + GetTypeUniqueId(function_type_->getReturnType())); function_type_ir->SetSourceFile(source_file_); const clang::FunctionProtoType *function_pt = llvm::dyn_cast(function_type_); @@ -512,7 +490,7 @@ bool FunctionDeclWrapper::SetupFunction(repr::FunctionIR *functionp, functionp->SetSourceFile(source_file); clang::QualType return_type = function_decl_->getReturnType(); - functionp->SetReturnType(GetTypeId(return_type)); + functionp->SetReturnType(GetTypeUniqueId(return_type)); functionp->SetAccess(AccessClangToIR(function_decl_->getAccess())); return CreateBasicNamedAndTypedDecl(return_type, source_file) && SetupFunctionParameters(functionp, source_file) && @@ -581,7 +559,7 @@ bool RecordDeclWrapper::SetupRecordFields(repr::RecordTypeIR *recordp, std::string field_name = field->getName(); uint64_t field_offset = record_layout.getFieldOffset(field_index); recordp->AddRecordField(repr::RecordFieldIR( - field_name, GetTypeId(field_type), field_offset, + field_name, GetTypeUniqueId(field_type), field_offset, AccessClangToIR(field->getAccess()))); field++; field_index++; @@ -601,7 +579,7 @@ bool RecordDeclWrapper::SetupCXXBases( repr::AccessSpecifierIR access = AccessClangToIR(base_class->getAccessSpecifier()); cxxp->AddCXXBaseSpecifier(repr::CXXBaseSpecifierIR( - GetTypeId(base_class->getType()), is_virtual, access)); + GetTypeUniqueId(base_class->getType()), is_virtual, access)); base_class++; } return true; @@ -871,7 +849,7 @@ bool EnumDeclWrapper::SetupEnum(repr::EnumTypeIR *enum_type, return false; } enum_type->SetSourceFile(source_file); - enum_type->SetUnderlyingType(GetTypeId(enum_decl_->getIntegerType())); + enum_type->SetUnderlyingType(GetTypeUniqueId(enum_decl_->getIntegerType())); enum_type->SetAccess(AccessClangToIR(enum_decl_->getAccess())); return SetupEnumFields(enum_type) && CreateBasicNamedAndTypedDecl(enum_decl_->getIntegerType(), ""); @@ -916,7 +894,7 @@ bool GlobalVarDeclWrapper::SetupGlobalVar(repr::GlobalVarIR *global_varp, global_varp->SetName(global_var_decl_->getQualifiedNameAsString()); global_varp->SetLinkerSetKey(mangled_name); global_varp->SetAccess(AccessClangToIR(global_var_decl_->getAccess())); - global_varp->SetReferencedType(GetTypeId(global_var_decl_->getType())); + global_varp->SetReferencedType(GetTypeUniqueId(global_var_decl_->getType())); return true; } diff --git a/vndk/tools/header-checker/src/dumper/abi_wrappers.h b/vndk/tools/header-checker/src/dumper/abi_wrappers.h index ba9e83955..f833ce518 100644 --- a/vndk/tools/header-checker/src/dumper/abi_wrappers.h +++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.h @@ -74,7 +74,7 @@ class ABIWrapper { protected: // Type-related functions - std::string GetTypeId(clang::QualType qual_type); + std::string GetTypeUniqueId(clang::QualType qual_type); bool CreateBasicNamedAndTypedDecl(clang::QualType, const std::string &source_file); @@ -87,12 +87,8 @@ class ABIWrapper { repr::TypeIR *typep); private: - std::string GetTypeUniqueId(clang::QualType qual_type); - std::string QualTypeToString(const clang::QualType &sweet_qt); - std::string GetKeyForTypeId(clang::QualType qual_type); - TypeAndCreationStatus SetTypeKind(const clang::QualType qtype, const std::string &source_file); diff --git a/vndk/tools/header-checker/src/dumper/ast_util.h b/vndk/tools/header-checker/src/dumper/ast_util.h index b68c4ba79..77e153f19 100644 --- a/vndk/tools/header-checker/src/dumper/ast_util.h +++ b/vndk/tools/header-checker/src/dumper/ast_util.h @@ -16,6 +16,9 @@ #define AST_UTIL_H_ #include +#include + +#include #include #include @@ -25,27 +28,14 @@ namespace header_checker { namespace dumper { -constexpr static char type_id_prefix[] = "type-"; - struct ASTCaches { ASTCaches(const std::string &translation_unit_source) : translation_unit_source_(translation_unit_source) {} - std::string GetTypeId(const std::string &qual_type) { - auto type_id_it = qual_type_to_type_id_cache_.find(qual_type); - if (type_id_it == qual_type_to_type_id_cache_.end()) { - qual_type_to_type_id_cache_.insert( - std::make_pair(qual_type, ++max_type_id_)); - return type_id_prefix + std::to_string(max_type_id_); - } - return type_id_prefix + std::to_string(type_id_it->second); - } - std::string translation_unit_source_; - std::set type_cache_; std::map decl_to_source_file_cache_; - std::map qual_type_to_type_id_cache_; - uint64_t max_type_id_ = 0; + + llvm::DenseSet converted_qual_types_; }; diff --git a/vndk/tools/header-checker/src/repr/ir_reader.cpp b/vndk/tools/header-checker/src/repr/ir_reader.cpp index 3e4e928af..acd9de719 100644 --- a/vndk/tools/header-checker/src/repr/ir_reader.cpp +++ b/vndk/tools/header-checker/src/repr/ir_reader.cpp @@ -50,38 +50,37 @@ IRReader::CreateIRReader( } -MergeStatus IRReader::IsBuiltinTypeNodePresent( +bool IRReader::ReadDump(const std::string &dump_file) { + module_->SetCompilationUnitPath(dump_file); + return ReadDumpImpl(dump_file); +} + + +MergeStatus IRReader::MergeBuiltinType( const BuiltinTypeIR *builtin_type, const IRReader &addend, AbiElementMap *local_to_global_type_id_map) { - std::string builtin_linker_set_key = builtin_type->GetLinkerSetKey(); - auto builtin_it = module_->builtin_types_.find(builtin_linker_set_key); + std::string linker_set_key = builtin_type->GetLinkerSetKey(); + auto builtin_it = module_->builtin_types_.find(linker_set_key); if (builtin_it != module_->builtin_types_.end()) { - return MergeStatus(false, builtin_it->second.GetSelfType()); + return MergeStatus(false, builtin_it->second.GetSelfType()); } - // Add this builtin type to the parent graph's builtin_types_ map. - // Before that, correct the type id of the builtin-type. - const std::string &local_type_id = builtin_type->GetSelfType(); - std::string builtin_global_type_id = AllocateNewTypeId(); - auto it = module_->builtin_types_.emplace( - builtin_linker_set_key, *builtin_type); - it.first->second.SetSelfType(builtin_global_type_id); - it.first->second.SetReferencedType(builtin_global_type_id); - module_->type_graph_.emplace(builtin_global_type_id, &((it.first)->second)); - MergeStatus merge_status(true, builtin_global_type_id); - local_to_global_type_id_map->emplace(local_type_id, merge_status); + // Add this builtin type to the parent graph's builtin_types_ map. + const std::string &type_id = builtin_type->GetSelfType(); + auto [it, inserted] = module_->builtin_types_.emplace( + linker_set_key, *builtin_type); + module_->type_graph_.emplace(type_id, &it->second); + + MergeStatus merge_status(true, type_id); + local_to_global_type_id_map->emplace(type_id, merge_status); return merge_status; } -MergeStatus IRReader::DoesUDTypeODRViolationExist( +MergeStatus IRReader::LookupUserDefinedType( const TypeIR *ud_type, const IRReader &addend, const std::string &ud_type_unique_id_and_source, AbiElementMap *local_to_global_type_id_map_) { - // Per entry in the map: - // /-----------------------------------------------------------------------\ - // | UDType->UniqueTagId + UdType->source File => list(const UDTypeIR *) | - // \-----------------------------------------------------------------------/ auto it = module_->odr_list_map_.find(ud_type_unique_id_and_source); if (it == module_->odr_list_map_.end()) { // Calling this an ODR violation even though it means no UD with the same @@ -90,21 +89,28 @@ MergeStatus IRReader::DoesUDTypeODRViolationExist( // allocated a new type id. return MergeStatus(true, ""); } + + // Initialize type comparator (which will compare the referenced types + // recursively). std::set type_cache; DiffPolicyOptions diff_policy_options(false) ; AbiDiffHelper diff_helper(module_->type_graph_, addend.module_->type_graph_, diff_policy_options, &type_cache, nullptr, local_to_global_type_id_map_); + + // Compare each user-defined type with the latest input user-defined type. + // If there is a match, re-use the existing user-defined type. for (auto &contender_ud : it->second) { - if (diff_helper.CompareAndDumpTypeDiff(contender_ud->GetSelfType(), - ud_type->GetSelfType()) == - DiffStatus::no_diff) { + DiffStatus result = diff_helper.CompareAndDumpTypeDiff( + contender_ud->GetSelfType(), ud_type->GetSelfType()); + if (result == DiffStatus::no_diff) { local_to_global_type_id_map_->emplace( ud_type->GetSelfType(), MergeStatus(false, contender_ud->GetSelfType())); return MergeStatus(false, contender_ud->GetSelfType()); } } + #ifdef DEBUG llvm::errs() << "ODR violation detected for: " << ud_type->GetName() << "\n"; #endif @@ -112,7 +118,7 @@ MergeStatus IRReader::DoesUDTypeODRViolationExist( } -MergeStatus IRReader::IsTypeNodePresent( +MergeStatus IRReader::LookupType( const TypeIR *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map) { std::string unique_type_id; @@ -130,12 +136,14 @@ MergeStatus IRReader::IsTypeNodePresent( GetODRListMapKey(static_cast(addend_node)); break; default: - // We add the type proactively. + // Other kinds (e.g. PointerTypeKind, QualifiedTypeKind, ArrayTypeKind, + // LvalueReferenceTypeKind, RvalueReferenceTypeKind, or BuiltinTypeKind) + // should be proactively added by returning MergeStatus with + // was_newly_added_ = true. return MergeStatus(true, "type-hidden"); } - // Every other type is a referencing type / builtin type, so it is proactively - // added by returning MergeStatus with was_newly_added_ = true. - return DoesUDTypeODRViolationExist( + + return LookupUserDefinedType( addend_node, addend, unique_type_id, local_to_global_type_id_map); } @@ -144,13 +152,11 @@ MergeStatus IRReader::IsTypeNodePresent( // graph. It also corrects the referenced_type field in the references_type // object passed and returns the merge status of the *referenced type*. MergeStatus IRReader::MergeReferencingTypeInternal( - const IRReader &addend, - ReferencesOtherType *references_type, + const IRReader &addend, ReferencesOtherType *references_type, AbiElementMap *local_to_global_type_id_map) { // First look in the local_to_global_type_id_map for the referenced type's // id. - const std::string &referenced_type_id = - references_type->GetReferencedType(); + const std::string &referenced_type_id = references_type->GetReferencedType(); auto local_to_global_it = local_to_global_type_id_map->find( referenced_type_id); if (local_to_global_it != local_to_global_type_id_map->end()) { @@ -173,10 +179,9 @@ MergeStatus IRReader::MergeReferencingTypeInternal( return merge_status; } - // The referenced type was hidden, so just set it to type-hidden. - const std::string &hidden_type_id = AllocateNewTypeId(); - references_type->SetReferencedType(hidden_type_id); - return MergeStatus(true, hidden_type_id); + // If the referenced type was hidden, create the name reference type in the + // parent module and keep the referenced type_id as-is. + return MergeStatus(true, referenced_type_id); } @@ -227,7 +232,12 @@ IRReader::UpdateUDTypeAccounting( const T *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map, AbiElementMap *specific_type_map) { - std::string added_type_id = AllocateNewTypeId(); + std::string added_type_id = addend_node->GetSelfType(); + auto type_id_it = module_->type_graph_.find(added_type_id); + if (type_id_it != module_->type_graph_.end()) { + added_type_id = AllocateNewTypeId(added_type_id, *addend.module_); + } + // Add the ud-type with type-id to the type_graph_, since if there are generic // reference types which refer to the record being added, they'll need to find // it's id in the map. @@ -250,14 +260,13 @@ IRReader::UpdateUDTypeAccounting( // This method is necessarily going to have a was_newly_merged_ = true in its // MergeStatus return. So it necessarily merges a new RecordType. MergeStatus IRReader::MergeRecordAndDependencies( - const RecordTypeIR *addend_node, const IRReader &addend, - AbiElementMap *local_to_global_type_id_map) { - auto merge_status_and_it = - UpdateUDTypeAccounting(addend_node, addend, local_to_global_type_id_map, - &module_->record_types_); - auto it = merge_status_and_it.second; - MergeRecordDependencies(addend, &(it->second), local_to_global_type_id_map); - return merge_status_and_it.first; + const RecordTypeIR *addend_node, const IRReader &addend, + AbiElementMap *local_to_global_type_id_map) { + auto [merge_status, it] = UpdateUDTypeAccounting( + addend_node, addend, local_to_global_type_id_map, + &module_->record_types_); + MergeRecordDependencies(addend, &it->second, local_to_global_type_id_map); + return merge_status; } @@ -273,8 +282,8 @@ void IRReader::MergeEnumDependencies( llvm::errs() << "Enum underlying types should not be hidden\n"; ::exit(1); } - MergeStatus merge_status = MergeType(it->second, addend, - local_to_global_type_id_map); + MergeStatus merge_status = MergeType( + it->second, addend, local_to_global_type_id_map); added_node->SetUnderlyingType(merge_status.type_id_); } @@ -284,24 +293,21 @@ void IRReader::MergeEnumDependencies( MergeStatus IRReader::MergeEnumType( const EnumTypeIR *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map) { - auto merge_status_and_it = - UpdateUDTypeAccounting(addend_node, addend, local_to_global_type_id_map, - &module_->enum_types_); - auto it = merge_status_and_it.second; - MergeEnumDependencies(addend, &(it->second), local_to_global_type_id_map); - return merge_status_and_it.first; + auto [merge_status, it] = UpdateUDTypeAccounting( + addend_node, addend, local_to_global_type_id_map, &module_->enum_types_); + MergeEnumDependencies(addend, &it->second, local_to_global_type_id_map); + return merge_status; } MergeStatus IRReader::MergeFunctionType( const FunctionTypeIR *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map) { - auto merge_status_and_it = - UpdateUDTypeAccounting(addend_node, addend, local_to_global_type_id_map, - &module_->function_types_); - auto it = merge_status_and_it.second; - MergeCFunctionLikeDeps(addend, &(it->second), local_to_global_type_id_map); - return merge_status_and_it.first; + auto [merge_status, it] = UpdateUDTypeAccounting( + addend_node, addend, local_to_global_type_id_map, + &module_->function_types_); + MergeCFunctionLikeDeps(addend, &it->second, local_to_global_type_id_map); + return merge_status; } @@ -312,9 +318,11 @@ MergeStatus IRReader::MergeReferencingTypeInternalAndUpdateParent( AbiElementMap *parent_map, const std::string &updated_self_type_id) { MergeStatus merge_status; uint64_t old_max_type_id = max_type_id_; + // Create copy of addend_node - T added_node = *(addend_node); + T added_node = *addend_node; added_node.SetSelfType(updated_self_type_id); + // The merge status returned is the merge status of the referenced type. merge_status = MergeReferencingTypeInternal(addend, &added_node, local_to_global_type_id_map); @@ -368,57 +376,55 @@ MergeStatus IRReader::MergeReferencingTypeInternalAndUpdateParent( } -MergeStatus IRReader::MergeReferencingType( - const IRReader &addend, const TypeIR *addend_node, - AbiElementMap *local_to_global_type_id_map, - const std::string &updated_self_type_id) { - switch (addend_node->GetKind()) { - case PointerTypeKind: - return MergeReferencingTypeInternalAndUpdateParent( - addend, static_cast(addend_node), - local_to_global_type_id_map, &module_->pointer_types_, - updated_self_type_id); - case QualifiedTypeKind: - return MergeReferencingTypeInternalAndUpdateParent( - addend, static_cast(addend_node), - local_to_global_type_id_map, &module_->qualified_types_, - updated_self_type_id); - case ArrayTypeKind: - return MergeReferencingTypeInternalAndUpdateParent( - addend, static_cast(addend_node), - local_to_global_type_id_map, &module_->array_types_, - updated_self_type_id); - case LvalueReferenceTypeKind: - return MergeReferencingTypeInternalAndUpdateParent( - addend, static_cast(addend_node), - local_to_global_type_id_map, &module_->lvalue_reference_types_, - updated_self_type_id); - case RvalueReferenceTypeKind: - return MergeReferencingTypeInternalAndUpdateParent( - addend, static_cast(addend_node), - local_to_global_type_id_map, &module_->rvalue_reference_types_, - updated_self_type_id); - default: - // Only referencing types - assert(0); - } -} - - // This method creates a new node for the addend node in the graph if MergeType // on the reference returned a MergeStatus with was_newly_added_ = true. -MergeStatus IRReader::MergeGenericReferringType( +MergeStatus IRReader::MergeReferencingType( const IRReader &addend, const TypeIR *addend_node, AbiElementMap *local_to_global_type_id_map) { // First add the type 'pro-actively'. We need to do this since we'll need to // fill in 'referenced-type' fields in all this type's descendants and // descendants which are compound types (records), can refer to this type. - std::string added_type_id = AllocateNewTypeId(); - // Add the added record type to the local_to_global_type_id_map + std::string added_type_id = addend_node->GetSelfType(); + auto type_id_it = module_->type_graph_.find(added_type_id); + if (type_id_it != module_->type_graph_.end()) { + added_type_id = AllocateNewTypeId(added_type_id, *addend.module_); + } + + // Add the added record type to the local_to_global_type_id_map. local_to_global_type_id_map->emplace(addend_node->GetSelfType(), MergeStatus(true, added_type_id)); - return MergeReferencingType(addend, addend_node, local_to_global_type_id_map, - added_type_id); + + // Merge the type. + switch (addend_node->GetKind()) { + case PointerTypeKind: + return MergeReferencingTypeInternalAndUpdateParent( + addend, static_cast(addend_node), + local_to_global_type_id_map, &module_->pointer_types_, + added_type_id); + case QualifiedTypeKind: + return MergeReferencingTypeInternalAndUpdateParent( + addend, static_cast(addend_node), + local_to_global_type_id_map, &module_->qualified_types_, + added_type_id); + case ArrayTypeKind: + return MergeReferencingTypeInternalAndUpdateParent( + addend, static_cast(addend_node), + local_to_global_type_id_map, &module_->array_types_, + added_type_id); + case LvalueReferenceTypeKind: + return MergeReferencingTypeInternalAndUpdateParent( + addend, static_cast(addend_node), + local_to_global_type_id_map, &module_->lvalue_reference_types_, + added_type_id); + case RvalueReferenceTypeKind: + return MergeReferencingTypeInternalAndUpdateParent( + addend, static_cast(addend_node), + local_to_global_type_id_map, &module_->rvalue_reference_types_, + added_type_id); + default: + // Only referencing types + assert(0); + } } @@ -427,23 +433,24 @@ MergeStatus IRReader::MergeTypeInternal( AbiElementMap *local_to_global_type_id_map) { switch (addend_node->GetKind()) { case BuiltinTypeKind: - return IsBuiltinTypeNodePresent( + return MergeBuiltinType( static_cast(addend_node), addend, local_to_global_type_id_map); - break; case RecordTypeKind: return MergeRecordAndDependencies( - static_cast(addend_node), - addend, local_to_global_type_id_map); + static_cast(addend_node), addend, + local_to_global_type_id_map); case EnumTypeKind: - return MergeEnumType(static_cast( - addend_node), addend, local_to_global_type_id_map); + return MergeEnumType( + static_cast(addend_node), addend, + local_to_global_type_id_map); case FunctionTypeKind: - return MergeFunctionType(static_cast( - addend_node), addend, local_to_global_type_id_map); + return MergeFunctionType( + static_cast(addend_node), addend, + local_to_global_type_id_map); default: - return MergeGenericReferringType(addend, addend_node, - local_to_global_type_id_map); + return MergeReferencingType(addend, addend_node, + local_to_global_type_id_map); } assert(0); } @@ -460,7 +467,7 @@ MergeStatus IRReader::MergeType( return type_it->second; } - MergeStatus merge_status = IsTypeNodePresent( + MergeStatus merge_status = LookupType( addend_node, addend, local_to_global_type_id_map); if (!merge_status.was_newly_added_) { return merge_status; @@ -474,19 +481,17 @@ MergeStatus IRReader::MergeType( void IRReader::MergeCFunctionLikeDeps( const IRReader &addend, CFunctionLikeIR *cfunction_like_ir, AbiElementMap *local_to_global_type_id_map) { - // Merge the return type first. + // Merge the return type. auto ret_type_it = addend.module_->type_graph_.find(cfunction_like_ir->GetReturnType()); - if (ret_type_it == addend.module_->type_graph_.end()) { - // Hidden types aren't officially added to the parent since there is - // nothing actually backing it. We assign a type-id. - cfunction_like_ir->SetReturnType(AllocateNewTypeId()); - } else { + if (ret_type_it != addend.module_->type_graph_.end()) { + // Merge the type if we can find another type in the parent module. MergeStatus ret_merge_status = MergeType(ret_type_it->second, addend, local_to_global_type_id_map); cfunction_like_ir->SetReturnType(ret_merge_status.type_id_); } - // Merge and fix parameters. + + // Merge the argument types. for (auto ¶m : cfunction_like_ir->GetParameters()) { MergeReferencingTypeInternal(addend, ¶m, local_to_global_type_id_map); } @@ -497,7 +502,8 @@ void IRReader::MergeFunctionDeps( FunctionIR *added_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map) { MergeCFunctionLikeDeps(addend, added_node, local_to_global_type_id_map); - // Merge and fix template parameters + + // Merge the template arguments. for (auto &template_element : added_node->GetTemplateElements()) { MergeReferencingTypeInternal(addend, &template_element, local_to_global_type_id_map); @@ -528,8 +534,9 @@ void IRReader::MergeFunction( } -std::string IRReader::AllocateNewTypeId() { - return "type-" + std::to_string(++max_type_id_); +std::string IRReader::AllocateNewTypeId(const std::string &addend_type_id, + const ModuleIR &addend_module) { + return addend_type_id + "#ODR:" + addend_module.GetCompilationUnitPath(); } diff --git a/vndk/tools/header-checker/src/repr/ir_reader.h b/vndk/tools/header-checker/src/repr/ir_reader.h index e3f318210..a35418354 100644 --- a/vndk/tools/header-checker/src/repr/ir_reader.h +++ b/vndk/tools/header-checker/src/repr/ir_reader.h @@ -58,7 +58,7 @@ class IRReader { virtual ~IRReader() {} - virtual bool ReadDump(const std::string &dump_file) = 0; + bool ReadDump(const std::string &dump_file); ModuleIR &GetModule() { return *module_; @@ -71,40 +71,7 @@ class IRReader { void MergeGraphs(const IRReader &addend); private: - template - MergeStatus MergeReferencingTypeInternalAndUpdateParent( - const IRReader &addend, const T *addend_node, - AbiElementMap *local_to_global_type_id_map, - AbiElementMap *parent_map, const std::string &updated_self_type_id); - - MergeStatus DoesUDTypeODRViolationExist( - const TypeIR *ud_type, const IRReader &addend, - const std::string &ud_type_unique_id, - AbiElementMap *local_to_global_type_id_map_); - - MergeStatus MergeReferencingTypeInternal( - const IRReader &addend, ReferencesOtherType *references_type, - AbiElementMap *local_to_global_type_id_map); - - MergeStatus MergeReferencingType( - const IRReader &addend, const TypeIR *addend_node, - AbiElementMap *local_to_global_type_id_map, - const std::string &updated_self_type_id); - - MergeStatus MergeGenericReferringType( - const IRReader &addend, const TypeIR *addend_node, - AbiElementMap *local_to_global_type_id_map); - - template - std::pair::iterator> - UpdateUDTypeAccounting( - const T *addend_node, const IRReader &addend, - AbiElementMap *local_to_global_type_id_map, - AbiElementMap *specific_type_map); - - MergeStatus MergeTypeInternal( - const TypeIR *addend_node, const IRReader &addend, - AbiElementMap *local_to_global_type_id_map); + virtual bool ReadDumpImpl(const std::string &dump_file) = 0; void MergeCFunctionLikeDeps( const IRReader &addend, CFunctionLikeIR *cfunction_like_ir, @@ -142,10 +109,6 @@ class IRReader { const IRReader &addend, RecordTypeIR *added_node, AbiElementMap *local_to_global_type_id_map); - MergeStatus IsBuiltinTypeNodePresent( - const BuiltinTypeIR *builtin_type, const IRReader &addend, - AbiElementMap *local_to_global_type_id_map); - void MergeGlobalVariable( const GlobalVarIR *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map); @@ -162,11 +125,41 @@ class IRReader { const FunctionIR *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map); - void UpdateIRReaderTypeGraph( - const TypeIR *addend_node, const std::string &added_type_id, + template + MergeStatus MergeReferencingTypeInternalAndUpdateParent( + const IRReader &addend, const T *addend_node, + AbiElementMap *local_to_global_type_id_map, + AbiElementMap *parent_map, const std::string &updated_self_type_id); + + MergeStatus MergeReferencingTypeInternal( + const IRReader &addend, ReferencesOtherType *references_type, AbiElementMap *local_to_global_type_id_map); - MergeStatus IsTypeNodePresent( + MergeStatus MergeReferencingType( + const IRReader &addend, const TypeIR *addend_node, + AbiElementMap *local_to_global_type_id_map); + + template + std::pair::iterator> + UpdateUDTypeAccounting( + const T *addend_node, const IRReader &addend, + AbiElementMap *local_to_global_type_id_map, + AbiElementMap *specific_type_map); + + MergeStatus MergeBuiltinType( + const BuiltinTypeIR *builtin_type, const IRReader &addend, + AbiElementMap *local_to_global_type_id_map); + + MergeStatus LookupUserDefinedType( + const TypeIR *ud_type, const IRReader &addend, + const std::string &ud_type_unique_id, + AbiElementMap *local_to_global_type_id_map_); + + MergeStatus LookupType( + const TypeIR *addend_node, const IRReader &addend, + AbiElementMap *local_to_global_type_id_map); + + MergeStatus MergeTypeInternal( const TypeIR *addend_node, const IRReader &addend, AbiElementMap *local_to_global_type_id_map); @@ -174,7 +167,8 @@ class IRReader { const TypeIR *addend_type, const IRReader &addend, AbiElementMap *merged_types_cache); - std::string AllocateNewTypeId(); + std::string AllocateNewTypeId(const std::string &addend_type_id, + const ModuleIR &addend_module); protected: std::unique_ptr module_; diff --git a/vndk/tools/header-checker/src/repr/ir_representation.h b/vndk/tools/header-checker/src/repr/ir_representation.h index 7294daf01..12ba97a24 100644 --- a/vndk/tools/header-checker/src/repr/ir_representation.h +++ b/vndk/tools/header-checker/src/repr/ir_representation.h @@ -764,6 +764,14 @@ class ModuleIR { ModuleIR(const std::set *exported_headers) : exported_headers_(exported_headers) {} + const std::string &GetCompilationUnitPath() const { + return compilation_unit_path_; + } + + void SetCompilationUnitPath(const std::string &compilation_unit_path) { + compilation_unit_path_ = compilation_unit_path; + } + const AbiElementMap &GetFunctions() const { return functions_; } @@ -872,6 +880,9 @@ class ModuleIR { public: + // File path to the compilation unit (*.sdump) + std::string compilation_unit_path_; + AbiElementList record_types_list_; AbiElementMap functions_; AbiElementMap global_variables_; diff --git a/vndk/tools/header-checker/src/repr/json/ir_reader.cpp b/vndk/tools/header-checker/src/repr/json/ir_reader.cpp index 1e87e8f75..db1928201 100644 --- a/vndk/tools/header-checker/src/repr/json/ir_reader.cpp +++ b/vndk/tools/header-checker/src/repr/json/ir_reader.cpp @@ -152,7 +152,7 @@ GetElfSymbolBinding(const JsonObjectRef &elf_symbol) { "Failed to convert JSON to ElfSymbolBinding"); } -bool JsonIRReader::ReadDump(const std::string &dump_file) { +bool JsonIRReader::ReadDumpImpl(const std::string &dump_file) { Json::Value tu_json; Json::Reader reader; std::ifstream input(dump_file); diff --git a/vndk/tools/header-checker/src/repr/json/ir_reader.h b/vndk/tools/header-checker/src/repr/json/ir_reader.h index fe037a7a3..049e070fa 100644 --- a/vndk/tools/header-checker/src/repr/json/ir_reader.h +++ b/vndk/tools/header-checker/src/repr/json/ir_reader.h @@ -116,9 +116,9 @@ class JsonIRReader : public IRReader { JsonIRReader(const std::set *exported_headers) : IRReader(exported_headers) {} - bool ReadDump(const std::string &dump_file) override; - private: + bool ReadDumpImpl(const std::string &dump_file) override; + void ReadFunctions(const JsonObjectRef &tu); void ReadGlobalVariables(const JsonObjectRef &tu); diff --git a/vndk/tools/header-checker/src/repr/protobuf/ir_reader.cpp b/vndk/tools/header-checker/src/repr/protobuf/ir_reader.cpp index 3b5725c7b..9974cfd5a 100644 --- a/vndk/tools/header-checker/src/repr/protobuf/ir_reader.cpp +++ b/vndk/tools/header-checker/src/repr/protobuf/ir_reader.cpp @@ -39,7 +39,7 @@ void ProtobufIRReader::ReadTypeInfo( typep->SetAlignment(type_info.alignment()); } -bool ProtobufIRReader::ReadDump(const std::string &dump_file) { +bool ProtobufIRReader::ReadDumpImpl(const std::string &dump_file) { abi_dump::TranslationUnit tu; std::ifstream input(dump_file); google::protobuf::io::IstreamInputStream text_is(&input); diff --git a/vndk/tools/header-checker/src/repr/protobuf/ir_reader.h b/vndk/tools/header-checker/src/repr/protobuf/ir_reader.h index c943e685a..b33e68670 100644 --- a/vndk/tools/header-checker/src/repr/protobuf/ir_reader.h +++ b/vndk/tools/header-checker/src/repr/protobuf/ir_reader.h @@ -42,10 +42,9 @@ class ProtobufIRReader : public IRReader { : IRReader(exported_headers) {} - bool ReadDump(const std::string &dump_file) override; - - private: + bool ReadDumpImpl(const std::string &dump_file) override; + void ReadFunctions(const abi_dump::TranslationUnit &tu); void ReadGlobalVariables(const abi_dump::TranslationUnit &tu); diff --git a/vndk/tools/header-checker/tests/expected/example1.cpp b/vndk/tools/header-checker/tests/expected/example1.cpp index c441c6d92..c7658d29a 100644 --- a/vndk/tools/header-checker/tests/expected/example1.cpp +++ b/vndk/tools/header-checker/tests/expected/example1.cpp @@ -3,19 +3,19 @@ record_types { name: "HiddenBase" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI10HiddenBase" source_file: "/development/vndk/tools/header-checker/tests/input/example3.h" linker_set_key: "_ZTI10HiddenBase" - self_type: "type-1" + self_type: "_ZTI10HiddenBase" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "hide" access: private_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "seek" access: private_access @@ -28,20 +28,20 @@ record_types { name: "List" size: 8 alignment: 8 - referenced_type: "type-31" + referenced_type: "_ZTI4ListIfE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI4ListIfE" - self_type: "type-31" + self_type: "_ZTI4ListIfE" } fields { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" field_offset: 0 field_name: "middle" access: public_access } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } access: public_access @@ -52,20 +52,20 @@ record_types { name: "List" size: 8 alignment: 8 - referenced_type: "type-35" + referenced_type: "_ZTI4ListIiE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI4ListIiE" - self_type: "type-35" + self_type: "_ZTI4ListIiE" } fields { - referenced_type: "type-37" + referenced_type: "_ZTIPN4ListIiE5_NodeE" field_offset: 0 field_name: "middle" access: public_access } template_info { elements { - referenced_type: "type-2" + referenced_type: "_ZTIi" } } access: public_access @@ -76,43 +76,43 @@ record_types { name: "Hello" size: 32 alignment: 4 - referenced_type: "type-19" + referenced_type: "_ZTI5Hello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI5Hello" - self_type: "type-19" + self_type: "_ZTI5Hello" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "foo" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "bar" access: public_access } fields { - referenced_type: "type-20" + referenced_type: "_ZTIw" field_offset: 64 field_name: "d" access: public_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIj" field_offset: 96 field_name: "enum_field" access: public_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIj" field_offset: 128 field_name: "enum_field2" access: public_access } fields { - referenced_type: "type-21" + referenced_type: "_ZTIN5HelloUt1_E" field_offset: 160 field_name: "" access: public_access @@ -125,30 +125,30 @@ record_types { name: "CPPHello" size: 56 alignment: 8 - referenced_type: "type-23" + referenced_type: "_ZTI8CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI8CPPHello" - self_type: "type-23" + self_type: "_ZTI8CPPHello" } fields { - referenced_type: "type-24" + referenced_type: "_ZTIKi" field_offset: 352 field_name: "cpp_foo" access: public_access } fields { - referenced_type: "type-25" + referenced_type: "_ZTIKf" field_offset: 384 field_name: "cpp_bar" access: public_access } base_specifiers { - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" is_virtual: false access: private_access } base_specifiers { - referenced_type: "type-15" + referenced_type: "_ZTIN5test38ByeAgainIfEE" is_virtual: false access: public_access } @@ -192,25 +192,25 @@ record_types { name: "List::_Node" size: 24 alignment: 8 - referenced_type: "type-32" + referenced_type: "_ZTIN4ListIfE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN4ListIfE5_NodeE" - self_type: "type-32" + self_type: "_ZTIN4ListIfE5_NodeE" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 0 field_name: "mVal" access: private_access } fields { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" field_offset: 64 field_name: "mpPrev" access: private_access } fields { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" field_offset: 128 field_name: "mpNext" access: private_access @@ -223,25 +223,25 @@ record_types { name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)" size: 12 alignment: 4 - referenced_type: "type-21" + referenced_type: "_ZTIN5HelloUt1_E" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN5HelloUt1_E" - self_type: "type-21" + self_type: "_ZTIN5HelloUt1_E" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "b" access: public_access } fields { - referenced_type: "type-22" + referenced_type: "_ZTIN5HelloUt1_Ut_E" field_offset: 64 field_name: "" access: public_access @@ -255,13 +255,13 @@ record_types { name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)" size: 4 alignment: 4 - referenced_type: "type-22" + referenced_type: "_ZTIN5HelloUt1_Ut_E" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN5HelloUt1_Ut_E" - self_type: "type-22" + self_type: "_ZTIN5HelloUt1_Ut_E" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -275,19 +275,19 @@ record_types { name: "test2::HelloAgain" size: 40 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test210HelloAgainE" - self_type: "type-4" + self_type: "_ZTIN5test210HelloAgainE" } fields { - referenced_type: "type-5" + referenced_type: "_ZTINSt3__16vectorIPN5test210HelloAgainENS_9allocatorIS3_EEEE" field_offset: 64 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 256 field_name: "bar_again" access: public_access @@ -332,13 +332,13 @@ record_types { name: "test3::Outer::Inner" size: 4 alignment: 4 - referenced_type: "type-18" + referenced_type: "_ZTIN5test35Outer5InnerE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test35Outer5InnerE" - self_type: "type-18" + self_type: "_ZTIN5test35Outer5InnerE" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "b" access: private_access @@ -351,13 +351,13 @@ record_types { name: "test3::Outer" size: 4 alignment: 4 - referenced_type: "type-17" + referenced_type: "_ZTIN5test35OuterE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test35OuterE" - self_type: "type-17" + self_type: "_ZTIN5test35OuterE" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -370,26 +370,26 @@ record_types { name: "test3::ByeAgain" size: 16 alignment: 8 - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test38ByeAgainIdEE" - self_type: "type-13" + self_type: "_ZTIN5test38ByeAgainIdEE" } fields { - referenced_type: "type-14" + referenced_type: "_ZTId" field_offset: 0 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "bar_again" access: public_access } template_info { elements { - referenced_type: "type-14" + referenced_type: "_ZTId" } } access: public_access @@ -400,26 +400,26 @@ record_types { name: "test3::ByeAgain" size: 8 alignment: 4 - referenced_type: "type-15" + referenced_type: "_ZTIN5test38ByeAgainIfEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test38ByeAgainIfEE" - self_type: "type-15" + self_type: "_ZTIN5test38ByeAgainIfEE" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 0 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "bar_Again" access: public_access } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } access: public_access @@ -430,12 +430,12 @@ enum_types { name: "Foo_s" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI5Foo_s" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTI5Foo_s" - self_type: "type-8" + self_type: "_ZTI5Foo_s" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 10 name: "foosball" @@ -451,12 +451,12 @@ enum_types { name: "test3::Kind" size: 4 alignment: 4 - referenced_type: "type-16" + referenced_type: "_ZTIN5test34KindE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test34KindE" - self_type: "type-16" + self_type: "_ZTIN5test34KindE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 24 name: "test3::kind1" @@ -472,12 +472,12 @@ enum_types { name: "CPPHello::Bla" size: 4 alignment: 4 - referenced_type: "type-27" + referenced_type: "_ZTIN8CPPHello3BlaE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN8CPPHello3BlaE" - self_type: "type-27" + self_type: "_ZTIN8CPPHello3BlaE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "CPPHello::BLA" @@ -489,10 +489,10 @@ pointer_types { name: "CPPHello *" size: 8 alignment: 8 - referenced_type: "type-23" + referenced_type: "_ZTI8CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIP8CPPHello" - self_type: "type-26" + self_type: "_ZTIP8CPPHello" } } pointer_types { @@ -500,10 +500,10 @@ pointer_types { name: "const char *" size: 8 alignment: 8 - referenced_type: "type-38" + referenced_type: "_ZTIKc" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPKc" - self_type: "type-39" + self_type: "_ZTIPKc" } } pointer_types { @@ -511,10 +511,10 @@ pointer_types { name: "List::_Node *" size: 8 alignment: 8 - referenced_type: "type-32" + referenced_type: "_ZTIN4ListIfE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPN4ListIfE5_NodeE" - self_type: "type-33" + self_type: "_ZTIPN4ListIfE5_NodeE" } } pointer_types { @@ -522,10 +522,10 @@ pointer_types { name: "List::_Node *" size: 8 alignment: 8 - referenced_type: "type-36" + referenced_type: "_ZTIN4ListIiE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPN4ListIiE5_NodeE" - self_type: "type-37" + self_type: "_ZTIPN4ListIiE5_NodeE" } } pointer_types { @@ -533,10 +533,10 @@ pointer_types { name: "test2::HelloAgain *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIPN5test210HelloAgainE" - self_type: "type-7" + self_type: "_ZTIPN5test210HelloAgainE" } } pointer_types { @@ -544,10 +544,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPf" - self_type: "type-30" + self_type: "_ZTIPf" } } pointer_types { @@ -555,10 +555,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPi" - self_type: "type-29" + self_type: "_ZTIPi" } } lvalue_reference_types { @@ -566,10 +566,10 @@ lvalue_reference_types { name: "const float &" size: 8 alignment: 8 - referenced_type: "type-25" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIRKf" - self_type: "type-34" + self_type: "_ZTIRKf" } } builtin_types { @@ -577,10 +577,10 @@ builtin_types { name: "bool" size: 1 alignment: 1 - referenced_type: "type-12" + referenced_type: "_ZTIb" source_file: "" linker_set_key: "_ZTIb" - self_type: "type-12" + self_type: "_ZTIb" } is_unsigned: true is_integral: true @@ -590,10 +590,10 @@ builtin_types { name: "char" size: 1 alignment: 1 - referenced_type: "type-40" + referenced_type: "_ZTIc" source_file: "" linker_set_key: "_ZTIc" - self_type: "type-40" + self_type: "_ZTIc" } is_unsigned: false is_integral: true @@ -603,10 +603,10 @@ builtin_types { name: "double" size: 8 alignment: 8 - referenced_type: "type-14" + referenced_type: "_ZTId" source_file: "" linker_set_key: "_ZTId" - self_type: "type-14" + self_type: "_ZTId" } is_unsigned: false is_integral: false @@ -616,10 +616,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -629,10 +629,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -642,10 +642,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -655,10 +655,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-6" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-6" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -668,10 +668,10 @@ builtin_types { name: "wchar_t" size: 4 alignment: 4 - referenced_type: "type-20" + referenced_type: "_ZTIw" source_file: "" linker_set_key: "_ZTIw" - self_type: "type-20" + self_type: "_ZTIw" } is_unsigned: false is_integral: true @@ -681,10 +681,10 @@ qualified_types { name: "bool const[2]" size: 2 alignment: 1 - referenced_type: "type-10" + referenced_type: "_ZTIA2_b" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIA2_Kb" - self_type: "type-11" + self_type: "_ZTIA2_Kb" } is_const: true is_volatile: false @@ -695,10 +695,10 @@ qualified_types { name: "const CPPHello" size: 56 alignment: 8 - referenced_type: "type-23" + referenced_type: "_ZTI8CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIK8CPPHello" - self_type: "type-28" + self_type: "_ZTIK8CPPHello" } is_const: true is_volatile: false @@ -709,10 +709,10 @@ qualified_types { name: "const char" size: 1 alignment: 1 - referenced_type: "type-40" + referenced_type: "_ZTIc" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKc" - self_type: "type-38" + self_type: "_ZTIKc" } is_const: true is_volatile: false @@ -723,10 +723,10 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKf" - self_type: "type-25" + self_type: "_ZTIKf" } is_const: true is_volatile: false @@ -737,10 +737,10 @@ qualified_types { name: "const int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKi" - self_type: "type-24" + self_type: "_ZTIKi" } is_const: true is_volatile: false @@ -751,64 +751,64 @@ array_types { name: "bool [2]" size: 2 alignment: 1 - referenced_type: "type-12" + referenced_type: "_ZTIb" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIA2_b" - self_type: "type-10" + self_type: "_ZTIA2_b" } } functions { - return_type: "type-31" + return_type: "_ZTI4ListIfE" function_name: "castInterface" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-31" + referenced_type: "_ZTI4ListIfE" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-39" + referenced_type: "_ZTIPKc" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-12" + referenced_type: "_ZTIb" default_arg: false is_this_ptr: false } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } linker_set_key: "_Z13castInterfaceIffffE4ListIT_ES0_IT0_EPKcb" access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "boo" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-28" + referenced_type: "_ZTIK8CPPHello" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-29" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-30" + referenced_type: "_ZTIPf" default_arg: false is_this_ptr: false } @@ -816,23 +816,23 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "format" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_Z6formatv" access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-34" + referenced_type: "_ZTIRKf" default_arg: false is_this_ptr: false } @@ -840,16 +840,16 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-34" + referenced_type: "_ZTIRKf" default_arg: false is_this_ptr: false } @@ -857,11 +857,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::~_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -869,11 +869,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::~_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-33" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -881,11 +881,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -893,11 +893,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -905,11 +905,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -917,11 +917,11 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIb" function_name: "test3::End" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: true is_this_ptr: false } @@ -929,11 +929,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "CPPHello::again" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-26" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -941,11 +941,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "CPPHello::test_enum" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-26" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -953,11 +953,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "CPPHello::CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-26" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -965,11 +965,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "CPPHello::CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-26" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -980,48 +980,48 @@ global_vars { name: "__test_var" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZL10__test_var" - referenced_type: "type-11" + referenced_type: "_ZTIA2_Kb" access: public_access } global_vars { name: "test2::HelloAgain::hello_forever" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test210HelloAgain13hello_foreverE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } global_vars { name: "test3::double_bye" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test310double_byeE" - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" access: public_access } global_vars { name: "test3::ByeAgain::foo_forever" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test38ByeAgainIfE11foo_foreverE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } global_vars { name: "float_list_test" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "float_list_test" - referenced_type: "type-31" + referenced_type: "_ZTI4ListIfE" access: public_access } global_vars { name: "int_list_test" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "int_list_test" - referenced_type: "type-35" + referenced_type: "_ZTI4ListIiE" access: public_access } global_vars { name: "node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "node" - referenced_type: "type-32" + referenced_type: "_ZTIN4ListIfE5_NodeE" access: public_access } diff --git a/vndk/tools/header-checker/tests/expected/example1.h b/vndk/tools/header-checker/tests/expected/example1.h index f65230b2f..54b0d8dda 100644 --- a/vndk/tools/header-checker/tests/expected/example1.h +++ b/vndk/tools/header-checker/tests/expected/example1.h @@ -3,19 +3,19 @@ record_types { name: "HiddenBase" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI10HiddenBase" source_file: "/development/vndk/tools/header-checker/tests/input/example3.h" linker_set_key: "_ZTI10HiddenBase" - self_type: "type-1" + self_type: "_ZTI10HiddenBase" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "hide" access: private_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "seek" access: private_access @@ -28,20 +28,20 @@ record_types { name: "List" size: 8 alignment: 8 - referenced_type: "type-34" + referenced_type: "_ZTI4ListIfE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI4ListIfE" - self_type: "type-34" + self_type: "_ZTI4ListIfE" } fields { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" field_offset: 0 field_name: "middle" access: public_access } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } access: public_access @@ -52,20 +52,20 @@ record_types { name: "List" size: 8 alignment: 8 - referenced_type: "type-41" + referenced_type: "_ZTI4ListIiE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI4ListIiE" - self_type: "type-41" + self_type: "_ZTI4ListIiE" } fields { - referenced_type: "type-43" + referenced_type: "_ZTIPN4ListIiE5_NodeE" field_offset: 0 field_name: "middle" access: public_access } template_info { elements { - referenced_type: "type-2" + referenced_type: "_ZTIi" } } access: public_access @@ -76,43 +76,43 @@ record_types { name: "Hello" size: 32 alignment: 4 - referenced_type: "type-21" + referenced_type: "_ZTI5Hello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI5Hello" - self_type: "type-21" + self_type: "_ZTI5Hello" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "foo" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "bar" access: public_access } fields { - referenced_type: "type-22" + referenced_type: "_ZTIw" field_offset: 64 field_name: "d" access: public_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIj" field_offset: 96 field_name: "enum_field" access: public_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIj" field_offset: 128 field_name: "enum_field2" access: public_access } fields { - referenced_type: "type-23" + referenced_type: "_ZTIN5HelloUt1_E" field_offset: 160 field_name: "" access: public_access @@ -125,30 +125,30 @@ record_types { name: "CPPHello" size: 56 alignment: 8 - referenced_type: "type-25" + referenced_type: "_ZTI8CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTI8CPPHello" - self_type: "type-25" + self_type: "_ZTI8CPPHello" } fields { - referenced_type: "type-26" + referenced_type: "_ZTIKi" field_offset: 352 field_name: "cpp_foo" access: public_access } fields { - referenced_type: "type-27" + referenced_type: "_ZTIKf" field_offset: 384 field_name: "cpp_bar" access: public_access } base_specifiers { - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" is_virtual: false access: private_access } base_specifiers { - referenced_type: "type-15" + referenced_type: "_ZTIN5test38ByeAgainIfEE" is_virtual: false access: public_access } @@ -192,25 +192,25 @@ record_types { name: "List::_Node" size: 24 alignment: 8 - referenced_type: "type-35" + referenced_type: "_ZTIN4ListIfE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN4ListIfE5_NodeE" - self_type: "type-35" + self_type: "_ZTIN4ListIfE5_NodeE" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 0 field_name: "mVal" access: private_access } fields { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" field_offset: 64 field_name: "mpPrev" access: private_access } fields { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" field_offset: 128 field_name: "mpNext" access: private_access @@ -223,25 +223,25 @@ record_types { name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)" size: 12 alignment: 4 - referenced_type: "type-23" + referenced_type: "_ZTIN5HelloUt1_E" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN5HelloUt1_E" - self_type: "type-23" + self_type: "_ZTIN5HelloUt1_E" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "b" access: public_access } fields { - referenced_type: "type-24" + referenced_type: "_ZTIN5HelloUt1_Ut_E" field_offset: 64 field_name: "" access: public_access @@ -255,13 +255,13 @@ record_types { name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)" size: 4 alignment: 4 - referenced_type: "type-24" + referenced_type: "_ZTIN5HelloUt1_Ut_E" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN5HelloUt1_Ut_E" - self_type: "type-24" + self_type: "_ZTIN5HelloUt1_Ut_E" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -275,19 +275,19 @@ record_types { name: "test2::HelloAgain" size: 40 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test210HelloAgainE" - self_type: "type-4" + self_type: "_ZTIN5test210HelloAgainE" } fields { - referenced_type: "type-5" + referenced_type: "_ZTINSt3__16vectorIPN5test210HelloAgainENS_9allocatorIS3_EEEE" field_offset: 64 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 256 field_name: "bar_again" access: public_access @@ -332,13 +332,13 @@ record_types { name: "test3::Outer::Inner" size: 4 alignment: 4 - referenced_type: "type-18" + referenced_type: "_ZTIN5test35Outer5InnerE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test35Outer5InnerE" - self_type: "type-18" + self_type: "_ZTIN5test35Outer5InnerE" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "b" access: private_access @@ -351,13 +351,13 @@ record_types { name: "test3::Outer" size: 4 alignment: 4 - referenced_type: "type-17" + referenced_type: "_ZTIN5test35OuterE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test35OuterE" - self_type: "type-17" + self_type: "_ZTIN5test35OuterE" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -370,26 +370,26 @@ record_types { name: "test3::ByeAgain" size: 16 alignment: 8 - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test38ByeAgainIdEE" - self_type: "type-13" + self_type: "_ZTIN5test38ByeAgainIdEE" } fields { - referenced_type: "type-14" + referenced_type: "_ZTId" field_offset: 0 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "bar_again" access: public_access } template_info { elements { - referenced_type: "type-14" + referenced_type: "_ZTId" } } access: public_access @@ -400,26 +400,26 @@ record_types { name: "test3::ByeAgain" size: 8 alignment: 4 - referenced_type: "type-15" + referenced_type: "_ZTIN5test38ByeAgainIfEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test38ByeAgainIfEE" - self_type: "type-15" + self_type: "_ZTIN5test38ByeAgainIfEE" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 0 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "bar_Again" access: public_access } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } access: public_access @@ -430,12 +430,12 @@ enum_types { name: "Foo_s" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI5Foo_s" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTI5Foo_s" - self_type: "type-8" + self_type: "_ZTI5Foo_s" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 10 name: "foosball" @@ -451,12 +451,12 @@ enum_types { name: "test3::Kind" size: 4 alignment: 4 - referenced_type: "type-16" + referenced_type: "_ZTIN5test34KindE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test34KindE" - self_type: "type-16" + self_type: "_ZTIN5test34KindE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 24 name: "test3::kind1" @@ -472,12 +472,12 @@ enum_types { name: "CPPHello::Bla" size: 4 alignment: 4 - referenced_type: "type-29" + referenced_type: "_ZTIN8CPPHello3BlaE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIN8CPPHello3BlaE" - self_type: "type-29" + self_type: "_ZTIN8CPPHello3BlaE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "CPPHello::BLA" @@ -489,10 +489,10 @@ pointer_types { name: "ForwardDeclaration *" size: 8 alignment: 8 - referenced_type: "type-19" + referenced_type: "_ZTI18ForwardDeclaration" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIP18ForwardDeclaration" - self_type: "type-20" + self_type: "_ZTIP18ForwardDeclaration" } } pointer_types { @@ -500,10 +500,10 @@ pointer_types { name: "List *" size: 8 alignment: 8 - referenced_type: "type-41" + referenced_type: "_ZTI4ListIiE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIP4ListIiE" - self_type: "type-44" + self_type: "_ZTIP4ListIiE" } } pointer_types { @@ -511,10 +511,10 @@ pointer_types { name: "CPPHello *" size: 8 alignment: 8 - referenced_type: "type-25" + referenced_type: "_ZTI8CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIP8CPPHello" - self_type: "type-28" + self_type: "_ZTIP8CPPHello" } } pointer_types { @@ -522,10 +522,10 @@ pointer_types { name: "StackNode *" size: 8 alignment: 8 - referenced_type: "type-45" + referenced_type: "_ZTI9StackNodeIiE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIP9StackNodeIiE" - self_type: "type-46" + self_type: "_ZTIP9StackNodeIiE" } } pointer_types { @@ -533,10 +533,10 @@ pointer_types { name: "const List::_Node *" size: 8 alignment: 8 - referenced_type: "type-39" + referenced_type: "_ZTIKN4ListIfE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPKN4ListIfE5_NodeE" - self_type: "type-40" + self_type: "_ZTIPKN4ListIfE5_NodeE" } } pointer_types { @@ -544,10 +544,10 @@ pointer_types { name: "const char *" size: 8 alignment: 8 - referenced_type: "type-47" + referenced_type: "_ZTIKc" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPKc" - self_type: "type-48" + self_type: "_ZTIPKc" } } pointer_types { @@ -555,10 +555,10 @@ pointer_types { name: "List::_Node *" size: 8 alignment: 8 - referenced_type: "type-35" + referenced_type: "_ZTIN4ListIfE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPN4ListIfE5_NodeE" - self_type: "type-36" + self_type: "_ZTIPN4ListIfE5_NodeE" } } pointer_types { @@ -566,10 +566,10 @@ pointer_types { name: "List::_Node *" size: 8 alignment: 8 - referenced_type: "type-42" + referenced_type: "_ZTIN4ListIiE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPN4ListIiE5_NodeE" - self_type: "type-43" + self_type: "_ZTIPN4ListIiE5_NodeE" } } pointer_types { @@ -577,10 +577,10 @@ pointer_types { name: "test2::HelloAgain *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIPN5test210HelloAgainE" - self_type: "type-7" + self_type: "_ZTIPN5test210HelloAgainE" } } pointer_types { @@ -588,10 +588,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPf" - self_type: "type-33" + self_type: "_ZTIPf" } } pointer_types { @@ -599,10 +599,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIPi" - self_type: "type-31" + self_type: "_ZTIPi" } } lvalue_reference_types { @@ -610,10 +610,10 @@ lvalue_reference_types { name: "const float &" size: 8 alignment: 8 - referenced_type: "type-27" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIRKf" - self_type: "type-37" + self_type: "_ZTIRKf" } } lvalue_reference_types { @@ -621,10 +621,10 @@ lvalue_reference_types { name: "float &" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIRf" - self_type: "type-38" + self_type: "_ZTIRf" } } lvalue_reference_types { @@ -632,10 +632,10 @@ lvalue_reference_types { name: "int &" size: 8 alignment: 8 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIRi" - self_type: "type-30" + self_type: "_ZTIRi" } } builtin_types { @@ -643,10 +643,10 @@ builtin_types { name: "bool" size: 1 alignment: 1 - referenced_type: "type-12" + referenced_type: "_ZTIb" source_file: "" linker_set_key: "_ZTIb" - self_type: "type-12" + self_type: "_ZTIb" } is_unsigned: true is_integral: true @@ -656,10 +656,10 @@ builtin_types { name: "char" size: 1 alignment: 1 - referenced_type: "type-49" + referenced_type: "_ZTIc" source_file: "" linker_set_key: "_ZTIc" - self_type: "type-49" + self_type: "_ZTIc" } is_unsigned: false is_integral: true @@ -669,10 +669,10 @@ builtin_types { name: "double" size: 8 alignment: 8 - referenced_type: "type-14" + referenced_type: "_ZTId" source_file: "" linker_set_key: "_ZTId" - self_type: "type-14" + self_type: "_ZTId" } is_unsigned: false is_integral: false @@ -682,10 +682,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -695,10 +695,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -708,10 +708,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -721,10 +721,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-6" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-6" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -734,10 +734,10 @@ builtin_types { name: "wchar_t" size: 4 alignment: 4 - referenced_type: "type-22" + referenced_type: "_ZTIw" source_file: "" linker_set_key: "_ZTIw" - self_type: "type-22" + self_type: "_ZTIw" } is_unsigned: false is_integral: true @@ -747,10 +747,10 @@ qualified_types { name: "bool const[2]" size: 2 alignment: 1 - referenced_type: "type-10" + referenced_type: "_ZTIA2_b" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIA2_Kb" - self_type: "type-11" + self_type: "_ZTIA2_Kb" } is_const: true is_volatile: false @@ -761,10 +761,10 @@ qualified_types { name: "const CPPHello" size: 56 alignment: 8 - referenced_type: "type-25" + referenced_type: "_ZTI8CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIK8CPPHello" - self_type: "type-32" + self_type: "_ZTIK8CPPHello" } is_const: true is_volatile: false @@ -775,10 +775,10 @@ qualified_types { name: "const List::_Node" size: 24 alignment: 8 - referenced_type: "type-35" + referenced_type: "_ZTIN4ListIfE5_NodeE" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKN4ListIfE5_NodeE" - self_type: "type-39" + self_type: "_ZTIKN4ListIfE5_NodeE" } is_const: true is_volatile: false @@ -789,10 +789,10 @@ qualified_types { name: "const char" size: 1 alignment: 1 - referenced_type: "type-49" + referenced_type: "_ZTIc" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKc" - self_type: "type-47" + self_type: "_ZTIKc" } is_const: true is_volatile: false @@ -803,10 +803,10 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKf" - self_type: "type-27" + self_type: "_ZTIKf" } is_const: true is_volatile: false @@ -817,10 +817,10 @@ qualified_types { name: "const int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_ZTIKi" - self_type: "type-26" + self_type: "_ZTIKi" } is_const: true is_volatile: false @@ -831,23 +831,23 @@ array_types { name: "bool [2]" size: 2 alignment: 1 - referenced_type: "type-12" + referenced_type: "_ZTIb" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIA2_b" - self_type: "type-10" + self_type: "_ZTIA2_b" } } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "ListMangle" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-44" + referenced_type: "_ZTIP4ListIiE" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-46" + referenced_type: "_ZTIP9StackNodeIiE" default_arg: false is_this_ptr: false } @@ -855,16 +855,16 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "fooVariadic" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-30" + referenced_type: "_ZTIRi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-31" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } @@ -872,57 +872,57 @@ functions { access: public_access } functions { - return_type: "type-34" + return_type: "_ZTI4ListIfE" function_name: "castInterface" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-34" + referenced_type: "_ZTI4ListIfE" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-48" + referenced_type: "_ZTIPKc" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-12" + referenced_type: "_ZTIb" default_arg: false is_this_ptr: false } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } linker_set_key: "_Z13castInterfaceIffffE4ListIT_ES0_IT0_EPKcb" access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "boo" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-32" + referenced_type: "_ZTIK8CPPHello" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-31" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-33" + referenced_type: "_ZTIPf" default_arg: false is_this_ptr: false } @@ -930,18 +930,18 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "format" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "_Z6formatv" access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::PrivateNode" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -949,11 +949,11 @@ functions { access: private_access } functions { - return_type: "type-38" + return_type: "_ZTIRf" function_name: "List::_Node::getRef" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -961,16 +961,16 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-37" + referenced_type: "_ZTIRKf" default_arg: false is_this_ptr: false } @@ -978,16 +978,16 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-37" + referenced_type: "_ZTIRKf" default_arg: false is_this_ptr: false } @@ -995,11 +995,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::~_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -1007,11 +1007,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "List::_Node::~_Node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-36" + referenced_type: "_ZTIPN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -1019,11 +1019,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -1031,11 +1031,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -1043,11 +1043,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -1055,11 +1055,11 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIb" function_name: "test3::End" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: true is_this_ptr: false } @@ -1067,11 +1067,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "CPPHello::again" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-28" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -1079,11 +1079,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "CPPHello::test_enum" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-28" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -1091,11 +1091,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "CPPHello::CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-28" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -1103,11 +1103,11 @@ functions { access: public_access } functions { - return_type: "type-6" + return_type: "_ZTIv" function_name: "CPPHello::CPPHello" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-28" + referenced_type: "_ZTIP8CPPHello" default_arg: false is_this_ptr: true } @@ -1115,11 +1115,11 @@ functions { access: public_access } functions { - return_type: "type-37" + return_type: "_ZTIRKf" function_name: "List::_Node::getRef" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-40" + referenced_type: "_ZTIPKN4ListIfE5_NodeE" default_arg: false is_this_ptr: true } @@ -1127,11 +1127,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "uses_forward_decl" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" parameters { - referenced_type: "type-20" + referenced_type: "_ZTIP18ForwardDeclaration" default_arg: false is_this_ptr: false } @@ -1142,48 +1142,48 @@ global_vars { name: "__test_var" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZL10__test_var" - referenced_type: "type-11" + referenced_type: "_ZTIA2_Kb" access: public_access } global_vars { name: "test2::HelloAgain::hello_forever" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test210HelloAgain13hello_foreverE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } global_vars { name: "test3::double_bye" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test310double_byeE" - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" access: public_access } global_vars { name: "test3::ByeAgain::foo_forever" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test38ByeAgainIfE11foo_foreverE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } global_vars { name: "float_list_test" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "float_list_test" - referenced_type: "type-34" + referenced_type: "_ZTI4ListIfE" access: public_access } global_vars { name: "int_list_test" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "int_list_test" - referenced_type: "type-41" + referenced_type: "_ZTI4ListIiE" access: public_access } global_vars { name: "node" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" linker_set_key: "node" - referenced_type: "type-35" + referenced_type: "_ZTIN4ListIfE5_NodeE" access: public_access } diff --git a/vndk/tools/header-checker/tests/expected/example2.h b/vndk/tools/header-checker/tests/expected/example2.h index 483bd58a8..9bd1cbe28 100644 --- a/vndk/tools/header-checker/tests/expected/example2.h +++ b/vndk/tools/header-checker/tests/expected/example2.h @@ -3,19 +3,19 @@ record_types { name: "HiddenBase" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI10HiddenBase" source_file: "/development/vndk/tools/header-checker/tests/input/example3.h" linker_set_key: "_ZTI10HiddenBase" - self_type: "type-1" + self_type: "_ZTI10HiddenBase" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "hide" access: private_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "seek" access: private_access @@ -28,19 +28,19 @@ record_types { name: "test2::HelloAgain" size: 40 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test210HelloAgainE" - self_type: "type-4" + self_type: "_ZTIN5test210HelloAgainE" } fields { - referenced_type: "type-5" + referenced_type: "_ZTINSt3__16vectorIPN5test210HelloAgainENS_9allocatorIS3_EEEE" field_offset: 64 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 256 field_name: "bar_again" access: public_access @@ -85,13 +85,13 @@ record_types { name: "test3::Outer::Inner" size: 4 alignment: 4 - referenced_type: "type-20" + referenced_type: "_ZTIN5test35Outer5InnerE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test35Outer5InnerE" - self_type: "type-20" + self_type: "_ZTIN5test35Outer5InnerE" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "b" access: private_access @@ -104,13 +104,13 @@ record_types { name: "test3::Outer" size: 4 alignment: 4 - referenced_type: "type-19" + referenced_type: "_ZTIN5test35OuterE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test35OuterE" - self_type: "type-19" + self_type: "_ZTIN5test35OuterE" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -123,26 +123,26 @@ record_types { name: "test3::ByeAgain" size: 16 alignment: 8 - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test38ByeAgainIdEE" - self_type: "type-13" + self_type: "_ZTIN5test38ByeAgainIdEE" } fields { - referenced_type: "type-14" + referenced_type: "_ZTId" field_offset: 0 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "bar_again" access: public_access } template_info { elements { - referenced_type: "type-14" + referenced_type: "_ZTId" } } access: public_access @@ -153,26 +153,26 @@ record_types { name: "test3::ByeAgain" size: 8 alignment: 4 - referenced_type: "type-16" + referenced_type: "_ZTIN5test38ByeAgainIfEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test38ByeAgainIfEE" - self_type: "type-16" + self_type: "_ZTIN5test38ByeAgainIfEE" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 0 field_name: "foo_again" access: public_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "bar_Again" access: public_access } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } } access: public_access @@ -183,12 +183,12 @@ enum_types { name: "Foo_s" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI5Foo_s" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTI5Foo_s" - self_type: "type-8" + self_type: "_ZTI5Foo_s" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 10 name: "foosball" @@ -204,12 +204,12 @@ enum_types { name: "test3::Kind" size: 4 alignment: 4 - referenced_type: "type-18" + referenced_type: "_ZTIN5test34KindE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIN5test34KindE" - self_type: "type-18" + self_type: "_ZTIN5test34KindE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 24 name: "test3::kind1" @@ -225,10 +225,10 @@ pointer_types { name: "test2::HelloAgain *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIN5test210HelloAgainE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIPN5test210HelloAgainE" - self_type: "type-6" + self_type: "_ZTIPN5test210HelloAgainE" } } pointer_types { @@ -236,10 +236,10 @@ pointer_types { name: "test3::ByeAgain *" size: 8 alignment: 8 - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIPN5test38ByeAgainIdEE" - self_type: "type-15" + self_type: "_ZTIPN5test38ByeAgainIdEE" } } pointer_types { @@ -247,10 +247,10 @@ pointer_types { name: "test3::ByeAgain *" size: 8 alignment: 8 - referenced_type: "type-16" + referenced_type: "_ZTIN5test38ByeAgainIfEE" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIPN5test38ByeAgainIfEE" - self_type: "type-17" + self_type: "_ZTIPN5test38ByeAgainIfEE" } } builtin_types { @@ -258,10 +258,10 @@ builtin_types { name: "bool" size: 1 alignment: 1 - referenced_type: "type-12" + referenced_type: "_ZTIb" source_file: "" linker_set_key: "_ZTIb" - self_type: "type-12" + self_type: "_ZTIb" } is_unsigned: true is_integral: true @@ -271,10 +271,10 @@ builtin_types { name: "double" size: 8 alignment: 8 - referenced_type: "type-14" + referenced_type: "_ZTId" source_file: "" linker_set_key: "_ZTId" - self_type: "type-14" + self_type: "_ZTId" } is_unsigned: false is_integral: false @@ -284,10 +284,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -297,10 +297,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -310,10 +310,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -323,10 +323,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-7" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-7" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -336,10 +336,10 @@ qualified_types { name: "bool const[2]" size: 2 alignment: 1 - referenced_type: "type-10" + referenced_type: "_ZTIA2_b" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIA2_Kb" - self_type: "type-11" + self_type: "_ZTIA2_Kb" } is_const: true is_volatile: false @@ -350,18 +350,18 @@ array_types { name: "bool [2]" size: 2 alignment: 1 - referenced_type: "type-12" + referenced_type: "_ZTIb" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZTIA2_b" - self_type: "type-10" + self_type: "_ZTIA2_b" } } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "test2::HelloAgain::again" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-6" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -369,11 +369,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-6" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -381,11 +381,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-6" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -393,11 +393,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIv" function_name: "test2::HelloAgain::~HelloAgain" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-6" + referenced_type: "_ZTIPN5test210HelloAgainE" default_arg: false is_this_ptr: true } @@ -405,11 +405,11 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIb" function_name: "test3::End" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: true is_this_ptr: false } @@ -417,41 +417,41 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIb" function_name: "test3::Begin" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } template_info { elements { - referenced_type: "type-3" + referenced_type: "_ZTIf" } elements { - referenced_type: "type-2" + referenced_type: "_ZTIi" } } linker_set_key: "_ZN5test35BeginIfiEEbT_T0_i" access: public_access } functions { - return_type: "type-21" + return_type: "_ZTINSt3__16vectorIPiNS_9allocatorIS1_EEEE" function_name: "test3::Dummy" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -459,16 +459,16 @@ functions { access: public_access } functions { - return_type: "type-14" + return_type: "_ZTId" function_name: "test3::ByeAgain::method_foo" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-15" + referenced_type: "_ZTIPN5test38ByeAgainIdEE" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-14" + referenced_type: "_ZTId" default_arg: false is_this_ptr: false } @@ -476,16 +476,16 @@ functions { access: public_access } functions { - return_type: "type-3" + return_type: "_ZTIf" function_name: "test3::ByeAgain::method_foo" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" parameters { - referenced_type: "type-17" + referenced_type: "_ZTIPN5test38ByeAgainIfEE" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -496,27 +496,27 @@ global_vars { name: "__test_var" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZL10__test_var" - referenced_type: "type-11" + referenced_type: "_ZTIA2_Kb" access: public_access } global_vars { name: "test2::HelloAgain::hello_forever" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test210HelloAgain13hello_foreverE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } global_vars { name: "test3::double_bye" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test310double_byeE" - referenced_type: "type-13" + referenced_type: "_ZTIN5test38ByeAgainIdEE" access: public_access } global_vars { name: "test3::ByeAgain::foo_forever" source_file: "/development/vndk/tools/header-checker/tests/input/example2.h" linker_set_key: "_ZN5test38ByeAgainIfE11foo_foreverE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } diff --git a/vndk/tools/header-checker/tests/expected/example3.h b/vndk/tools/header-checker/tests/expected/example3.h index bedee6041..e6aacb431 100644 --- a/vndk/tools/header-checker/tests/expected/example3.h +++ b/vndk/tools/header-checker/tests/expected/example3.h @@ -3,19 +3,19 @@ record_types { name: "HiddenBase" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI10HiddenBase" source_file: "/development/vndk/tools/header-checker/tests/input/example3.h" linker_set_key: "_ZTI10HiddenBase" - self_type: "type-1" + self_type: "_ZTI10HiddenBase" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "hide" access: private_access } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 32 field_name: "seek" access: private_access @@ -28,10 +28,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -41,10 +41,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/known_issues.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/arm/known_issues.h.sdump index 1597ed872..cc90665f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/known_issues.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/known_issues.h.sdump @@ -7,8 +7,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 } ], @@ -22,19 +22,19 @@ { "linker_set_key" : "non_type_template", "name" : "non_type_template", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "return_type", "name" : "return_type", - "referenced_type" : "type-2", + "referenced_type" : "_ZTI7STDCALL", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "template_arg_in_namespace", "name" : "template_arg_in_namespace", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp.so.lsdump index 0d500fe44..e00697569 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp.so.lsdump @@ -3,19 +3,19 @@ record_types { name: "Foo" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-1" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 32 field_name: "b_" access: private_access @@ -28,13 +28,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-7" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -47,19 +47,19 @@ record_types { name: "Cstruct" size: 8 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-5" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIP6Cinner" field_offset: 32 field_name: "b" access: public_access @@ -72,10 +72,10 @@ pointer_types { name: "Foo *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-10" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -83,10 +83,10 @@ pointer_types { name: "Cinner *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-6" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -94,10 +94,10 @@ pointer_types { name: "Cstruct *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-4" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -105,10 +105,10 @@ pointer_types { name: "Cstruct **" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-8" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -116,10 +116,10 @@ pointer_types { name: "int *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-2" + self_type: "_ZTIPi" } } builtin_types { @@ -127,10 +127,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-3" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -140,20 +140,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-9" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-9" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-9" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-8" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -161,16 +161,16 @@ functions { access: public_access } functions { - return_type: "type-1" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp_with_unused_struct.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp_with_unused_struct.so.lsdump index ba145f96a..d030088d8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp_with_unused_struct.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp_with_unused_struct.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "UnusedStruct" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12UnusedStruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI12UnusedStruct" - self_type: "type-1" + self_type: "_ZTI12UnusedStruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "mUnusedMember" access: public_access @@ -22,19 +22,19 @@ record_types { name: "Foo" size: 8 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-8" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 32 field_name: "b_" access: private_access @@ -47,13 +47,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-6" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -66,19 +66,19 @@ record_types { name: "Cstruct" size: 8 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-4" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-5" + referenced_type: "_ZTIP6Cinner" field_offset: 32 field_name: "b" access: public_access @@ -91,10 +91,10 @@ pointer_types { name: "Foo *" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-11" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -102,10 +102,10 @@ pointer_types { name: "Cinner *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-5" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -113,10 +113,10 @@ pointer_types { name: "Cstruct *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-3" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -124,10 +124,10 @@ pointer_types { name: "Cstruct **" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-7" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -135,10 +135,10 @@ pointer_types { name: "int *" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-9" + self_type: "_ZTIPi" } } builtin_types { @@ -146,10 +146,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -159,20 +159,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -180,16 +180,16 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump index 9347e5bd3..42aad9df7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump index 5e992cf71..d2a202267 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::AddedFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -418,11 +418,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function_sybmol_only.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function_sybmol_only.so.lsdump index d6af968b7..4c9de6d3c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function_sybmol_only.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function_sybmol_only.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump index f5c61ee49..9df7eba8f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -421,7 +421,7 @@ global_vars { name: "HighVolumeSpeaker::global_unprotected_id" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZN17HighVolumeSpeaker21global_unprotected_idE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } elf_functions { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump index da7154d52..fe80d94c5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: private_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump index 60f67cd7a..c6f43df28 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: private_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: private_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump index 0063beae1..2b9e7713b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-2" + underlying_type: "_ZTIi" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -209,10 +209,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -220,10 +220,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -231,10 +231,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -242,10 +242,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -253,10 +253,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -266,10 +266,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -279,10 +279,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -292,20 +292,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -313,11 +313,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -325,11 +325,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -337,11 +337,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -349,11 +349,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -361,16 +361,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-7" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -378,11 +378,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -390,11 +390,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump index 589816936..7269f9ed4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -217,10 +217,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -228,10 +228,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -239,10 +239,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -250,10 +250,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -261,10 +261,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -274,10 +274,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -287,10 +287,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -300,20 +300,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -321,11 +321,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -333,11 +333,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -345,11 +345,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -357,11 +357,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -369,16 +369,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -386,11 +386,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -398,11 +398,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump index 42062b8bb..dbad77d8d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 20 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 32 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 64 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: true access: public_access } @@ -188,13 +188,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -244,12 +244,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -273,10 +273,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -284,10 +284,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -295,10 +295,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -306,10 +306,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -317,10 +317,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -330,10 +330,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -343,10 +343,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -356,20 +356,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -401,11 +401,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -413,11 +413,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -425,16 +425,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -442,11 +442,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -454,11 +454,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump index 79803e5f4..333543371 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump @@ -6,8 +6,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "type-3", - "self_type" : "type-3", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +15,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +25,15 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "type-6", - "self_type" : "type-6", + "referenced_type" : "_ZTIj", + "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-10", - "self_type" : "type-10" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -104,11 +104,11 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "type-8", - "self_type" : "type-8", + "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", + "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", - "underlying_type" : "type-6" + "underlying_type" : "_ZTIj" } ], "function_types" : [], @@ -121,10 +121,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -133,10 +133,10 @@ "parameters" : [ { - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], - "return_type" : "type-9", + "return_type" : "_ZTIP12SuperSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -146,10 +146,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-8", + "return_type" : "_ZTIN12SuperSpeaker6VolumeE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -159,10 +159,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -172,10 +172,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -185,13 +185,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" }, { - "referenced_type" : "type-3" + "referenced_type" : "_ZTIf" } ], - "return_type" : "type-12", + "return_type" : "_ZTIP17HighVolumeSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -201,10 +201,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -214,10 +214,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" } ], @@ -229,8 +229,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", - "referenced_type" : "type-1", - "self_type" : "type-9", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTIP12SuperSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -238,8 +238,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", - "referenced_type" : "type-5", - "self_type" : "type-4", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -247,8 +247,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", - "referenced_type" : "type-11", - "self_type" : "type-12", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -256,8 +256,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIPf", "name" : "float *", - "referenced_type" : "type-3", - "self_type" : "type-7", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIPf", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -273,14 +273,14 @@ "access" : "private", "field_name" : "mSpeakderId", "field_offset" : 32, - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTI12SuperSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -315,7 +315,7 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "fields" : @@ -323,19 +323,19 @@ { "field_name" : "speaker_uint_t", "field_offset" : 64, - "referenced_type" : "type-6" + "referenced_type" : "_ZTIj" }, { "field_name" : "speaker_float_star", "field_offset" : 96, - "referenced_type" : "type-7" + "referenced_type" : "_ZTIPf" } ], "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-5", - "self_type" : "type-5", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -368,14 +368,14 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-11", - "self_type" : "type-11", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump index b3cf1165c..e6a121b29 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPKf" field_offset: 96 field_name: "const_speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-9" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "const float *" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPKf" - self_type: "type-7" + self_type: "_ZTIPKf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,21 +309,21 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIKf" - self_type: "type-8" + self_type: "_ZTIKf" } is_const: true is_volatile: false is_restricted: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -331,11 +331,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -343,11 +343,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -355,11 +355,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -367,11 +367,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -379,16 +379,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -396,11 +396,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -408,11 +408,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump index 6745984f2..deaa77d53 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIx" field_offset: 64 field_name: "speaker_long_long" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPx" field_offset: 128 field_name: "speaker_long_long_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "long long *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPx" - self_type: "type-7" + self_type: "_ZTIPx" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,20 +309,20 @@ builtin_types { name: "long long" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "" linker_set_key: "_ZTIx" - self_type: "type-6" + self_type: "_ZTIx" } is_unsigned: false is_integral: true } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump index 5a56ac664..e5cbc2021 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-6" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-7" + referenced_type: "_ZTIDi" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-4" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-4" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "char32_t" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIDi" source_file: "" linker_set_key: "_ZTIDi" - self_type: "type-7" + self_type: "_ZTIDi" } is_unsigned: true is_integral: true @@ -270,10 +270,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -283,10 +283,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -309,20 +309,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump index 784404bfa..b79663a8f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 64 field_name: "speaker_float" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-7" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-8" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-8" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump index 8671c0589..c72acadab 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId_" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t_" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star_" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump index 500e33fc1..b1f888aaa 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-5" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump index 4f3c5c9a4..ac3d9e095 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index b41d1b48f..327589543 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump index b6ce25815..fbb9a3116 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,27 +296,27 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZN12SuperSpeaker11SpeakLouderEv" access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -324,11 +324,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -336,11 +336,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -348,11 +348,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -360,16 +360,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libpure_virtual_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libpure_virtual_function.so.lsdump index a24bcf423..0147357ed 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libpure_virtual_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libpure_virtual_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "DerivedBar" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI10DerivedBar" - self_type: "type-4" + self_type: "_ZTI10DerivedBar" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" is_virtual: false access: public_access } @@ -59,10 +59,10 @@ record_types { name: "PureVirtualBase" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI15PureVirtualBase" - self_type: "type-1" + self_type: "_ZTI15PureVirtualBase" } vtable_layout { vtable_components { @@ -110,10 +110,10 @@ pointer_types { name: "DerivedBar *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP10DerivedBar" - self_type: "type-5" + self_type: "_ZTIP10DerivedBar" } } pointer_types { @@ -121,10 +121,10 @@ pointer_types { name: "PureVirtualBase *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP15PureVirtualBase" - self_type: "type-3" + self_type: "_ZTIP15PureVirtualBase" } } builtin_types { @@ -132,10 +132,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-2" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-2" + self_type: "_ZTIv" } is_unsigned: false is_integral: false diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libreproducability.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libreproducability.so.lsdump index 3d4a1481d..0f49dc421 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libreproducability.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libreproducability.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "ShouldRepro" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI11ShouldRepro" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h" linker_set_key: "_ZTI11ShouldRepro" - self_type: "type-1" + self_type: "_ZTI11ShouldRepro" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -22,10 +22,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/undeclared_types.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/arm/undeclared_types.h.sdump index 581ca8bf1..4b2e58a90 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/undeclared_types.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/undeclared_types.h.sdump @@ -13,10 +13,10 @@ "parameters" : [ { - "referenced_type" : "type-5" + "referenced_type" : "_ZTI10template_cIJ10template_dIJA_N11namespace_c1CEEEEE" } ], - "return_type" : "type-4", + "return_type" : "_ZTIRN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { @@ -27,13 +27,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-8" + "referenced_type" : "_ZTIP12InvalidClass" }, { - "referenced_type" : "type-9" + "referenced_type" : "_ZTI1E" } ], - "return_type" : "type-6", + "return_type" : "_ZTIN12InvalidClass1DE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -42,25 +42,25 @@ { "linker_set_key" : "a", "name" : "a", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "b", "name" : "b", - "referenced_type" : "type-2", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "c", "name" : "c", - "referenced_type" : "type-3", + "referenced_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "template_in_macro", "name" : "template_in_macro", - "referenced_type" : "type-11", + "referenced_type" : "_ZTIP15TemplateInMacroIJ1FEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -70,8 +70,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIRN11namespace_a1AE", "name" : "namespace_a::A &", - "referenced_type" : "type-1", - "self_type" : "type-4", + "referenced_type" : "_ZTIN11namespace_a1AE", + "self_type" : "_ZTIRN11namespace_a1AE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -82,8 +82,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12InvalidClass", "name" : "InvalidClass *", - "referenced_type" : "type-7", - "self_type" : "type-8", + "referenced_type" : "_ZTI12InvalidClass", + "self_type" : "_ZTIP12InvalidClass", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, @@ -91,8 +91,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE", "name" : "TemplateInMacro *", - "referenced_type" : "type-10", - "self_type" : "type-11", + "referenced_type" : "_ZTI15TemplateInMacroIJ1FEE", + "self_type" : "_ZTIP15TemplateInMacroIJ1FEE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -103,8 +103,8 @@ "is_const" : true, "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "name" : "const namespace_b::template_b", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", + "self_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/known_issues.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/known_issues.h.sdump index 1597ed872..cc90665f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/known_issues.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/known_issues.h.sdump @@ -7,8 +7,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 } ], @@ -22,19 +22,19 @@ { "linker_set_key" : "non_type_template", "name" : "non_type_template", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "return_type", "name" : "return_type", - "referenced_type" : "type-2", + "referenced_type" : "_ZTI7STDCALL", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "template_arg_in_namespace", "name" : "template_arg_in_namespace", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp.so.lsdump index c30c9f97a..56e6aabd3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp.so.lsdump @@ -3,19 +3,19 @@ record_types { name: "Foo" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-1" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 64 field_name: "b_" access: private_access @@ -28,13 +28,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-7" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -47,19 +47,19 @@ record_types { name: "Cstruct" size: 16 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-5" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIP6Cinner" field_offset: 64 field_name: "b" access: public_access @@ -72,10 +72,10 @@ pointer_types { name: "Foo *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-10" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -83,10 +83,10 @@ pointer_types { name: "Cinner *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-6" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -94,10 +94,10 @@ pointer_types { name: "Cstruct *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-4" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -105,10 +105,10 @@ pointer_types { name: "Cstruct **" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-8" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -116,10 +116,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-2" + self_type: "_ZTIPi" } } builtin_types { @@ -127,10 +127,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-3" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -140,20 +140,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-9" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-9" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-9" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-8" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -161,16 +161,16 @@ functions { access: public_access } functions { - return_type: "type-1" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp_with_unused_struct.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp_with_unused_struct.so.lsdump index 99568b319..cdca30e63 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp_with_unused_struct.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp_with_unused_struct.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "UnusedStruct" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12UnusedStruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI12UnusedStruct" - self_type: "type-1" + self_type: "_ZTI12UnusedStruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "mUnusedMember" access: public_access @@ -22,19 +22,19 @@ record_types { name: "Foo" size: 16 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-8" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 64 field_name: "b_" access: private_access @@ -47,13 +47,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-6" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -66,19 +66,19 @@ record_types { name: "Cstruct" size: 16 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-4" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-5" + referenced_type: "_ZTIP6Cinner" field_offset: 64 field_name: "b" access: public_access @@ -91,10 +91,10 @@ pointer_types { name: "Foo *" size: 8 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-11" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -102,10 +102,10 @@ pointer_types { name: "Cinner *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-5" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -113,10 +113,10 @@ pointer_types { name: "Cstruct *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-3" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -124,10 +124,10 @@ pointer_types { name: "Cstruct **" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-7" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -135,10 +135,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-9" + self_type: "_ZTIPi" } } builtin_types { @@ -146,10 +146,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -159,20 +159,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -180,16 +180,16 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump index e31861d01..0dc35015c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump index a02413613..84829bfd8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::AddedFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -418,11 +418,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function_sybmol_only.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function_sybmol_only.so.lsdump index 7561c6280..06526ecab 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function_sybmol_only.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function_sybmol_only.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump index 7dea4df24..86969d83f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -421,7 +421,7 @@ global_vars { name: "HighVolumeSpeaker::global_unprotected_id" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZN17HighVolumeSpeaker21global_unprotected_idE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } elf_functions { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump index 0528739d4..2c7f9da89 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: private_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump index dafc9bdef..b3d2098a7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: private_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: private_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump index 5a7cf933b..b4c23b3f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-2" + underlying_type: "_ZTIi" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -209,10 +209,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -220,10 +220,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -231,10 +231,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -242,10 +242,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -253,10 +253,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -266,10 +266,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -279,10 +279,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -292,20 +292,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -313,11 +313,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -325,11 +325,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -337,11 +337,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -349,11 +349,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -361,16 +361,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-7" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -378,11 +378,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -390,11 +390,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump index 1f25b4df5..8ccd95469 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -217,10 +217,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -228,10 +228,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -239,10 +239,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -250,10 +250,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -261,10 +261,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -274,10 +274,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -287,10 +287,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -300,20 +300,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -321,11 +321,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -333,11 +333,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -345,11 +345,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -357,11 +357,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -369,16 +369,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -386,11 +386,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -398,11 +398,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump index 29914e758..4be1bf6d4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 40 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: true access: public_access } @@ -188,13 +188,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -244,12 +244,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -273,10 +273,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -284,10 +284,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -295,10 +295,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -306,10 +306,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -317,10 +317,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -330,10 +330,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -343,10 +343,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -356,20 +356,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -401,11 +401,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -413,11 +413,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -425,16 +425,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -442,11 +442,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -454,11 +454,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump index d92166c56..713d8e8df 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump @@ -6,8 +6,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "type-3", - "self_type" : "type-3", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +15,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +25,15 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "type-6", - "self_type" : "type-6", + "referenced_type" : "_ZTIj", + "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-10", - "self_type" : "type-10" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -104,11 +104,11 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "type-8", - "self_type" : "type-8", + "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", + "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", - "underlying_type" : "type-6" + "underlying_type" : "_ZTIj" } ], "function_types" : [], @@ -121,10 +121,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -133,10 +133,10 @@ "parameters" : [ { - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], - "return_type" : "type-9", + "return_type" : "_ZTIP12SuperSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -146,10 +146,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-8", + "return_type" : "_ZTIN12SuperSpeaker6VolumeE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -159,10 +159,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -172,10 +172,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -185,13 +185,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" }, { - "referenced_type" : "type-3" + "referenced_type" : "_ZTIf" } ], - "return_type" : "type-12", + "return_type" : "_ZTIP17HighVolumeSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -201,10 +201,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -214,10 +214,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" } ], @@ -229,8 +229,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", - "referenced_type" : "type-1", - "self_type" : "type-9", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTIP12SuperSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -238,8 +238,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", - "referenced_type" : "type-5", - "self_type" : "type-4", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -247,8 +247,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", - "referenced_type" : "type-11", - "self_type" : "type-12", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -256,8 +256,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIPf", "name" : "float *", - "referenced_type" : "type-3", - "self_type" : "type-7", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIPf", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -273,14 +273,14 @@ "access" : "private", "field_name" : "mSpeakderId", "field_offset" : 64, - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTI12SuperSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -315,7 +315,7 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "fields" : @@ -323,19 +323,19 @@ { "field_name" : "speaker_uint_t", "field_offset" : 96, - "referenced_type" : "type-6" + "referenced_type" : "_ZTIj" }, { "field_name" : "speaker_float_star", "field_offset" : 128, - "referenced_type" : "type-7" + "referenced_type" : "_ZTIPf" } ], "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-5", - "self_type" : "type-5", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 24, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -368,14 +368,14 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-11", - "self_type" : "type-11", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump index 8e32d6175..2fc25a834 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPKf" field_offset: 128 field_name: "const_speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-9" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "const float *" size: 8 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPKf" - self_type: "type-7" + self_type: "_ZTIPKf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,21 +309,21 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIKf" - self_type: "type-8" + self_type: "_ZTIKf" } is_const: true is_volatile: false is_restricted: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -331,11 +331,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -343,11 +343,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -355,11 +355,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -367,11 +367,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -379,16 +379,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -396,11 +396,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -408,11 +408,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump index f798213e0..023a2be50 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 32 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIx" field_offset: 128 field_name: "speaker_long_long" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPx" field_offset: 192 field_name: "speaker_long_long_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "long long *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPx" - self_type: "type-7" + self_type: "_ZTIPx" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,20 +309,20 @@ builtin_types { name: "long long" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "" linker_set_key: "_ZTIx" - self_type: "type-6" + self_type: "_ZTIx" } is_unsigned: false is_integral: true } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump index cf9bf88fe..e076de61f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-6" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-7" + referenced_type: "_ZTIDi" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-4" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-4" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "char32_t" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIDi" source_file: "" linker_set_key: "_ZTIDi" - self_type: "type-7" + self_type: "_ZTIDi" } is_unsigned: true is_integral: true @@ -270,10 +270,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -283,10 +283,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -309,20 +309,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump index eeb4aed1c..70bc99777 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 96 field_name: "speaker_float" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-7" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-8" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-8" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump index fc0f5a43a..43e8b2607 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId_" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t_" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star_" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump index e10329467..ab77b9209 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-5" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump index 80be5e46f..9aeadfd07 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 82e188d79..f3516e972 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump index f94a04e0d..fc7cd2a08 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,27 +296,27 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZN12SuperSpeaker11SpeakLouderEv" access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -324,11 +324,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -336,11 +336,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -348,11 +348,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -360,16 +360,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libpure_virtual_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libpure_virtual_function.so.lsdump index 4346c971f..1660a6f1c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libpure_virtual_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libpure_virtual_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "DerivedBar" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI10DerivedBar" - self_type: "type-4" + self_type: "_ZTI10DerivedBar" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" is_virtual: false access: public_access } @@ -59,10 +59,10 @@ record_types { name: "PureVirtualBase" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI15PureVirtualBase" - self_type: "type-1" + self_type: "_ZTI15PureVirtualBase" } vtable_layout { vtable_components { @@ -110,10 +110,10 @@ pointer_types { name: "DerivedBar *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP10DerivedBar" - self_type: "type-5" + self_type: "_ZTIP10DerivedBar" } } pointer_types { @@ -121,10 +121,10 @@ pointer_types { name: "PureVirtualBase *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP15PureVirtualBase" - self_type: "type-3" + self_type: "_ZTIP15PureVirtualBase" } } builtin_types { @@ -132,10 +132,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-2" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-2" + self_type: "_ZTIv" } is_unsigned: false is_integral: false diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libreproducability.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libreproducability.so.lsdump index 3d4a1481d..0f49dc421 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libreproducability.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libreproducability.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "ShouldRepro" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI11ShouldRepro" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h" linker_set_key: "_ZTI11ShouldRepro" - self_type: "type-1" + self_type: "_ZTI11ShouldRepro" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -22,10 +22,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump index 6d517c42c..d52f1f95d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump @@ -5,8 +5,8 @@ { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-1", - "self_type" : "type-1" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -36,10 +36,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-3" + "referenced_type" : "_ZTIP5Test3" } ], - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, { @@ -49,22 +49,22 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-5" + "referenced_type" : "_ZTIP5Test4" } ], - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, { "function_name" : "test1", "linker_set_key" : "test1", - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, { "function_name" : "test2", "linker_set_key" : "test2", - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } ], @@ -76,8 +76,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTI5Test3", + "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -85,8 +85,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", - "referenced_type" : "type-4", - "self_type" : "type-5", + "referenced_type" : "_ZTI5Test4", + "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -99,8 +99,8 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTI5Test3", + "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -109,8 +109,8 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "type-4", - "self_type" : "type-4", + "referenced_type" : "_ZTI5Test4", + "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump index 72ecd7dcf..24165bde5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump @@ -5,8 +5,8 @@ { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-1", - "self_type" : "type-1" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -30,16 +30,16 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-5" + "referenced_type" : "_ZTIP5Test4" } ], - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, { "function_name" : "test2", "linker_set_key" : "test2", - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } ], @@ -51,8 +51,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTI5Test3", + "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -60,8 +60,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", - "referenced_type" : "type-4", - "self_type" : "type-5", + "referenced_type" : "_ZTI5Test4", + "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -74,8 +74,8 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTI5Test3", + "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -84,8 +84,8 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "type-4", - "self_type" : "type-4", + "referenced_type" : "_ZTI5Test4", + "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump index b09932cda..d1c52f88a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump @@ -5,8 +5,8 @@ { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-1", - "self_type" : "type-1" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -30,16 +30,16 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-3" + "referenced_type" : "_ZTIP5Test3" } ], - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, { "function_name" : "test1", "linker_set_key" : "test1", - "return_type" : "type-1", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } ], @@ -51,8 +51,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTI5Test3", + "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -60,8 +60,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", - "referenced_type" : "type-4", - "self_type" : "type-5", + "referenced_type" : "_ZTI5Test4", + "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -74,8 +74,8 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTI5Test3", + "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -84,8 +84,8 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "type-4", - "self_type" : "type-4", + "referenced_type" : "_ZTI5Test4", + "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/undeclared_types.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/undeclared_types.h.sdump index 581ca8bf1..4b2e58a90 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/undeclared_types.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/undeclared_types.h.sdump @@ -13,10 +13,10 @@ "parameters" : [ { - "referenced_type" : "type-5" + "referenced_type" : "_ZTI10template_cIJ10template_dIJA_N11namespace_c1CEEEEE" } ], - "return_type" : "type-4", + "return_type" : "_ZTIRN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { @@ -27,13 +27,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-8" + "referenced_type" : "_ZTIP12InvalidClass" }, { - "referenced_type" : "type-9" + "referenced_type" : "_ZTI1E" } ], - "return_type" : "type-6", + "return_type" : "_ZTIN12InvalidClass1DE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -42,25 +42,25 @@ { "linker_set_key" : "a", "name" : "a", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "b", "name" : "b", - "referenced_type" : "type-2", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "c", "name" : "c", - "referenced_type" : "type-3", + "referenced_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "template_in_macro", "name" : "template_in_macro", - "referenced_type" : "type-11", + "referenced_type" : "_ZTIP15TemplateInMacroIJ1FEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -70,8 +70,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIRN11namespace_a1AE", "name" : "namespace_a::A &", - "referenced_type" : "type-1", - "self_type" : "type-4", + "referenced_type" : "_ZTIN11namespace_a1AE", + "self_type" : "_ZTIRN11namespace_a1AE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -82,8 +82,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12InvalidClass", "name" : "InvalidClass *", - "referenced_type" : "type-7", - "self_type" : "type-8", + "referenced_type" : "_ZTI12InvalidClass", + "self_type" : "_ZTIP12InvalidClass", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, @@ -91,8 +91,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE", "name" : "TemplateInMacro *", - "referenced_type" : "type-10", - "self_type" : "type-11", + "referenced_type" : "_ZTI15TemplateInMacroIJ1FEE", + "self_type" : "_ZTIP15TemplateInMacroIJ1FEE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -103,8 +103,8 @@ "is_const" : true, "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "name" : "const namespace_b::template_b", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", + "self_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/known_issues.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/mips/known_issues.h.sdump index 1597ed872..cc90665f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/known_issues.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/known_issues.h.sdump @@ -7,8 +7,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 } ], @@ -22,19 +22,19 @@ { "linker_set_key" : "non_type_template", "name" : "non_type_template", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "return_type", "name" : "return_type", - "referenced_type" : "type-2", + "referenced_type" : "_ZTI7STDCALL", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "template_arg_in_namespace", "name" : "template_arg_in_namespace", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp.so.lsdump index 0d500fe44..e00697569 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp.so.lsdump @@ -3,19 +3,19 @@ record_types { name: "Foo" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-1" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 32 field_name: "b_" access: private_access @@ -28,13 +28,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-7" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -47,19 +47,19 @@ record_types { name: "Cstruct" size: 8 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-5" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIP6Cinner" field_offset: 32 field_name: "b" access: public_access @@ -72,10 +72,10 @@ pointer_types { name: "Foo *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-10" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -83,10 +83,10 @@ pointer_types { name: "Cinner *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-6" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -94,10 +94,10 @@ pointer_types { name: "Cstruct *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-4" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -105,10 +105,10 @@ pointer_types { name: "Cstruct **" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-8" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -116,10 +116,10 @@ pointer_types { name: "int *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-2" + self_type: "_ZTIPi" } } builtin_types { @@ -127,10 +127,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-3" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -140,20 +140,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-9" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-9" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-9" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-8" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -161,16 +161,16 @@ functions { access: public_access } functions { - return_type: "type-1" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp_with_unused_struct.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp_with_unused_struct.so.lsdump index ba145f96a..d030088d8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp_with_unused_struct.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp_with_unused_struct.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "UnusedStruct" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12UnusedStruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI12UnusedStruct" - self_type: "type-1" + self_type: "_ZTI12UnusedStruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "mUnusedMember" access: public_access @@ -22,19 +22,19 @@ record_types { name: "Foo" size: 8 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-8" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 32 field_name: "b_" access: private_access @@ -47,13 +47,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-6" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -66,19 +66,19 @@ record_types { name: "Cstruct" size: 8 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-4" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-5" + referenced_type: "_ZTIP6Cinner" field_offset: 32 field_name: "b" access: public_access @@ -91,10 +91,10 @@ pointer_types { name: "Foo *" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-11" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -102,10 +102,10 @@ pointer_types { name: "Cinner *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-5" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -113,10 +113,10 @@ pointer_types { name: "Cstruct *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-3" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -124,10 +124,10 @@ pointer_types { name: "Cstruct **" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-7" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -135,10 +135,10 @@ pointer_types { name: "int *" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-9" + self_type: "_ZTIPi" } } builtin_types { @@ -146,10 +146,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -159,20 +159,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -180,16 +180,16 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump index 9347e5bd3..42aad9df7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump index 5e992cf71..d2a202267 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::AddedFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -418,11 +418,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function_sybmol_only.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function_sybmol_only.so.lsdump index d6af968b7..4c9de6d3c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function_sybmol_only.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function_sybmol_only.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump index f5c61ee49..9df7eba8f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -421,7 +421,7 @@ global_vars { name: "HighVolumeSpeaker::global_unprotected_id" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZN17HighVolumeSpeaker21global_unprotected_idE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } elf_functions { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump index da7154d52..fe80d94c5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: private_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump index 60f67cd7a..c6f43df28 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: private_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: private_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump index 0063beae1..2b9e7713b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-2" + underlying_type: "_ZTIi" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -209,10 +209,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -220,10 +220,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -231,10 +231,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -242,10 +242,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -253,10 +253,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -266,10 +266,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -279,10 +279,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -292,20 +292,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -313,11 +313,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -325,11 +325,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -337,11 +337,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -349,11 +349,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -361,16 +361,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-7" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -378,11 +378,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -390,11 +390,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump index 589816936..7269f9ed4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -217,10 +217,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -228,10 +228,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -239,10 +239,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -250,10 +250,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -261,10 +261,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -274,10 +274,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -287,10 +287,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -300,20 +300,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -321,11 +321,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -333,11 +333,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -345,11 +345,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -357,11 +357,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -369,16 +369,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -386,11 +386,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -398,11 +398,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump index 42062b8bb..dbad77d8d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 20 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 32 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 64 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: true access: public_access } @@ -188,13 +188,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -244,12 +244,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -273,10 +273,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -284,10 +284,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -295,10 +295,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -306,10 +306,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -317,10 +317,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -330,10 +330,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -343,10 +343,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -356,20 +356,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -401,11 +401,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -413,11 +413,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -425,16 +425,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -442,11 +442,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -454,11 +454,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump index 79803e5f4..333543371 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump @@ -6,8 +6,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "type-3", - "self_type" : "type-3", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +15,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +25,15 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "type-6", - "self_type" : "type-6", + "referenced_type" : "_ZTIj", + "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-10", - "self_type" : "type-10" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -104,11 +104,11 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "type-8", - "self_type" : "type-8", + "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", + "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", - "underlying_type" : "type-6" + "underlying_type" : "_ZTIj" } ], "function_types" : [], @@ -121,10 +121,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -133,10 +133,10 @@ "parameters" : [ { - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], - "return_type" : "type-9", + "return_type" : "_ZTIP12SuperSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -146,10 +146,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-8", + "return_type" : "_ZTIN12SuperSpeaker6VolumeE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -159,10 +159,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -172,10 +172,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -185,13 +185,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" }, { - "referenced_type" : "type-3" + "referenced_type" : "_ZTIf" } ], - "return_type" : "type-12", + "return_type" : "_ZTIP17HighVolumeSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -201,10 +201,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -214,10 +214,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" } ], @@ -229,8 +229,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", - "referenced_type" : "type-1", - "self_type" : "type-9", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTIP12SuperSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -238,8 +238,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", - "referenced_type" : "type-5", - "self_type" : "type-4", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -247,8 +247,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", - "referenced_type" : "type-11", - "self_type" : "type-12", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -256,8 +256,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIPf", "name" : "float *", - "referenced_type" : "type-3", - "self_type" : "type-7", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIPf", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -273,14 +273,14 @@ "access" : "private", "field_name" : "mSpeakderId", "field_offset" : 32, - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTI12SuperSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -315,7 +315,7 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "fields" : @@ -323,19 +323,19 @@ { "field_name" : "speaker_uint_t", "field_offset" : 64, - "referenced_type" : "type-6" + "referenced_type" : "_ZTIj" }, { "field_name" : "speaker_float_star", "field_offset" : 96, - "referenced_type" : "type-7" + "referenced_type" : "_ZTIPf" } ], "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-5", - "self_type" : "type-5", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -368,14 +368,14 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-11", - "self_type" : "type-11", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump index b3cf1165c..e6a121b29 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPKf" field_offset: 96 field_name: "const_speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-9" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "const float *" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPKf" - self_type: "type-7" + self_type: "_ZTIPKf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,21 +309,21 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIKf" - self_type: "type-8" + self_type: "_ZTIKf" } is_const: true is_volatile: false is_restricted: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -331,11 +331,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -343,11 +343,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -355,11 +355,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -367,11 +367,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -379,16 +379,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -396,11 +396,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -408,11 +408,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump index 6745984f2..deaa77d53 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIx" field_offset: 64 field_name: "speaker_long_long" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPx" field_offset: 128 field_name: "speaker_long_long_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "long long *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPx" - self_type: "type-7" + self_type: "_ZTIPx" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,20 +309,20 @@ builtin_types { name: "long long" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "" linker_set_key: "_ZTIx" - self_type: "type-6" + self_type: "_ZTIx" } is_unsigned: false is_integral: true } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump index 5a56ac664..e5cbc2021 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-6" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-7" + referenced_type: "_ZTIDi" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-4" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-4" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "char32_t" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIDi" source_file: "" linker_set_key: "_ZTIDi" - self_type: "type-7" + self_type: "_ZTIDi" } is_unsigned: true is_integral: true @@ -270,10 +270,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -283,10 +283,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -309,20 +309,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump index 784404bfa..b79663a8f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 64 field_name: "speaker_float" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-7" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-8" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-8" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump index 8671c0589..c72acadab 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId_" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t_" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star_" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump index 500e33fc1..b1f888aaa 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-5" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump index 4f3c5c9a4..ac3d9e095 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index b41d1b48f..327589543 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump index b6ce25815..fbb9a3116 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,27 +296,27 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZN12SuperSpeaker11SpeakLouderEv" access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -324,11 +324,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -336,11 +336,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -348,11 +348,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -360,16 +360,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libpure_virtual_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libpure_virtual_function.so.lsdump index a24bcf423..0147357ed 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libpure_virtual_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libpure_virtual_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "DerivedBar" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI10DerivedBar" - self_type: "type-4" + self_type: "_ZTI10DerivedBar" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" is_virtual: false access: public_access } @@ -59,10 +59,10 @@ record_types { name: "PureVirtualBase" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI15PureVirtualBase" - self_type: "type-1" + self_type: "_ZTI15PureVirtualBase" } vtable_layout { vtable_components { @@ -110,10 +110,10 @@ pointer_types { name: "DerivedBar *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP10DerivedBar" - self_type: "type-5" + self_type: "_ZTIP10DerivedBar" } } pointer_types { @@ -121,10 +121,10 @@ pointer_types { name: "PureVirtualBase *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP15PureVirtualBase" - self_type: "type-3" + self_type: "_ZTIP15PureVirtualBase" } } builtin_types { @@ -132,10 +132,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-2" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-2" + self_type: "_ZTIv" } is_unsigned: false is_integral: false diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libreproducability.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libreproducability.so.lsdump index 3d4a1481d..0f49dc421 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libreproducability.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libreproducability.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "ShouldRepro" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI11ShouldRepro" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h" linker_set_key: "_ZTI11ShouldRepro" - self_type: "type-1" + self_type: "_ZTI11ShouldRepro" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -22,10 +22,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/undeclared_types.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/mips/undeclared_types.h.sdump index 581ca8bf1..4b2e58a90 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/undeclared_types.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/undeclared_types.h.sdump @@ -13,10 +13,10 @@ "parameters" : [ { - "referenced_type" : "type-5" + "referenced_type" : "_ZTI10template_cIJ10template_dIJA_N11namespace_c1CEEEEE" } ], - "return_type" : "type-4", + "return_type" : "_ZTIRN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { @@ -27,13 +27,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-8" + "referenced_type" : "_ZTIP12InvalidClass" }, { - "referenced_type" : "type-9" + "referenced_type" : "_ZTI1E" } ], - "return_type" : "type-6", + "return_type" : "_ZTIN12InvalidClass1DE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -42,25 +42,25 @@ { "linker_set_key" : "a", "name" : "a", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "b", "name" : "b", - "referenced_type" : "type-2", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "c", "name" : "c", - "referenced_type" : "type-3", + "referenced_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "template_in_macro", "name" : "template_in_macro", - "referenced_type" : "type-11", + "referenced_type" : "_ZTIP15TemplateInMacroIJ1FEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -70,8 +70,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIRN11namespace_a1AE", "name" : "namespace_a::A &", - "referenced_type" : "type-1", - "self_type" : "type-4", + "referenced_type" : "_ZTIN11namespace_a1AE", + "self_type" : "_ZTIRN11namespace_a1AE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -82,8 +82,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12InvalidClass", "name" : "InvalidClass *", - "referenced_type" : "type-7", - "self_type" : "type-8", + "referenced_type" : "_ZTI12InvalidClass", + "self_type" : "_ZTIP12InvalidClass", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, @@ -91,8 +91,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE", "name" : "TemplateInMacro *", - "referenced_type" : "type-10", - "self_type" : "type-11", + "referenced_type" : "_ZTI15TemplateInMacroIJ1FEE", + "self_type" : "_ZTIP15TemplateInMacroIJ1FEE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -103,8 +103,8 @@ "is_const" : true, "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "name" : "const namespace_b::template_b", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", + "self_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/known_issues.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/known_issues.h.sdump index 1597ed872..cc90665f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/known_issues.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/known_issues.h.sdump @@ -7,8 +7,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 } ], @@ -22,19 +22,19 @@ { "linker_set_key" : "non_type_template", "name" : "non_type_template", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "return_type", "name" : "return_type", - "referenced_type" : "type-2", + "referenced_type" : "_ZTI7STDCALL", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "template_arg_in_namespace", "name" : "template_arg_in_namespace", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp.so.lsdump index c30c9f97a..56e6aabd3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp.so.lsdump @@ -3,19 +3,19 @@ record_types { name: "Foo" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-1" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 64 field_name: "b_" access: private_access @@ -28,13 +28,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-7" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -47,19 +47,19 @@ record_types { name: "Cstruct" size: 16 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-5" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIP6Cinner" field_offset: 64 field_name: "b" access: public_access @@ -72,10 +72,10 @@ pointer_types { name: "Foo *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-10" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -83,10 +83,10 @@ pointer_types { name: "Cinner *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-6" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -94,10 +94,10 @@ pointer_types { name: "Cstruct *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-4" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -105,10 +105,10 @@ pointer_types { name: "Cstruct **" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-8" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -116,10 +116,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-2" + self_type: "_ZTIPi" } } builtin_types { @@ -127,10 +127,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-3" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -140,20 +140,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-9" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-9" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-9" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-8" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -161,16 +161,16 @@ functions { access: public_access } functions { - return_type: "type-1" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp_with_unused_struct.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp_with_unused_struct.so.lsdump index 99568b319..cdca30e63 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp_with_unused_struct.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp_with_unused_struct.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "UnusedStruct" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12UnusedStruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI12UnusedStruct" - self_type: "type-1" + self_type: "_ZTI12UnusedStruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "mUnusedMember" access: public_access @@ -22,19 +22,19 @@ record_types { name: "Foo" size: 16 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-8" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 64 field_name: "b_" access: private_access @@ -47,13 +47,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-6" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -66,19 +66,19 @@ record_types { name: "Cstruct" size: 16 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-4" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-5" + referenced_type: "_ZTIP6Cinner" field_offset: 64 field_name: "b" access: public_access @@ -91,10 +91,10 @@ pointer_types { name: "Foo *" size: 8 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-11" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -102,10 +102,10 @@ pointer_types { name: "Cinner *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-5" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -113,10 +113,10 @@ pointer_types { name: "Cstruct *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-3" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -124,10 +124,10 @@ pointer_types { name: "Cstruct **" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-7" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -135,10 +135,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-9" + self_type: "_ZTIPi" } } builtin_types { @@ -146,10 +146,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -159,20 +159,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -180,16 +180,16 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump index e31861d01..0dc35015c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump index a02413613..84829bfd8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::AddedFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -418,11 +418,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function_sybmol_only.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function_sybmol_only.so.lsdump index 7561c6280..06526ecab 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function_sybmol_only.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function_sybmol_only.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump index 7dea4df24..86969d83f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -421,7 +421,7 @@ global_vars { name: "HighVolumeSpeaker::global_unprotected_id" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZN17HighVolumeSpeaker21global_unprotected_idE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } elf_functions { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump index 0528739d4..2c7f9da89 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: private_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump index dafc9bdef..b3d2098a7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: private_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: private_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump index 5a7cf933b..b4c23b3f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-2" + underlying_type: "_ZTIi" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -209,10 +209,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -220,10 +220,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -231,10 +231,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -242,10 +242,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -253,10 +253,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -266,10 +266,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -279,10 +279,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -292,20 +292,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -313,11 +313,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -325,11 +325,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -337,11 +337,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -349,11 +349,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -361,16 +361,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-7" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -378,11 +378,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -390,11 +390,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump index 1f25b4df5..8ccd95469 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -217,10 +217,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -228,10 +228,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -239,10 +239,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -250,10 +250,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -261,10 +261,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -274,10 +274,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -287,10 +287,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -300,20 +300,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -321,11 +321,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -333,11 +333,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -345,11 +345,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -357,11 +357,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -369,16 +369,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -386,11 +386,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -398,11 +398,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump index 29914e758..4be1bf6d4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 40 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: true access: public_access } @@ -188,13 +188,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -244,12 +244,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -273,10 +273,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -284,10 +284,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -295,10 +295,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -306,10 +306,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -317,10 +317,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -330,10 +330,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -343,10 +343,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -356,20 +356,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -401,11 +401,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -413,11 +413,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -425,16 +425,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -442,11 +442,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -454,11 +454,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump index d92166c56..713d8e8df 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump @@ -6,8 +6,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "type-3", - "self_type" : "type-3", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +15,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +25,15 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "type-6", - "self_type" : "type-6", + "referenced_type" : "_ZTIj", + "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-10", - "self_type" : "type-10" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -104,11 +104,11 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "type-8", - "self_type" : "type-8", + "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", + "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", - "underlying_type" : "type-6" + "underlying_type" : "_ZTIj" } ], "function_types" : [], @@ -121,10 +121,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -133,10 +133,10 @@ "parameters" : [ { - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], - "return_type" : "type-9", + "return_type" : "_ZTIP12SuperSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -146,10 +146,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-8", + "return_type" : "_ZTIN12SuperSpeaker6VolumeE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -159,10 +159,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -172,10 +172,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -185,13 +185,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" }, { - "referenced_type" : "type-3" + "referenced_type" : "_ZTIf" } ], - "return_type" : "type-12", + "return_type" : "_ZTIP17HighVolumeSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -201,10 +201,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -214,10 +214,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" } ], @@ -229,8 +229,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", - "referenced_type" : "type-1", - "self_type" : "type-9", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTIP12SuperSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -238,8 +238,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", - "referenced_type" : "type-5", - "self_type" : "type-4", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -247,8 +247,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", - "referenced_type" : "type-11", - "self_type" : "type-12", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -256,8 +256,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIPf", "name" : "float *", - "referenced_type" : "type-3", - "self_type" : "type-7", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIPf", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -273,14 +273,14 @@ "access" : "private", "field_name" : "mSpeakderId", "field_offset" : 64, - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTI12SuperSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -315,7 +315,7 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "fields" : @@ -323,19 +323,19 @@ { "field_name" : "speaker_uint_t", "field_offset" : 96, - "referenced_type" : "type-6" + "referenced_type" : "_ZTIj" }, { "field_name" : "speaker_float_star", "field_offset" : 128, - "referenced_type" : "type-7" + "referenced_type" : "_ZTIPf" } ], "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-5", - "self_type" : "type-5", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 24, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -368,14 +368,14 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-11", - "self_type" : "type-11", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump index 8e32d6175..2fc25a834 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPKf" field_offset: 128 field_name: "const_speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-9" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "const float *" size: 8 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPKf" - self_type: "type-7" + self_type: "_ZTIPKf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,21 +309,21 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIKf" - self_type: "type-8" + self_type: "_ZTIKf" } is_const: true is_volatile: false is_restricted: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -331,11 +331,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -343,11 +343,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -355,11 +355,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -367,11 +367,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -379,16 +379,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -396,11 +396,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -408,11 +408,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump index f798213e0..023a2be50 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 32 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIx" field_offset: 128 field_name: "speaker_long_long" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPx" field_offset: 192 field_name: "speaker_long_long_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "long long *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPx" - self_type: "type-7" + self_type: "_ZTIPx" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,20 +309,20 @@ builtin_types { name: "long long" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "" linker_set_key: "_ZTIx" - self_type: "type-6" + self_type: "_ZTIx" } is_unsigned: false is_integral: true } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump index cf9bf88fe..e076de61f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-6" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-7" + referenced_type: "_ZTIDi" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-4" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-4" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "char32_t" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIDi" source_file: "" linker_set_key: "_ZTIDi" - self_type: "type-7" + self_type: "_ZTIDi" } is_unsigned: true is_integral: true @@ -270,10 +270,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -283,10 +283,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -309,20 +309,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump index eeb4aed1c..70bc99777 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 96 field_name: "speaker_float" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-7" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-8" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-8" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump index fc0f5a43a..43e8b2607 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId_" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t_" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star_" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump index e10329467..ab77b9209 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-5" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump index 80be5e46f..9aeadfd07 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 82e188d79..f3516e972 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump index f94a04e0d..fc7cd2a08 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,27 +296,27 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZN12SuperSpeaker11SpeakLouderEv" access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -324,11 +324,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -336,11 +336,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -348,11 +348,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -360,16 +360,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libpure_virtual_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libpure_virtual_function.so.lsdump index 4346c971f..1660a6f1c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libpure_virtual_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libpure_virtual_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "DerivedBar" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI10DerivedBar" - self_type: "type-4" + self_type: "_ZTI10DerivedBar" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" is_virtual: false access: public_access } @@ -59,10 +59,10 @@ record_types { name: "PureVirtualBase" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI15PureVirtualBase" - self_type: "type-1" + self_type: "_ZTI15PureVirtualBase" } vtable_layout { vtable_components { @@ -110,10 +110,10 @@ pointer_types { name: "DerivedBar *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP10DerivedBar" - self_type: "type-5" + self_type: "_ZTIP10DerivedBar" } } pointer_types { @@ -121,10 +121,10 @@ pointer_types { name: "PureVirtualBase *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP15PureVirtualBase" - self_type: "type-3" + self_type: "_ZTIP15PureVirtualBase" } } builtin_types { @@ -132,10 +132,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-2" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-2" + self_type: "_ZTIv" } is_unsigned: false is_integral: false diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libreproducability.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libreproducability.so.lsdump index 3d4a1481d..0f49dc421 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libreproducability.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libreproducability.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "ShouldRepro" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI11ShouldRepro" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h" linker_set_key: "_ZTI11ShouldRepro" - self_type: "type-1" + self_type: "_ZTI11ShouldRepro" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -22,10 +22,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/undeclared_types.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/undeclared_types.h.sdump index 581ca8bf1..4b2e58a90 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/undeclared_types.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/undeclared_types.h.sdump @@ -13,10 +13,10 @@ "parameters" : [ { - "referenced_type" : "type-5" + "referenced_type" : "_ZTI10template_cIJ10template_dIJA_N11namespace_c1CEEEEE" } ], - "return_type" : "type-4", + "return_type" : "_ZTIRN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { @@ -27,13 +27,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-8" + "referenced_type" : "_ZTIP12InvalidClass" }, { - "referenced_type" : "type-9" + "referenced_type" : "_ZTI1E" } ], - "return_type" : "type-6", + "return_type" : "_ZTIN12InvalidClass1DE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -42,25 +42,25 @@ { "linker_set_key" : "a", "name" : "a", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "b", "name" : "b", - "referenced_type" : "type-2", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "c", "name" : "c", - "referenced_type" : "type-3", + "referenced_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "template_in_macro", "name" : "template_in_macro", - "referenced_type" : "type-11", + "referenced_type" : "_ZTIP15TemplateInMacroIJ1FEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -70,8 +70,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIRN11namespace_a1AE", "name" : "namespace_a::A &", - "referenced_type" : "type-1", - "self_type" : "type-4", + "referenced_type" : "_ZTIN11namespace_a1AE", + "self_type" : "_ZTIRN11namespace_a1AE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -82,8 +82,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12InvalidClass", "name" : "InvalidClass *", - "referenced_type" : "type-7", - "self_type" : "type-8", + "referenced_type" : "_ZTI12InvalidClass", + "self_type" : "_ZTIP12InvalidClass", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, @@ -91,8 +91,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE", "name" : "TemplateInMacro *", - "referenced_type" : "type-10", - "self_type" : "type-11", + "referenced_type" : "_ZTI15TemplateInMacroIJ1FEE", + "self_type" : "_ZTIP15TemplateInMacroIJ1FEE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -103,8 +103,8 @@ "is_const" : true, "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "name" : "const namespace_b::template_b", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", + "self_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/known_issues.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/x86/known_issues.h.sdump index 1597ed872..cc90665f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/known_issues.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/known_issues.h.sdump @@ -7,8 +7,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 } ], @@ -22,19 +22,19 @@ { "linker_set_key" : "non_type_template", "name" : "non_type_template", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "return_type", "name" : "return_type", - "referenced_type" : "type-2", + "referenced_type" : "_ZTI7STDCALL", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "template_arg_in_namespace", "name" : "template_arg_in_namespace", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp.so.lsdump index 0d500fe44..e00697569 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp.so.lsdump @@ -3,19 +3,19 @@ record_types { name: "Foo" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-1" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 32 field_name: "b_" access: private_access @@ -28,13 +28,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-7" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -47,19 +47,19 @@ record_types { name: "Cstruct" size: 8 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-5" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIP6Cinner" field_offset: 32 field_name: "b" access: public_access @@ -72,10 +72,10 @@ pointer_types { name: "Foo *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-10" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -83,10 +83,10 @@ pointer_types { name: "Cinner *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-6" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -94,10 +94,10 @@ pointer_types { name: "Cstruct *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-4" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -105,10 +105,10 @@ pointer_types { name: "Cstruct **" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-8" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -116,10 +116,10 @@ pointer_types { name: "int *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-2" + self_type: "_ZTIPi" } } builtin_types { @@ -127,10 +127,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-3" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -140,20 +140,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-9" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-9" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-9" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-8" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -161,16 +161,16 @@ functions { access: public_access } functions { - return_type: "type-1" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp_with_unused_struct.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp_with_unused_struct.so.lsdump index ba145f96a..d030088d8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp_with_unused_struct.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libc_and_cpp_with_unused_struct.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "UnusedStruct" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12UnusedStruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI12UnusedStruct" - self_type: "type-1" + self_type: "_ZTI12UnusedStruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "mUnusedMember" access: public_access @@ -22,19 +22,19 @@ record_types { name: "Foo" size: 8 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-8" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 32 field_name: "b_" access: private_access @@ -47,13 +47,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-6" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -66,19 +66,19 @@ record_types { name: "Cstruct" size: 8 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-4" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-5" + referenced_type: "_ZTIP6Cinner" field_offset: 32 field_name: "b" access: public_access @@ -91,10 +91,10 @@ pointer_types { name: "Foo *" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-11" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -102,10 +102,10 @@ pointer_types { name: "Cinner *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-5" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -113,10 +113,10 @@ pointer_types { name: "Cstruct *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-3" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -124,10 +124,10 @@ pointer_types { name: "Cstruct **" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-7" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -135,10 +135,10 @@ pointer_types { name: "int *" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-9" + self_type: "_ZTIPi" } } builtin_types { @@ -146,10 +146,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -159,20 +159,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -180,16 +180,16 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump index 9347e5bd3..42aad9df7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump index 5e992cf71..d2a202267 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::AddedFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -418,11 +418,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function_sybmol_only.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function_sybmol_only.so.lsdump index d6af968b7..4c9de6d3c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function_sybmol_only.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function_sybmol_only.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump index f5c61ee49..9df7eba8f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -421,7 +421,7 @@ global_vars { name: "HighVolumeSpeaker::global_unprotected_id" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZN17HighVolumeSpeaker21global_unprotected_idE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } elf_functions { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump index da7154d52..fe80d94c5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: private_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump index 60f67cd7a..c6f43df28 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: private_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: private_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump index 0063beae1..2b9e7713b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-2" + underlying_type: "_ZTIi" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -209,10 +209,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -220,10 +220,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -231,10 +231,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -242,10 +242,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -253,10 +253,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -266,10 +266,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -279,10 +279,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -292,20 +292,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -313,11 +313,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -325,11 +325,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -337,11 +337,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -349,11 +349,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -361,16 +361,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-7" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -378,11 +378,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -390,11 +390,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump index 589816936..7269f9ed4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -217,10 +217,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -228,10 +228,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -239,10 +239,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -250,10 +250,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -261,10 +261,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -274,10 +274,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -287,10 +287,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -300,20 +300,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -321,11 +321,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -333,11 +333,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -345,11 +345,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -357,11 +357,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -369,16 +369,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -386,11 +386,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -398,11 +398,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump index 42062b8bb..dbad77d8d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 20 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 32 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 64 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: true access: public_access } @@ -188,13 +188,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -244,12 +244,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -273,10 +273,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -284,10 +284,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -295,10 +295,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -306,10 +306,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -317,10 +317,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -330,10 +330,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -343,10 +343,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -356,20 +356,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -401,11 +401,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -413,11 +413,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -425,16 +425,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -442,11 +442,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -454,11 +454,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump index 79803e5f4..333543371 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump @@ -6,8 +6,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "type-3", - "self_type" : "type-3", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +15,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +25,15 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "type-6", - "self_type" : "type-6", + "referenced_type" : "_ZTIj", + "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-10", - "self_type" : "type-10" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -104,11 +104,11 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "type-8", - "self_type" : "type-8", + "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", + "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", - "underlying_type" : "type-6" + "underlying_type" : "_ZTIj" } ], "function_types" : [], @@ -121,10 +121,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -133,10 +133,10 @@ "parameters" : [ { - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], - "return_type" : "type-9", + "return_type" : "_ZTIP12SuperSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -146,10 +146,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-8", + "return_type" : "_ZTIN12SuperSpeaker6VolumeE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -159,10 +159,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -172,10 +172,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -185,13 +185,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" }, { - "referenced_type" : "type-3" + "referenced_type" : "_ZTIf" } ], - "return_type" : "type-12", + "return_type" : "_ZTIP17HighVolumeSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -201,10 +201,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -214,10 +214,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" } ], @@ -229,8 +229,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", - "referenced_type" : "type-1", - "self_type" : "type-9", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTIP12SuperSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -238,8 +238,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", - "referenced_type" : "type-5", - "self_type" : "type-4", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -247,8 +247,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", - "referenced_type" : "type-11", - "self_type" : "type-12", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -256,8 +256,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIPf", "name" : "float *", - "referenced_type" : "type-3", - "self_type" : "type-7", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIPf", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -273,14 +273,14 @@ "access" : "private", "field_name" : "mSpeakderId", "field_offset" : 32, - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTI12SuperSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -315,7 +315,7 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "fields" : @@ -323,19 +323,19 @@ { "field_name" : "speaker_uint_t", "field_offset" : 64, - "referenced_type" : "type-6" + "referenced_type" : "_ZTIj" }, { "field_name" : "speaker_float_star", "field_offset" : 96, - "referenced_type" : "type-7" + "referenced_type" : "_ZTIPf" } ], "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-5", - "self_type" : "type-5", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -368,14 +368,14 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-11", - "self_type" : "type-11", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump index b3cf1165c..e6a121b29 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPKf" field_offset: 96 field_name: "const_speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-9" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "const float *" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPKf" - self_type: "type-7" + self_type: "_ZTIPKf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,21 +309,21 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIKf" - self_type: "type-8" + self_type: "_ZTIKf" } is_const: true is_volatile: false is_restricted: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -331,11 +331,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -343,11 +343,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -355,11 +355,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -367,11 +367,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -379,16 +379,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -396,11 +396,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -408,11 +408,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump index a10f8506c..efb0b0e99 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 20 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIx" field_offset: 64 field_name: "speaker_long_long" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPx" field_offset: 128 field_name: "speaker_long_long_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "long long *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPx" - self_type: "type-7" + self_type: "_ZTIPx" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,20 +309,20 @@ builtin_types { name: "long long" size: 8 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "" linker_set_key: "_ZTIx" - self_type: "type-6" + self_type: "_ZTIx" } is_unsigned: false is_integral: true } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump index 5a56ac664..e5cbc2021 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-6" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-7" + referenced_type: "_ZTIDi" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-4" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-4" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "char32_t" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIDi" source_file: "" linker_set_key: "_ZTIDi" - self_type: "type-7" + self_type: "_ZTIDi" } is_unsigned: true is_integral: true @@ -270,10 +270,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -283,10 +283,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -309,20 +309,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump index 784404bfa..b79663a8f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 64 field_name: "speaker_float" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-7" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-8" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-8" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump index 8671c0589..c72acadab 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId_" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t_" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star_" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump index 500e33fc1..b1f888aaa 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-5" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump index 4f3c5c9a4..ac3d9e095 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index b41d1b48f..327589543 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump index b6ce25815..fbb9a3116 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 8 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 32 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 16 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 96 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 8 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 4 alignment: 4 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,27 +296,27 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZN12SuperSpeaker11SpeakLouderEv" access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -324,11 +324,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -336,11 +336,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -348,11 +348,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -360,16 +360,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libpure_virtual_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libpure_virtual_function.so.lsdump index a24bcf423..0147357ed 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libpure_virtual_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libpure_virtual_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "DerivedBar" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI10DerivedBar" - self_type: "type-4" + self_type: "_ZTI10DerivedBar" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" is_virtual: false access: public_access } @@ -59,10 +59,10 @@ record_types { name: "PureVirtualBase" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI15PureVirtualBase" - self_type: "type-1" + self_type: "_ZTI15PureVirtualBase" } vtable_layout { vtable_components { @@ -110,10 +110,10 @@ pointer_types { name: "DerivedBar *" size: 4 alignment: 4 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP10DerivedBar" - self_type: "type-5" + self_type: "_ZTIP10DerivedBar" } } pointer_types { @@ -121,10 +121,10 @@ pointer_types { name: "PureVirtualBase *" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP15PureVirtualBase" - self_type: "type-3" + self_type: "_ZTIP15PureVirtualBase" } } builtin_types { @@ -132,10 +132,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-2" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-2" + self_type: "_ZTIv" } is_unsigned: false is_integral: false diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libreproducability.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libreproducability.so.lsdump index 3d4a1481d..0f49dc421 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libreproducability.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libreproducability.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "ShouldRepro" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI11ShouldRepro" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h" linker_set_key: "_ZTI11ShouldRepro" - self_type: "type-1" + self_type: "_ZTI11ShouldRepro" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -22,10 +22,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/undeclared_types.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/x86/undeclared_types.h.sdump index 581ca8bf1..4b2e58a90 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/undeclared_types.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/undeclared_types.h.sdump @@ -13,10 +13,10 @@ "parameters" : [ { - "referenced_type" : "type-5" + "referenced_type" : "_ZTI10template_cIJ10template_dIJA_N11namespace_c1CEEEEE" } ], - "return_type" : "type-4", + "return_type" : "_ZTIRN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { @@ -27,13 +27,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-8" + "referenced_type" : "_ZTIP12InvalidClass" }, { - "referenced_type" : "type-9" + "referenced_type" : "_ZTI1E" } ], - "return_type" : "type-6", + "return_type" : "_ZTIN12InvalidClass1DE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -42,25 +42,25 @@ { "linker_set_key" : "a", "name" : "a", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "b", "name" : "b", - "referenced_type" : "type-2", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "c", "name" : "c", - "referenced_type" : "type-3", + "referenced_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "template_in_macro", "name" : "template_in_macro", - "referenced_type" : "type-11", + "referenced_type" : "_ZTIP15TemplateInMacroIJ1FEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -70,8 +70,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIRN11namespace_a1AE", "name" : "namespace_a::A &", - "referenced_type" : "type-1", - "self_type" : "type-4", + "referenced_type" : "_ZTIN11namespace_a1AE", + "self_type" : "_ZTIRN11namespace_a1AE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -82,8 +82,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12InvalidClass", "name" : "InvalidClass *", - "referenced_type" : "type-7", - "self_type" : "type-8", + "referenced_type" : "_ZTI12InvalidClass", + "self_type" : "_ZTIP12InvalidClass", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, @@ -91,8 +91,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE", "name" : "TemplateInMacro *", - "referenced_type" : "type-10", - "self_type" : "type-11", + "referenced_type" : "_ZTI15TemplateInMacroIJ1FEE", + "self_type" : "_ZTIP15TemplateInMacroIJ1FEE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -103,8 +103,8 @@ "is_const" : true, "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "name" : "const namespace_b::template_b", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", + "self_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/known_issues.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/known_issues.h.sdump index 1597ed872..cc90665f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/known_issues.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/known_issues.h.sdump @@ -7,8 +7,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 } ], @@ -22,19 +22,19 @@ { "linker_set_key" : "non_type_template", "name" : "non_type_template", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "return_type", "name" : "return_type", - "referenced_type" : "type-2", + "referenced_type" : "_ZTI7STDCALL", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" }, { "linker_set_key" : "template_arg_in_namespace", "name" : "template_arg_in_namespace", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIi", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/known_issues.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp.so.lsdump index c30c9f97a..56e6aabd3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp.so.lsdump @@ -3,19 +3,19 @@ record_types { name: "Foo" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-1" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-2" + referenced_type: "_ZTIPi" field_offset: 64 field_name: "b_" access: private_access @@ -28,13 +28,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-7" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -47,19 +47,19 @@ record_types { name: "Cstruct" size: 16 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-5" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIP6Cinner" field_offset: 64 field_name: "b" access: public_access @@ -72,10 +72,10 @@ pointer_types { name: "Foo *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-10" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -83,10 +83,10 @@ pointer_types { name: "Cinner *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-6" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -94,10 +94,10 @@ pointer_types { name: "Cstruct *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-4" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -105,10 +105,10 @@ pointer_types { name: "Cstruct **" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-8" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -116,10 +116,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-2" + self_type: "_ZTIPi" } } builtin_types { @@ -127,10 +127,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-3" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -140,20 +140,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-9" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-9" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-9" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-8" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -161,16 +161,16 @@ functions { access: public_access } functions { - return_type: "type-1" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp_with_unused_struct.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp_with_unused_struct.so.lsdump index 99568b319..cdca30e63 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp_with_unused_struct.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libc_and_cpp_with_unused_struct.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "UnusedStruct" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI12UnusedStruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI12UnusedStruct" - self_type: "type-1" + self_type: "_ZTI12UnusedStruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "mUnusedMember" access: public_access @@ -22,19 +22,19 @@ record_types { name: "Foo" size: 16 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTI3Foo" - self_type: "type-8" + self_type: "_ZTI3Foo" } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 0 field_name: "a_" access: private_access } fields { - referenced_type: "type-9" + referenced_type: "_ZTIPi" field_offset: 64 field_name: "b_" access: private_access @@ -47,13 +47,13 @@ record_types { name: "Cinner" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI6Cinner" - self_type: "type-6" + self_type: "_ZTI6Cinner" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "c" access: public_access @@ -66,19 +66,19 @@ record_types { name: "Cstruct" size: 16 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTI7Cstruct" - self_type: "type-4" + self_type: "_ZTI7Cstruct" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access } fields { - referenced_type: "type-5" + referenced_type: "_ZTIP6Cinner" field_offset: 64 field_name: "b" access: public_access @@ -91,10 +91,10 @@ pointer_types { name: "Foo *" size: 8 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTI3Foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIP3Foo" - self_type: "type-11" + self_type: "_ZTIP3Foo" } } pointer_types { @@ -102,10 +102,10 @@ pointer_types { name: "Cinner *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI6Cinner" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP6Cinner" - self_type: "type-5" + self_type: "_ZTIP6Cinner" } } pointer_types { @@ -113,10 +113,10 @@ pointer_types { name: "Cstruct *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIP7Cstruct" - self_type: "type-3" + self_type: "_ZTIP7Cstruct" } } pointer_types { @@ -124,10 +124,10 @@ pointer_types { name: "Cstruct **" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIP7Cstruct" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" linker_set_key: "_ZTIPP7Cstruct" - self_type: "type-7" + self_type: "_ZTIPP7Cstruct" } } pointer_types { @@ -135,10 +135,10 @@ pointer_types { name: "int *" size: 8 alignment: 8 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" linker_set_key: "_ZTIPi" - self_type: "type-9" + self_type: "_ZTIPi" } } builtin_types { @@ -146,10 +146,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -159,20 +159,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "CFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h" parameters { - referenced_type: "type-7" + referenced_type: "_ZTIPP7Cstruct" default_arg: false is_this_ptr: false } @@ -180,16 +180,16 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTI3Foo" function_name: "foo" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } parameters { - referenced_type: "type-9" + referenced_type: "_ZTIPi" default_arg: false is_this_ptr: false } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump index e31861d01..0dc35015c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump index a02413613..84829bfd8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::AddedFunction" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -418,11 +418,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function_sybmol_only.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function_sybmol_only.so.lsdump index 7561c6280..06526ecab 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function_sybmol_only.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function_sybmol_only.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump index 7dea4df24..86969d83f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -421,7 +421,7 @@ global_vars { name: "HighVolumeSpeaker::global_unprotected_id" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZN17HighVolumeSpeaker21global_unprotected_idE" - referenced_type: "type-2" + referenced_type: "_ZTIi" access: public_access } elf_functions { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump index 0528739d4..2c7f9da89 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: private_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump index dafc9bdef..b3d2098a7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: private_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: private_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump index 5a7cf933b..b4c23b3f8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-2" + underlying_type: "_ZTIi" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -209,10 +209,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -220,10 +220,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -231,10 +231,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -242,10 +242,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -253,10 +253,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -266,10 +266,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -279,10 +279,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -292,20 +292,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -313,11 +313,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -325,11 +325,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -337,11 +337,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -349,11 +349,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -361,16 +361,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-7" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -378,11 +378,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -390,11 +390,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump index 1f25b4df5..8ccd95469 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -217,10 +217,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -228,10 +228,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -239,10 +239,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -250,10 +250,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -261,10 +261,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -274,10 +274,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -287,10 +287,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -300,20 +300,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -321,11 +321,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -333,11 +333,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -345,11 +345,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -357,11 +357,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -369,16 +369,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -386,11 +386,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -398,11 +398,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump index 29914e758..4be1bf6d4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 40 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 64 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: true access: public_access } @@ -188,13 +188,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -244,12 +244,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -273,10 +273,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -284,10 +284,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -295,10 +295,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -306,10 +306,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -317,10 +317,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -330,10 +330,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -343,10 +343,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -356,20 +356,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -401,11 +401,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -413,11 +413,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -425,16 +425,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -442,11 +442,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -454,11 +454,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump index d92166c56..713d8e8df 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump @@ -6,8 +6,8 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "type-3", - "self_type" : "type-3", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +15,8 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "type-2", - "self_type" : "type-2", + "referenced_type" : "_ZTIi", + "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +25,15 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "type-6", - "self_type" : "type-6", + "referenced_type" : "_ZTIj", + "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", "name" : "void", - "referenced_type" : "type-10", - "self_type" : "type-10" + "referenced_type" : "_ZTIv", + "self_type" : "_ZTIv" } ], "elf_functions" : @@ -104,11 +104,11 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "type-8", - "self_type" : "type-8", + "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", + "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", - "underlying_type" : "type-6" + "underlying_type" : "_ZTIj" } ], "function_types" : [], @@ -121,10 +121,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -133,10 +133,10 @@ "parameters" : [ { - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], - "return_type" : "type-9", + "return_type" : "_ZTIP12SuperSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -146,10 +146,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-9" + "referenced_type" : "_ZTIP12SuperSpeaker" } ], - "return_type" : "type-8", + "return_type" : "_ZTIN12SuperSpeaker6VolumeE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, { @@ -159,10 +159,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -172,10 +172,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-4" + "referenced_type" : "_ZTIP16LowVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, { @@ -185,13 +185,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" }, { - "referenced_type" : "type-3" + "referenced_type" : "_ZTIf" } ], - "return_type" : "type-12", + "return_type" : "_ZTIP17HighVolumeSpeaker", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -201,10 +201,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, { @@ -214,10 +214,10 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-12" + "referenced_type" : "_ZTIP17HighVolumeSpeaker" } ], - "return_type" : "type-10", + "return_type" : "_ZTIv", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" } ], @@ -229,8 +229,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", - "referenced_type" : "type-1", - "self_type" : "type-9", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTIP12SuperSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -238,8 +238,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", - "referenced_type" : "type-5", - "self_type" : "type-4", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -247,8 +247,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", - "referenced_type" : "type-11", - "self_type" : "type-12", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -256,8 +256,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIPf", "name" : "float *", - "referenced_type" : "type-3", - "self_type" : "type-7", + "referenced_type" : "_ZTIf", + "self_type" : "_ZTIPf", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -273,14 +273,14 @@ "access" : "private", "field_name" : "mSpeakderId", "field_offset" : 64, - "referenced_type" : "type-2" + "referenced_type" : "_ZTIi" } ], "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "type-1", - "self_type" : "type-1", + "referenced_type" : "_ZTI12SuperSpeaker", + "self_type" : "_ZTI12SuperSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -315,7 +315,7 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "fields" : @@ -323,19 +323,19 @@ { "field_name" : "speaker_uint_t", "field_offset" : 96, - "referenced_type" : "type-6" + "referenced_type" : "_ZTIj" }, { "field_name" : "speaker_float_star", "field_offset" : 128, - "referenced_type" : "type-7" + "referenced_type" : "_ZTIPf" } ], "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-5", - "self_type" : "type-5", + "referenced_type" : "_ZTI16LowVolumeSpeaker", + "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 24, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -368,14 +368,14 @@ "base_specifiers" : [ { - "referenced_type" : "type-1" + "referenced_type" : "_ZTI12SuperSpeaker" } ], "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "type-11", - "self_type" : "type-11", + "referenced_type" : "_ZTI17HighVolumeSpeaker", + "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 16, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump index 8e32d6175..2fc25a834 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPKf" field_offset: 128 field_name: "const_speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-9" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "const float *" size: 8 alignment: 8 - referenced_type: "type-8" + referenced_type: "_ZTIKf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPKf" - self_type: "type-7" + self_type: "_ZTIPKf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,21 +309,21 @@ qualified_types { name: "const float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIKf" - self_type: "type-8" + self_type: "_ZTIKf" } is_const: true is_volatile: false is_restricted: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -331,11 +331,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -343,11 +343,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -355,11 +355,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -367,11 +367,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -379,16 +379,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -396,11 +396,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -408,11 +408,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump index f798213e0..023a2be50 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 32 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIx" field_offset: 128 field_name: "speaker_long_long" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPx" field_offset: 192 field_name: "speaker_long_long_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "long long *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPx" - self_type: "type-7" + self_type: "_ZTIPx" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false @@ -309,20 +309,20 @@ builtin_types { name: "long long" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTIx" source_file: "" linker_set_key: "_ZTIx" - self_type: "type-6" + self_type: "_ZTIx" } is_unsigned: false is_integral: true } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump index cf9bf88fe..e076de61f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-6" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-7" + referenced_type: "_ZTIDi" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-4" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-9" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-10" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-6" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-12" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-13" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-4" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "char32_t" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIDi" source_file: "" linker_set_key: "_ZTIDi" - self_type: "type-7" + self_type: "_ZTIDi" } is_unsigned: true is_integral: true @@ -270,10 +270,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -283,10 +283,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -296,10 +296,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-9" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-9" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -309,20 +309,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-11" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-11" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -330,11 +330,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -342,11 +342,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-10" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -354,11 +354,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -366,11 +366,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-5" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -378,16 +378,16 @@ functions { access: public_access } functions { - return_type: "type-13" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -395,11 +395,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -407,11 +407,11 @@ functions { access: public_access } functions { - return_type: "type-11" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-13" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump index eeb4aed1c..70bc99777 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-3" + referenced_type: "_ZTIf" field_offset: 96 field_name: "speaker_float" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-7" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-8" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-8" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-7" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump index fc0f5a43a..43e8b2607 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId_" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t_" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star_" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump index e10329467..ab77b9209 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-5" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-6" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-5" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-3" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-6" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-7" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-7" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-5" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-5" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::~SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,11 +365,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-3" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -377,16 +377,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -406,11 +406,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump index 80be5e46f..9aeadfd07 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-2" + return_type: "_ZTIi" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 82e188d79..f3516e972 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,20 +296,20 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -317,11 +317,11 @@ functions { access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -329,11 +329,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -341,11 +341,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -353,11 +353,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -365,16 +365,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -382,11 +382,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -394,11 +394,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump index f94a04e0d..fc7cd2a08 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "SuperSpeaker" size: 16 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTI12SuperSpeaker" - self_type: "type-1" + self_type: "_ZTI12SuperSpeaker" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 64 field_name: "mSpeakderId" access: private_access @@ -60,25 +60,25 @@ record_types { name: "LowVolumeSpeaker" size: 24 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTI16LowVolumeSpeaker" - self_type: "type-5" + self_type: "_ZTI16LowVolumeSpeaker" } fields { - referenced_type: "type-6" + referenced_type: "_ZTIj" field_offset: 96 field_name: "speaker_uint_t" access: public_access } fields { - referenced_type: "type-7" + referenced_type: "_ZTIPf" field_offset: 128 field_name: "speaker_float_star" access: public_access } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -128,13 +128,13 @@ record_types { name: "HighVolumeSpeaker" size: 16 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTI17HighVolumeSpeaker" - self_type: "type-11" + self_type: "_ZTI17HighVolumeSpeaker" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" is_virtual: false access: public_access } @@ -184,12 +184,12 @@ enum_types { name: "SuperSpeaker::Volume" size: 4 alignment: 4 - referenced_type: "type-8" + referenced_type: "_ZTIN12SuperSpeaker6VolumeE" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIN12SuperSpeaker6VolumeE" - self_type: "type-8" + self_type: "_ZTIN12SuperSpeaker6VolumeE" } - underlying_type: "type-6" + underlying_type: "_ZTIj" enum_fields { enum_field_value: 1 name: "SuperSpeaker::Loud" @@ -213,10 +213,10 @@ pointer_types { name: "SuperSpeaker *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI12SuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZTIP12SuperSpeaker" - self_type: "type-9" + self_type: "_ZTIP12SuperSpeaker" } } pointer_types { @@ -224,10 +224,10 @@ pointer_types { name: "LowVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-5" + referenced_type: "_ZTI16LowVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIP16LowVolumeSpeaker" - self_type: "type-4" + self_type: "_ZTIP16LowVolumeSpeaker" } } pointer_types { @@ -235,10 +235,10 @@ pointer_types { name: "HighVolumeSpeaker *" size: 8 alignment: 8 - referenced_type: "type-11" + referenced_type: "_ZTI17HighVolumeSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" linker_set_key: "_ZTIP17HighVolumeSpeaker" - self_type: "type-12" + self_type: "_ZTIP17HighVolumeSpeaker" } } pointer_types { @@ -246,10 +246,10 @@ pointer_types { name: "float *" size: 8 alignment: 8 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" linker_set_key: "_ZTIPf" - self_type: "type-7" + self_type: "_ZTIPf" } } builtin_types { @@ -257,10 +257,10 @@ builtin_types { name: "float" size: 4 alignment: 4 - referenced_type: "type-3" + referenced_type: "_ZTIf" source_file: "" linker_set_key: "_ZTIf" - self_type: "type-3" + self_type: "_ZTIf" } is_unsigned: false is_integral: false @@ -270,10 +270,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true @@ -283,10 +283,10 @@ builtin_types { name: "unsigned int" size: 4 alignment: 4 - referenced_type: "type-6" + referenced_type: "_ZTIj" source_file: "" linker_set_key: "_ZTIj" - self_type: "type-6" + self_type: "_ZTIj" } is_unsigned: true is_integral: true @@ -296,27 +296,27 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-10" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-10" + self_type: "_ZTIv" } is_unsigned: false is_integral: false } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "SuperSpeaker::SpeakLouder" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" linker_set_key: "_ZN12SuperSpeaker11SpeakLouderEv" access: public_access } functions { - return_type: "type-9" + return_type: "_ZTIP12SuperSpeaker" function_name: "SuperSpeaker::CreateSuperSpeaker" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-2" + referenced_type: "_ZTIi" default_arg: false is_this_ptr: false } @@ -324,11 +324,11 @@ functions { access: public_access } functions { - return_type: "type-8" + return_type: "_ZTIN12SuperSpeaker6VolumeE" function_name: "SuperSpeaker::SpeakLoud" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" parameters { - referenced_type: "type-9" + referenced_type: "_ZTIP12SuperSpeaker" default_arg: false is_this_ptr: true } @@ -336,11 +336,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -348,11 +348,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "LowVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" parameters { - referenced_type: "type-4" + referenced_type: "_ZTIP16LowVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -360,16 +360,16 @@ functions { access: public_access } functions { - return_type: "type-12" + return_type: "_ZTIP17HighVolumeSpeaker" function_name: "HighVolumeSpeaker::BadPractice" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } parameters { - referenced_type: "type-3" + referenced_type: "_ZTIf" default_arg: false is_this_ptr: false } @@ -377,11 +377,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Speak" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } @@ -389,11 +389,11 @@ functions { access: public_access } functions { - return_type: "type-10" + return_type: "_ZTIv" function_name: "HighVolumeSpeaker::Listen" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" parameters { - referenced_type: "type-12" + referenced_type: "_ZTIP17HighVolumeSpeaker" default_arg: false is_this_ptr: true } diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libpure_virtual_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libpure_virtual_function.so.lsdump index 4346c971f..1660a6f1c 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libpure_virtual_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libpure_virtual_function.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "DerivedBar" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI10DerivedBar" - self_type: "type-4" + self_type: "_ZTI10DerivedBar" } base_specifiers { - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" is_virtual: false access: public_access } @@ -59,10 +59,10 @@ record_types { name: "PureVirtualBase" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTI15PureVirtualBase" - self_type: "type-1" + self_type: "_ZTI15PureVirtualBase" } vtable_layout { vtable_components { @@ -110,10 +110,10 @@ pointer_types { name: "DerivedBar *" size: 8 alignment: 8 - referenced_type: "type-4" + referenced_type: "_ZTI10DerivedBar" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP10DerivedBar" - self_type: "type-5" + self_type: "_ZTIP10DerivedBar" } } pointer_types { @@ -121,10 +121,10 @@ pointer_types { name: "PureVirtualBase *" size: 8 alignment: 8 - referenced_type: "type-1" + referenced_type: "_ZTI15PureVirtualBase" source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h" linker_set_key: "_ZTIP15PureVirtualBase" - self_type: "type-3" + self_type: "_ZTIP15PureVirtualBase" } } builtin_types { @@ -132,10 +132,10 @@ builtin_types { name: "void" size: 0 alignment: 0 - referenced_type: "type-2" + referenced_type: "_ZTIv" source_file: "" linker_set_key: "_ZTIv" - self_type: "type-2" + self_type: "_ZTIv" } is_unsigned: false is_integral: false diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libreproducability.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libreproducability.so.lsdump index 3d4a1481d..0f49dc421 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libreproducability.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libreproducability.so.lsdump @@ -3,13 +3,13 @@ record_types { name: "ShouldRepro" size: 4 alignment: 4 - referenced_type: "type-1" + referenced_type: "_ZTI11ShouldRepro" source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h" linker_set_key: "_ZTI11ShouldRepro" - self_type: "type-1" + self_type: "_ZTI11ShouldRepro" } fields { - referenced_type: "type-2" + referenced_type: "_ZTIi" field_offset: 0 field_name: "a" access: public_access @@ -22,10 +22,10 @@ builtin_types { name: "int" size: 4 alignment: 4 - referenced_type: "type-2" + referenced_type: "_ZTIi" source_file: "" linker_set_key: "_ZTIi" - self_type: "type-2" + self_type: "_ZTIi" } is_unsigned: false is_integral: true diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/undeclared_types.h.sdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/undeclared_types.h.sdump index 581ca8bf1..4b2e58a90 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/undeclared_types.h.sdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/undeclared_types.h.sdump @@ -13,10 +13,10 @@ "parameters" : [ { - "referenced_type" : "type-5" + "referenced_type" : "_ZTI10template_cIJ10template_dIJA_N11namespace_c1CEEEEE" } ], - "return_type" : "type-4", + "return_type" : "_ZTIRN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { @@ -27,13 +27,13 @@ [ { "is_this_ptr" : true, - "referenced_type" : "type-8" + "referenced_type" : "_ZTIP12InvalidClass" }, { - "referenced_type" : "type-9" + "referenced_type" : "_ZTI1E" } ], - "return_type" : "type-6", + "return_type" : "_ZTIN12InvalidClass1DE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -42,25 +42,25 @@ { "linker_set_key" : "a", "name" : "a", - "referenced_type" : "type-1", + "referenced_type" : "_ZTIN11namespace_a1AE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "b", "name" : "b", - "referenced_type" : "type-2", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "c", "name" : "c", - "referenced_type" : "type-3", + "referenced_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, { "linker_set_key" : "template_in_macro", "name" : "template_in_macro", - "referenced_type" : "type-11", + "referenced_type" : "_ZTIP15TemplateInMacroIJ1FEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ], @@ -70,8 +70,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIRN11namespace_a1AE", "name" : "namespace_a::A &", - "referenced_type" : "type-1", - "self_type" : "type-4", + "referenced_type" : "_ZTIN11namespace_a1AE", + "self_type" : "_ZTIRN11namespace_a1AE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -82,8 +82,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP12InvalidClass", "name" : "InvalidClass *", - "referenced_type" : "type-7", - "self_type" : "type-8", + "referenced_type" : "_ZTI12InvalidClass", + "self_type" : "_ZTIP12InvalidClass", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" }, @@ -91,8 +91,8 @@ "alignment" : 8, "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE", "name" : "TemplateInMacro *", - "referenced_type" : "type-10", - "self_type" : "type-11", + "referenced_type" : "_ZTI15TemplateInMacroIJ1FEE", + "self_type" : "_ZTIP15TemplateInMacroIJ1FEE", "size" : 8, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } @@ -103,8 +103,8 @@ "is_const" : true, "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "name" : "const namespace_b::template_b", - "referenced_type" : "type-2", - "self_type" : "type-3", + "referenced_type" : "_ZTIN11namespace_b10template_bIJPKNS_1BEEEE", + "self_type" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/header/undeclared_types.h" } ],