Merge "Reduce nested objects in JSON dump"

am: 6ce82f92a0

Change-Id: I4bc7dbe9b27f5579fb45d03f87fc4871bec7b2b0
This commit is contained in:
Hsin-Yi Chen
2018-09-18 23:30:48 -07:00
committed by android-build-merger
8 changed files with 1333 additions and 1681 deletions

View File

@@ -36,7 +36,7 @@ class JsonObject : public Json::Value {
class IRToJsonConverter { class IRToJsonConverter {
private: private:
static void AddTemplateInfo(JsonObject &type_decl, static void AddTemplateInfo(JsonObject &type_decl,
const abi_util::TemplatedArtifactIR *template_ir); const TemplatedArtifactIR *template_ir);
// BasicNamedAndTypedDecl // BasicNamedAndTypedDecl
static void AddTypeInfo(JsonObject &type_decl, const TypeIR *type_ir); static void AddTypeInfo(JsonObject &type_decl, const TypeIR *type_ir);
@@ -50,7 +50,7 @@ class IRToJsonConverter {
static void AddVTableLayout(JsonObject &record_type, static void AddVTableLayout(JsonObject &record_type,
const RecordTypeIR *record_ir); const RecordTypeIR *record_ir);
static void AddTagTypeInfo(JsonObject &tag_type, static void AddTagTypeInfo(JsonObject &type_decl,
const TagTypeIR *tag_type_ir); const TagTypeIR *tag_type_ir);
static void AddEnumFields(JsonObject &enum_type, const EnumTypeIR *enum_ir); static void AddEnumFields(JsonObject &enum_type, const EnumTypeIR *enum_ir);

View File

@@ -93,26 +93,23 @@ ElfSymbolBindingIRToJson(ElfSymbolIR::ElfSymbolBinding binding) {
} }
void IRToJsonConverter::AddTemplateInfo( void IRToJsonConverter::AddTemplateInfo(
JsonObject &type_decl, const abi_util::TemplatedArtifactIR *template_ir) { JsonObject &type_decl, const TemplatedArtifactIR *template_ir) {
Json::Value &elements = type_decl["template_info"]; Json::Value &args = type_decl["template_args"];
elements = JsonArray(); args = JsonArray();
for (auto &&template_element_ir : template_ir->GetTemplateElements()) { for (auto &&template_element_ir : template_ir->GetTemplateElements()) {
Json::Value &element = elements.append(JsonObject()); args.append(template_element_ir.GetReferencedType());
element["referenced_type"] = template_element_ir.GetReferencedType();
} }
} }
void IRToJsonConverter::AddTypeInfo(JsonObject &type_decl, void IRToJsonConverter::AddTypeInfo(JsonObject &type_decl,
const TypeIR *type_ir) { const TypeIR *type_ir) {
Json::Value &type_info = type_decl["type_info"]; type_decl["linker_set_key"] = type_ir->GetLinkerSetKey();
type_info = JsonObject(); type_decl["source_file"] = type_ir->GetSourceFile();
type_info["linker_set_key"] = type_ir->GetLinkerSetKey(); type_decl["name"] = type_ir->GetName();
type_info["source_file"] = type_ir->GetSourceFile(); type_decl["size"] = Json::UInt64(type_ir->GetSize());
type_info["name"] = type_ir->GetName(); type_decl["alignment"] = type_ir->GetAlignment();
type_info["size"] = Json::UInt64(type_ir->GetSize()); type_decl["referenced_type"] = type_ir->GetReferencedType();
type_info["alignment"] = type_ir->GetAlignment(); type_decl["self_type"] = type_ir->GetSelfType();
type_info["referenced_type"] = type_ir->GetReferencedType();
type_info["self_type"] = type_ir->GetSelfType();
} }
static JsonObject ConvertRecordFieldIR(const RecordFieldIR *record_field_ir) { static JsonObject ConvertRecordFieldIR(const RecordFieldIR *record_field_ir) {
@@ -152,33 +149,30 @@ void IRToJsonConverter::AddBaseSpecifiers(JsonObject &record_type,
} }
static JsonObject static JsonObject
ConvertVTableLayoutIR(const VTableLayoutIR &vtable_layout_ir) { ConvertVTableComponentIR(const VTableComponentIR &vtable_component_ir) {
JsonObject vtable_layout; JsonObject vtable_component;
Json::Value &vtable_components = vtable_layout["vtable_components"]; vtable_component["kind"] =
vtable_components = JsonArray(); VTableComponentKindIRToJson(vtable_component_ir.GetKind());
for (auto &&vtable_component_ir : vtable_layout_ir.GetVTableComponents()) { vtable_component["component_value"] =
Json::Value &vtable_component = vtable_components.append(JsonObject()); Json::Int64(vtable_component_ir.GetValue());
vtable_component["kind"] = vtable_component["mangled_component_name"] = vtable_component_ir.GetName();
VTableComponentKindIRToJson(vtable_component_ir.GetKind()); vtable_component["is_pure"] = vtable_component_ir.GetIsPure();
vtable_component["component_value"] = return vtable_component;
Json::Int64(vtable_component_ir.GetValue());
vtable_component["mangled_component_name"] = vtable_component_ir.GetName();
vtable_component["is_pure"] = vtable_component_ir.GetIsPure();
}
return vtable_layout;
} }
void IRToJsonConverter::AddVTableLayout(JsonObject &record_type, void IRToJsonConverter::AddVTableLayout(JsonObject &record_type,
const RecordTypeIR *record_ir) { const RecordTypeIR *record_ir) {
const VTableLayoutIR &vtable_layout_ir = record_ir->GetVTableLayout(); Json::Value &vtable_components = record_type["vtable_components"];
record_type["vtable_layout"] = ConvertVTableLayoutIR(vtable_layout_ir); vtable_components = JsonArray();
for (auto &&vtable_component_ir :
record_ir->GetVTableLayout().GetVTableComponents()) {
vtable_components.append(ConvertVTableComponentIR(vtable_component_ir));
}
} }
void IRToJsonConverter::AddTagTypeInfo(JsonObject &record_type, void IRToJsonConverter::AddTagTypeInfo(JsonObject &type_decl,
const abi_util::TagTypeIR *tag_type_ir) { const TagTypeIR *tag_type_ir) {
Json::Value &tag_type = record_type["tag_info"]; type_decl["unique_id"] = tag_type_ir->GetUniqueId();
tag_type = JsonObject();
tag_type["unique_id"] = tag_type_ir->GetUniqueId();
} }
JsonObject IRToJsonConverter::ConvertRecordTypeIR(const RecordTypeIR *recordp) { JsonObject IRToJsonConverter::ConvertRecordTypeIR(const RecordTypeIR *recordp) {

View File

@@ -3,60 +3,48 @@
"builtin_types" : "builtin_types" :
[ [
{ {
"alignment" : 4,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "float",
{ "name" : "float",
"alignment" : 4, "referenced_type" : "type-3",
"linker_set_key" : "float", "self_type" : "type-3",
"name" : "float", "size" : 4,
"referenced_type" : "type-3", "source_file" : ""
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "int",
{ "name" : "int",
"alignment" : 4, "referenced_type" : "type-2",
"linker_set_key" : "int", "self_type" : "type-2",
"name" : "int", "size" : 4,
"referenced_type" : "type-2", "source_file" : ""
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : true, "is_unsigned" : true,
"type_info" : "linker_set_key" : "unsigned int",
{ "name" : "unsigned int",
"alignment" : 4, "referenced_type" : "type-6",
"linker_set_key" : "unsigned int", "self_type" : "type-6",
"name" : "unsigned int", "size" : 4,
"referenced_type" : "type-6", "source_file" : ""
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 0,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "void",
{ "name" : "void",
"alignment" : 0, "referenced_type" : "type-10",
"linker_set_key" : "void", "self_type" : "type-10",
"name" : "void", "size" : 0,
"referenced_type" : "type-10", "source_file" : ""
"self_type" : "type-10",
"size" : 0,
"source_file" : ""
}
} }
], ],
"elf_functions" : "elf_functions" :
@@ -117,6 +105,7 @@
[ [
{ {
"access" : "private", "access" : "private",
"alignment" : 4,
"enum_fields" : "enum_fields" :
[ [
{ {
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower" "name" : "SuperSpeaker::Volume::Lower"
} }
], ],
"tag_info" : "linker_set_key" : "SuperSpeaker::Volume",
{ "name" : "SuperSpeaker::Volume",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE" "referenced_type" : "type-8",
}, "self_type" : "type-8",
"type_info" : "size" : 4,
{ "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"alignment" : 4, "underlying_type" : "type-6",
"linker_set_key" : "SuperSpeaker::Volume", "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
"name" : "SuperSpeaker::Volume",
"referenced_type" : "type-8",
"self_type" : "type-8",
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"underlying_type" : "type-6"
} }
], ],
"function_types" : [], "function_types" : [],
@@ -170,7 +152,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -186,7 +168,7 @@
], ],
"return_type" : "type-9", "return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -202,7 +184,7 @@
], ],
"return_type" : "type-8", "return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -218,7 +200,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -234,7 +216,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -255,7 +237,7 @@
], ],
"return_type" : "type-12", "return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -271,7 +253,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -287,7 +269,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
} }
], ],
"global_vars" : [], "global_vars" : [],
@@ -295,52 +277,40 @@
"pointer_types" : "pointer_types" :
[ [
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "SuperSpeaker *",
"alignment" : 4, "name" : "SuperSpeaker *",
"linker_set_key" : "SuperSpeaker *", "referenced_type" : "type-1",
"name" : "SuperSpeaker *", "self_type" : "type-9",
"referenced_type" : "type-1", "size" : 4,
"self_type" : "type-9", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "HighVolumeSpeaker *",
"alignment" : 4, "name" : "HighVolumeSpeaker *",
"linker_set_key" : "HighVolumeSpeaker *", "referenced_type" : "type-11",
"name" : "HighVolumeSpeaker *", "self_type" : "type-12",
"referenced_type" : "type-11", "size" : 4,
"self_type" : "type-12", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "float *",
"alignment" : 4, "name" : "float *",
"linker_set_key" : "float *", "referenced_type" : "type-3",
"name" : "float *", "self_type" : "type-7",
"referenced_type" : "type-3", "size" : 4,
"self_type" : "type-7", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "LowVolumeSpeaker *",
"alignment" : 4, "name" : "LowVolumeSpeaker *",
"linker_set_key" : "LowVolumeSpeaker *", "referenced_type" : "type-5",
"name" : "LowVolumeSpeaker *", "self_type" : "type-4",
"referenced_type" : "type-5", "size" : 4,
"self_type" : "type-4", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
} }
], ],
"qualified_types" : [], "qualified_types" : [],
@@ -348,6 +318,7 @@
[ [
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : [], "base_specifiers" : [],
"fields" : "fields" :
[ [
@@ -359,67 +330,58 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-1",
{ "self_type" : "type-1",
"unique_id" : "_ZTS12SuperSpeaker" "size" : 8,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS12SuperSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "SuperSpeaker", {
"name" : "SuperSpeaker", "component_value" : 0,
"referenced_type" : "type-1", "is_pure" : false,
"self_type" : "type-1", "kind" : "offset_to_top",
"size" : 8, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI12SuperSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : true,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : true,
"mangled_component_name" : "_ZTI12SuperSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -430,67 +392,58 @@
], ],
"fields" : [], "fields" : [],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-11",
{ "self_type" : "type-11",
"unique_id" : "_ZTS17HighVolumeSpeaker" "size" : 8,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS17HighVolumeSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "HighVolumeSpeaker", {
"name" : "HighVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-11", "is_pure" : false,
"self_type" : "type-11", "kind" : "offset_to_top",
"size" : 8, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI17HighVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -515,64 +468,54 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-5",
{ "self_type" : "type-5",
"unique_id" : "_ZTS16LowVolumeSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS16LowVolumeSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "LowVolumeSpeaker", {
"name" : "LowVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-5", "is_pure" : false,
"self_type" : "type-5", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI16LowVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
}
]
}
} }
], ],
"rvalue_reference_types" : [] "rvalue_reference_types" : []

View File

@@ -3,60 +3,48 @@
"builtin_types" : "builtin_types" :
[ [
{ {
"alignment" : 4,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "float",
{ "name" : "float",
"alignment" : 4, "referenced_type" : "type-3",
"linker_set_key" : "float", "self_type" : "type-3",
"name" : "float", "size" : 4,
"referenced_type" : "type-3", "source_file" : ""
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "int",
{ "name" : "int",
"alignment" : 4, "referenced_type" : "type-2",
"linker_set_key" : "int", "self_type" : "type-2",
"name" : "int", "size" : 4,
"referenced_type" : "type-2", "source_file" : ""
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : true, "is_unsigned" : true,
"type_info" : "linker_set_key" : "unsigned int",
{ "name" : "unsigned int",
"alignment" : 4, "referenced_type" : "type-6",
"linker_set_key" : "unsigned int", "self_type" : "type-6",
"name" : "unsigned int", "size" : 4,
"referenced_type" : "type-6", "source_file" : ""
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 0,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "void",
{ "name" : "void",
"alignment" : 0, "referenced_type" : "type-10",
"linker_set_key" : "void", "self_type" : "type-10",
"name" : "void", "size" : 0,
"referenced_type" : "type-10", "source_file" : ""
"self_type" : "type-10",
"size" : 0,
"source_file" : ""
}
} }
], ],
"elf_functions" : "elf_functions" :
@@ -117,6 +105,7 @@
[ [
{ {
"access" : "private", "access" : "private",
"alignment" : 4,
"enum_fields" : "enum_fields" :
[ [
{ {
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower" "name" : "SuperSpeaker::Volume::Lower"
} }
], ],
"tag_info" : "linker_set_key" : "SuperSpeaker::Volume",
{ "name" : "SuperSpeaker::Volume",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE" "referenced_type" : "type-8",
}, "self_type" : "type-8",
"type_info" : "size" : 4,
{ "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"alignment" : 4, "underlying_type" : "type-6",
"linker_set_key" : "SuperSpeaker::Volume", "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
"name" : "SuperSpeaker::Volume",
"referenced_type" : "type-8",
"self_type" : "type-8",
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"underlying_type" : "type-6"
} }
], ],
"function_types" : [], "function_types" : [],
@@ -170,7 +152,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -186,7 +168,7 @@
], ],
"return_type" : "type-9", "return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -202,7 +184,7 @@
], ],
"return_type" : "type-8", "return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -218,7 +200,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -234,7 +216,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -255,7 +237,7 @@
], ],
"return_type" : "type-12", "return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -271,7 +253,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -287,7 +269,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
} }
], ],
"global_vars" : [], "global_vars" : [],
@@ -295,52 +277,40 @@
"pointer_types" : "pointer_types" :
[ [
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "SuperSpeaker *",
"alignment" : 8, "name" : "SuperSpeaker *",
"linker_set_key" : "SuperSpeaker *", "referenced_type" : "type-1",
"name" : "SuperSpeaker *", "self_type" : "type-9",
"referenced_type" : "type-1", "size" : 8,
"self_type" : "type-9", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "HighVolumeSpeaker *",
"alignment" : 8, "name" : "HighVolumeSpeaker *",
"linker_set_key" : "HighVolumeSpeaker *", "referenced_type" : "type-11",
"name" : "HighVolumeSpeaker *", "self_type" : "type-12",
"referenced_type" : "type-11", "size" : 8,
"self_type" : "type-12", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "float *",
"alignment" : 8, "name" : "float *",
"linker_set_key" : "float *", "referenced_type" : "type-3",
"name" : "float *", "self_type" : "type-7",
"referenced_type" : "type-3", "size" : 8,
"self_type" : "type-7", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "LowVolumeSpeaker *",
"alignment" : 8, "name" : "LowVolumeSpeaker *",
"linker_set_key" : "LowVolumeSpeaker *", "referenced_type" : "type-5",
"name" : "LowVolumeSpeaker *", "self_type" : "type-4",
"referenced_type" : "type-5", "size" : 8,
"self_type" : "type-4", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
} }
], ],
"qualified_types" : [], "qualified_types" : [],
@@ -348,6 +318,7 @@
[ [
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : [], "base_specifiers" : [],
"fields" : "fields" :
[ [
@@ -359,67 +330,58 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-1",
{ "self_type" : "type-1",
"unique_id" : "_ZTS12SuperSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS12SuperSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "SuperSpeaker", {
"name" : "SuperSpeaker", "component_value" : 0,
"referenced_type" : "type-1", "is_pure" : false,
"self_type" : "type-1", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI12SuperSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : true,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : true,
"mangled_component_name" : "_ZTI12SuperSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -430,67 +392,58 @@
], ],
"fields" : [], "fields" : [],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-11",
{ "self_type" : "type-11",
"unique_id" : "_ZTS17HighVolumeSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS17HighVolumeSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "HighVolumeSpeaker", {
"name" : "HighVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-11", "is_pure" : false,
"self_type" : "type-11", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI17HighVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -515,64 +468,54 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-5",
{ "self_type" : "type-5",
"unique_id" : "_ZTS16LowVolumeSpeaker" "size" : 24,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS16LowVolumeSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "LowVolumeSpeaker", {
"name" : "LowVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-5", "is_pure" : false,
"self_type" : "type-5", "kind" : "offset_to_top",
"size" : 24, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI16LowVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
}
]
}
} }
], ],
"rvalue_reference_types" : [] "rvalue_reference_types" : []

View File

@@ -3,60 +3,48 @@
"builtin_types" : "builtin_types" :
[ [
{ {
"alignment" : 4,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "float",
{ "name" : "float",
"alignment" : 4, "referenced_type" : "type-3",
"linker_set_key" : "float", "self_type" : "type-3",
"name" : "float", "size" : 4,
"referenced_type" : "type-3", "source_file" : ""
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "int",
{ "name" : "int",
"alignment" : 4, "referenced_type" : "type-2",
"linker_set_key" : "int", "self_type" : "type-2",
"name" : "int", "size" : 4,
"referenced_type" : "type-2", "source_file" : ""
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : true, "is_unsigned" : true,
"type_info" : "linker_set_key" : "unsigned int",
{ "name" : "unsigned int",
"alignment" : 4, "referenced_type" : "type-6",
"linker_set_key" : "unsigned int", "self_type" : "type-6",
"name" : "unsigned int", "size" : 4,
"referenced_type" : "type-6", "source_file" : ""
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 0,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "void",
{ "name" : "void",
"alignment" : 0, "referenced_type" : "type-10",
"linker_set_key" : "void", "self_type" : "type-10",
"name" : "void", "size" : 0,
"referenced_type" : "type-10", "source_file" : ""
"self_type" : "type-10",
"size" : 0,
"source_file" : ""
}
} }
], ],
"elf_functions" : "elf_functions" :
@@ -117,6 +105,7 @@
[ [
{ {
"access" : "private", "access" : "private",
"alignment" : 4,
"enum_fields" : "enum_fields" :
[ [
{ {
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower" "name" : "SuperSpeaker::Volume::Lower"
} }
], ],
"tag_info" : "linker_set_key" : "SuperSpeaker::Volume",
{ "name" : "SuperSpeaker::Volume",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE" "referenced_type" : "type-8",
}, "self_type" : "type-8",
"type_info" : "size" : 4,
{ "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"alignment" : 4, "underlying_type" : "type-6",
"linker_set_key" : "SuperSpeaker::Volume", "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
"name" : "SuperSpeaker::Volume",
"referenced_type" : "type-8",
"self_type" : "type-8",
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"underlying_type" : "type-6"
} }
], ],
"function_types" : [], "function_types" : [],
@@ -170,7 +152,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -186,7 +168,7 @@
], ],
"return_type" : "type-9", "return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -202,7 +184,7 @@
], ],
"return_type" : "type-8", "return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -218,7 +200,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -234,7 +216,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -255,7 +237,7 @@
], ],
"return_type" : "type-12", "return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -271,7 +253,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -287,7 +269,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
} }
], ],
"global_vars" : [], "global_vars" : [],
@@ -295,52 +277,40 @@
"pointer_types" : "pointer_types" :
[ [
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "SuperSpeaker *",
"alignment" : 4, "name" : "SuperSpeaker *",
"linker_set_key" : "SuperSpeaker *", "referenced_type" : "type-1",
"name" : "SuperSpeaker *", "self_type" : "type-9",
"referenced_type" : "type-1", "size" : 4,
"self_type" : "type-9", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "HighVolumeSpeaker *",
"alignment" : 4, "name" : "HighVolumeSpeaker *",
"linker_set_key" : "HighVolumeSpeaker *", "referenced_type" : "type-11",
"name" : "HighVolumeSpeaker *", "self_type" : "type-12",
"referenced_type" : "type-11", "size" : 4,
"self_type" : "type-12", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "float *",
"alignment" : 4, "name" : "float *",
"linker_set_key" : "float *", "referenced_type" : "type-3",
"name" : "float *", "self_type" : "type-7",
"referenced_type" : "type-3", "size" : 4,
"self_type" : "type-7", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "LowVolumeSpeaker *",
"alignment" : 4, "name" : "LowVolumeSpeaker *",
"linker_set_key" : "LowVolumeSpeaker *", "referenced_type" : "type-5",
"name" : "LowVolumeSpeaker *", "self_type" : "type-4",
"referenced_type" : "type-5", "size" : 4,
"self_type" : "type-4", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
} }
], ],
"qualified_types" : [], "qualified_types" : [],
@@ -348,6 +318,7 @@
[ [
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : [], "base_specifiers" : [],
"fields" : "fields" :
[ [
@@ -359,67 +330,58 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-1",
{ "self_type" : "type-1",
"unique_id" : "_ZTS12SuperSpeaker" "size" : 8,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS12SuperSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "SuperSpeaker", {
"name" : "SuperSpeaker", "component_value" : 0,
"referenced_type" : "type-1", "is_pure" : false,
"self_type" : "type-1", "kind" : "offset_to_top",
"size" : 8, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI12SuperSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : true,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : true,
"mangled_component_name" : "_ZTI12SuperSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -430,67 +392,58 @@
], ],
"fields" : [], "fields" : [],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-11",
{ "self_type" : "type-11",
"unique_id" : "_ZTS17HighVolumeSpeaker" "size" : 8,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS17HighVolumeSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "HighVolumeSpeaker", {
"name" : "HighVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-11", "is_pure" : false,
"self_type" : "type-11", "kind" : "offset_to_top",
"size" : 8, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI17HighVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -515,64 +468,54 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-5",
{ "self_type" : "type-5",
"unique_id" : "_ZTS16LowVolumeSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS16LowVolumeSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "LowVolumeSpeaker", {
"name" : "LowVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-5", "is_pure" : false,
"self_type" : "type-5", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI16LowVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
}
]
}
} }
], ],
"rvalue_reference_types" : [] "rvalue_reference_types" : []

View File

@@ -3,60 +3,48 @@
"builtin_types" : "builtin_types" :
[ [
{ {
"alignment" : 4,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "float",
{ "name" : "float",
"alignment" : 4, "referenced_type" : "type-3",
"linker_set_key" : "float", "self_type" : "type-3",
"name" : "float", "size" : 4,
"referenced_type" : "type-3", "source_file" : ""
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "int",
{ "name" : "int",
"alignment" : 4, "referenced_type" : "type-2",
"linker_set_key" : "int", "self_type" : "type-2",
"name" : "int", "size" : 4,
"referenced_type" : "type-2", "source_file" : ""
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : true, "is_unsigned" : true,
"type_info" : "linker_set_key" : "unsigned int",
{ "name" : "unsigned int",
"alignment" : 4, "referenced_type" : "type-6",
"linker_set_key" : "unsigned int", "self_type" : "type-6",
"name" : "unsigned int", "size" : 4,
"referenced_type" : "type-6", "source_file" : ""
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 0,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "void",
{ "name" : "void",
"alignment" : 0, "referenced_type" : "type-10",
"linker_set_key" : "void", "self_type" : "type-10",
"name" : "void", "size" : 0,
"referenced_type" : "type-10", "source_file" : ""
"self_type" : "type-10",
"size" : 0,
"source_file" : ""
}
} }
], ],
"elf_functions" : "elf_functions" :
@@ -117,6 +105,7 @@
[ [
{ {
"access" : "private", "access" : "private",
"alignment" : 4,
"enum_fields" : "enum_fields" :
[ [
{ {
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower" "name" : "SuperSpeaker::Volume::Lower"
} }
], ],
"tag_info" : "linker_set_key" : "SuperSpeaker::Volume",
{ "name" : "SuperSpeaker::Volume",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE" "referenced_type" : "type-8",
}, "self_type" : "type-8",
"type_info" : "size" : 4,
{ "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"alignment" : 4, "underlying_type" : "type-6",
"linker_set_key" : "SuperSpeaker::Volume", "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
"name" : "SuperSpeaker::Volume",
"referenced_type" : "type-8",
"self_type" : "type-8",
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"underlying_type" : "type-6"
} }
], ],
"function_types" : [], "function_types" : [],
@@ -170,7 +152,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -186,7 +168,7 @@
], ],
"return_type" : "type-9", "return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -202,7 +184,7 @@
], ],
"return_type" : "type-8", "return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -218,7 +200,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -234,7 +216,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -255,7 +237,7 @@
], ],
"return_type" : "type-12", "return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -271,7 +253,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -287,7 +269,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
} }
], ],
"global_vars" : [], "global_vars" : [],
@@ -295,52 +277,40 @@
"pointer_types" : "pointer_types" :
[ [
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "SuperSpeaker *",
"alignment" : 8, "name" : "SuperSpeaker *",
"linker_set_key" : "SuperSpeaker *", "referenced_type" : "type-1",
"name" : "SuperSpeaker *", "self_type" : "type-9",
"referenced_type" : "type-1", "size" : 8,
"self_type" : "type-9", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "HighVolumeSpeaker *",
"alignment" : 8, "name" : "HighVolumeSpeaker *",
"linker_set_key" : "HighVolumeSpeaker *", "referenced_type" : "type-11",
"name" : "HighVolumeSpeaker *", "self_type" : "type-12",
"referenced_type" : "type-11", "size" : 8,
"self_type" : "type-12", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "float *",
"alignment" : 8, "name" : "float *",
"linker_set_key" : "float *", "referenced_type" : "type-3",
"name" : "float *", "self_type" : "type-7",
"referenced_type" : "type-3", "size" : 8,
"self_type" : "type-7", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "LowVolumeSpeaker *",
"alignment" : 8, "name" : "LowVolumeSpeaker *",
"linker_set_key" : "LowVolumeSpeaker *", "referenced_type" : "type-5",
"name" : "LowVolumeSpeaker *", "self_type" : "type-4",
"referenced_type" : "type-5", "size" : 8,
"self_type" : "type-4", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
} }
], ],
"qualified_types" : [], "qualified_types" : [],
@@ -348,6 +318,7 @@
[ [
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : [], "base_specifiers" : [],
"fields" : "fields" :
[ [
@@ -359,67 +330,58 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-1",
{ "self_type" : "type-1",
"unique_id" : "_ZTS12SuperSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS12SuperSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "SuperSpeaker", {
"name" : "SuperSpeaker", "component_value" : 0,
"referenced_type" : "type-1", "is_pure" : false,
"self_type" : "type-1", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI12SuperSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : true,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : true,
"mangled_component_name" : "_ZTI12SuperSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -430,67 +392,58 @@
], ],
"fields" : [], "fields" : [],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-11",
{ "self_type" : "type-11",
"unique_id" : "_ZTS17HighVolumeSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS17HighVolumeSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "HighVolumeSpeaker", {
"name" : "HighVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-11", "is_pure" : false,
"self_type" : "type-11", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI17HighVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -515,64 +468,54 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-5",
{ "self_type" : "type-5",
"unique_id" : "_ZTS16LowVolumeSpeaker" "size" : 24,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS16LowVolumeSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "LowVolumeSpeaker", {
"name" : "LowVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-5", "is_pure" : false,
"self_type" : "type-5", "kind" : "offset_to_top",
"size" : 24, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI16LowVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
}
]
}
} }
], ],
"rvalue_reference_types" : [] "rvalue_reference_types" : []

View File

@@ -3,60 +3,48 @@
"builtin_types" : "builtin_types" :
[ [
{ {
"alignment" : 4,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "float",
{ "name" : "float",
"alignment" : 4, "referenced_type" : "type-3",
"linker_set_key" : "float", "self_type" : "type-3",
"name" : "float", "size" : 4,
"referenced_type" : "type-3", "source_file" : ""
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "int",
{ "name" : "int",
"alignment" : 4, "referenced_type" : "type-2",
"linker_set_key" : "int", "self_type" : "type-2",
"name" : "int", "size" : 4,
"referenced_type" : "type-2", "source_file" : ""
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : true, "is_unsigned" : true,
"type_info" : "linker_set_key" : "unsigned int",
{ "name" : "unsigned int",
"alignment" : 4, "referenced_type" : "type-6",
"linker_set_key" : "unsigned int", "self_type" : "type-6",
"name" : "unsigned int", "size" : 4,
"referenced_type" : "type-6", "source_file" : ""
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 0,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "void",
{ "name" : "void",
"alignment" : 0, "referenced_type" : "type-10",
"linker_set_key" : "void", "self_type" : "type-10",
"name" : "void", "size" : 0,
"referenced_type" : "type-10", "source_file" : ""
"self_type" : "type-10",
"size" : 0,
"source_file" : ""
}
} }
], ],
"elf_functions" : "elf_functions" :
@@ -117,6 +105,7 @@
[ [
{ {
"access" : "private", "access" : "private",
"alignment" : 4,
"enum_fields" : "enum_fields" :
[ [
{ {
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower" "name" : "SuperSpeaker::Volume::Lower"
} }
], ],
"tag_info" : "linker_set_key" : "SuperSpeaker::Volume",
{ "name" : "SuperSpeaker::Volume",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE" "referenced_type" : "type-8",
}, "self_type" : "type-8",
"type_info" : "size" : 4,
{ "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"alignment" : 4, "underlying_type" : "type-6",
"linker_set_key" : "SuperSpeaker::Volume", "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
"name" : "SuperSpeaker::Volume",
"referenced_type" : "type-8",
"self_type" : "type-8",
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"underlying_type" : "type-6"
} }
], ],
"function_types" : [], "function_types" : [],
@@ -170,7 +152,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -186,7 +168,7 @@
], ],
"return_type" : "type-9", "return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -202,7 +184,7 @@
], ],
"return_type" : "type-8", "return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -218,7 +200,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -234,7 +216,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -255,7 +237,7 @@
], ],
"return_type" : "type-12", "return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -271,7 +253,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -287,7 +269,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
} }
], ],
"global_vars" : [], "global_vars" : [],
@@ -295,52 +277,40 @@
"pointer_types" : "pointer_types" :
[ [
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "SuperSpeaker *",
"alignment" : 4, "name" : "SuperSpeaker *",
"linker_set_key" : "SuperSpeaker *", "referenced_type" : "type-1",
"name" : "SuperSpeaker *", "self_type" : "type-9",
"referenced_type" : "type-1", "size" : 4,
"self_type" : "type-9", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "HighVolumeSpeaker *",
"alignment" : 4, "name" : "HighVolumeSpeaker *",
"linker_set_key" : "HighVolumeSpeaker *", "referenced_type" : "type-11",
"name" : "HighVolumeSpeaker *", "self_type" : "type-12",
"referenced_type" : "type-11", "size" : 4,
"self_type" : "type-12", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "float *",
"alignment" : 4, "name" : "float *",
"linker_set_key" : "float *", "referenced_type" : "type-3",
"name" : "float *", "self_type" : "type-7",
"referenced_type" : "type-3", "size" : 4,
"self_type" : "type-7", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 4,
{ "linker_set_key" : "LowVolumeSpeaker *",
"alignment" : 4, "name" : "LowVolumeSpeaker *",
"linker_set_key" : "LowVolumeSpeaker *", "referenced_type" : "type-5",
"name" : "LowVolumeSpeaker *", "self_type" : "type-4",
"referenced_type" : "type-5", "size" : 4,
"self_type" : "type-4", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
} }
], ],
"qualified_types" : [], "qualified_types" : [],
@@ -348,6 +318,7 @@
[ [
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : [], "base_specifiers" : [],
"fields" : "fields" :
[ [
@@ -359,67 +330,58 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-1",
{ "self_type" : "type-1",
"unique_id" : "_ZTS12SuperSpeaker" "size" : 8,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS12SuperSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "SuperSpeaker", {
"name" : "SuperSpeaker", "component_value" : 0,
"referenced_type" : "type-1", "is_pure" : false,
"self_type" : "type-1", "kind" : "offset_to_top",
"size" : 8, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI12SuperSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : true,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : true,
"mangled_component_name" : "_ZTI12SuperSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -430,67 +392,58 @@
], ],
"fields" : [], "fields" : [],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-11",
{ "self_type" : "type-11",
"unique_id" : "_ZTS17HighVolumeSpeaker" "size" : 8,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS17HighVolumeSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "HighVolumeSpeaker", {
"name" : "HighVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-11", "is_pure" : false,
"self_type" : "type-11", "kind" : "offset_to_top",
"size" : 8, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI17HighVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 4,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -515,64 +468,54 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-5",
{ "self_type" : "type-5",
"unique_id" : "_ZTS16LowVolumeSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS16LowVolumeSpeaker",
{ "vtable_components" :
"alignment" : 4, [
"linker_set_key" : "LowVolumeSpeaker", {
"name" : "LowVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-5", "is_pure" : false,
"self_type" : "type-5", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI16LowVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
}
]
}
} }
], ],
"rvalue_reference_types" : [] "rvalue_reference_types" : []

View File

@@ -3,60 +3,48 @@
"builtin_types" : "builtin_types" :
[ [
{ {
"alignment" : 4,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "float",
{ "name" : "float",
"alignment" : 4, "referenced_type" : "type-3",
"linker_set_key" : "float", "self_type" : "type-3",
"name" : "float", "size" : 4,
"referenced_type" : "type-3", "source_file" : ""
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "int",
{ "name" : "int",
"alignment" : 4, "referenced_type" : "type-2",
"linker_set_key" : "int", "self_type" : "type-2",
"name" : "int", "size" : 4,
"referenced_type" : "type-2", "source_file" : ""
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 4,
"is_integral" : true, "is_integral" : true,
"is_unsigned" : true, "is_unsigned" : true,
"type_info" : "linker_set_key" : "unsigned int",
{ "name" : "unsigned int",
"alignment" : 4, "referenced_type" : "type-6",
"linker_set_key" : "unsigned int", "self_type" : "type-6",
"name" : "unsigned int", "size" : 4,
"referenced_type" : "type-6", "source_file" : ""
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
}, },
{ {
"alignment" : 0,
"is_integral" : false, "is_integral" : false,
"is_unsigned" : false, "is_unsigned" : false,
"type_info" : "linker_set_key" : "void",
{ "name" : "void",
"alignment" : 0, "referenced_type" : "type-10",
"linker_set_key" : "void", "self_type" : "type-10",
"name" : "void", "size" : 0,
"referenced_type" : "type-10", "source_file" : ""
"self_type" : "type-10",
"size" : 0,
"source_file" : ""
}
} }
], ],
"elf_functions" : "elf_functions" :
@@ -117,6 +105,7 @@
[ [
{ {
"access" : "private", "access" : "private",
"alignment" : 4,
"enum_fields" : "enum_fields" :
[ [
{ {
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower" "name" : "SuperSpeaker::Volume::Lower"
} }
], ],
"tag_info" : "linker_set_key" : "SuperSpeaker::Volume",
{ "name" : "SuperSpeaker::Volume",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE" "referenced_type" : "type-8",
}, "self_type" : "type-8",
"type_info" : "size" : 4,
{ "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"alignment" : 4, "underlying_type" : "type-6",
"linker_set_key" : "SuperSpeaker::Volume", "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
"name" : "SuperSpeaker::Volume",
"referenced_type" : "type-8",
"self_type" : "type-8",
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"underlying_type" : "type-6"
} }
], ],
"function_types" : [], "function_types" : [],
@@ -170,7 +152,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -186,7 +168,7 @@
], ],
"return_type" : "type-9", "return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -202,7 +184,7 @@
], ],
"return_type" : "type-8", "return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -218,7 +200,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -234,7 +216,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -255,7 +237,7 @@
], ],
"return_type" : "type-12", "return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -271,7 +253,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
}, },
{ {
"access" : "public", "access" : "public",
@@ -287,7 +269,7 @@
], ],
"return_type" : "type-10", "return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [] "template_args" : []
} }
], ],
"global_vars" : [], "global_vars" : [],
@@ -295,52 +277,40 @@
"pointer_types" : "pointer_types" :
[ [
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "SuperSpeaker *",
"alignment" : 8, "name" : "SuperSpeaker *",
"linker_set_key" : "SuperSpeaker *", "referenced_type" : "type-1",
"name" : "SuperSpeaker *", "self_type" : "type-9",
"referenced_type" : "type-1", "size" : 8,
"self_type" : "type-9", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "HighVolumeSpeaker *",
"alignment" : 8, "name" : "HighVolumeSpeaker *",
"linker_set_key" : "HighVolumeSpeaker *", "referenced_type" : "type-11",
"name" : "HighVolumeSpeaker *", "self_type" : "type-12",
"referenced_type" : "type-11", "size" : 8,
"self_type" : "type-12", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "float *",
"alignment" : 8, "name" : "float *",
"linker_set_key" : "float *", "referenced_type" : "type-3",
"name" : "float *", "self_type" : "type-7",
"referenced_type" : "type-3", "size" : 8,
"self_type" : "type-7", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}, },
{ {
"type_info" : "alignment" : 8,
{ "linker_set_key" : "LowVolumeSpeaker *",
"alignment" : 8, "name" : "LowVolumeSpeaker *",
"linker_set_key" : "LowVolumeSpeaker *", "referenced_type" : "type-5",
"name" : "LowVolumeSpeaker *", "self_type" : "type-4",
"referenced_type" : "type-5", "size" : 8,
"self_type" : "type-4", "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
} }
], ],
"qualified_types" : [], "qualified_types" : [],
@@ -348,6 +318,7 @@
[ [
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : [], "base_specifiers" : [],
"fields" : "fields" :
[ [
@@ -359,67 +330,58 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-1",
{ "self_type" : "type-1",
"unique_id" : "_ZTS12SuperSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS12SuperSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "SuperSpeaker", {
"name" : "SuperSpeaker", "component_value" : 0,
"referenced_type" : "type-1", "is_pure" : false,
"self_type" : "type-1", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI12SuperSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : true,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : true,
"mangled_component_name" : "_ZTI12SuperSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : true, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN12SuperSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -430,67 +392,58 @@
], ],
"fields" : [], "fields" : [],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-11",
{ "self_type" : "type-11",
"unique_id" : "_ZTS17HighVolumeSpeaker" "size" : 16,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS17HighVolumeSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "HighVolumeSpeaker", {
"name" : "HighVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-11", "is_pure" : false,
"self_type" : "type-11", "kind" : "offset_to_top",
"size" : 16, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI17HighVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
}, },
{ {
"access" : "public", "access" : "public",
"alignment" : 8,
"base_specifiers" : "base_specifiers" :
[ [
{ {
@@ -515,64 +468,54 @@
} }
], ],
"is_anonymous" : false, "is_anonymous" : false,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class", "record_kind" : "class",
"tag_info" : "referenced_type" : "type-5",
{ "self_type" : "type-5",
"unique_id" : "_ZTS16LowVolumeSpeaker" "size" : 24,
}, "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : [], "template_args" : [],
"type_info" : "unique_id" : "_ZTS16LowVolumeSpeaker",
{ "vtable_components" :
"alignment" : 8, [
"linker_set_key" : "LowVolumeSpeaker", {
"name" : "LowVolumeSpeaker", "component_value" : 0,
"referenced_type" : "type-5", "is_pure" : false,
"self_type" : "type-5", "kind" : "offset_to_top",
"size" : 24, "mangled_component_name" : ""
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" },
}, {
"vtable_layout" : "component_value" : 0,
{ "is_pure" : false,
"vtable_components" : "kind" : "rtti",
[ "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "offset_to_top", "is_pure" : false,
"mangled_component_name" : "" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "rtti", "is_pure" : false,
"mangled_component_name" : "_ZTI16LowVolumeSpeaker" "kind" : "function_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv" "kind" : "complete_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
{ },
"component_value" : 0, {
"is_pure" : false, "component_value" : 0,
"kind" : "function_pointer", "is_pure" : false,
"mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv" "kind" : "deleting_dtor_pointer",
}, "mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
{ }
"component_value" : 0, ]
"is_pure" : false,
"kind" : "complete_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
},
{
"component_value" : 0,
"is_pure" : false,
"kind" : "deleting_dtor_pointer",
"mangled_component_name" : "_ZN16LowVolumeSpeakerD0Ev"
}
]
}
} }
], ],
"rvalue_reference_types" : [] "rvalue_reference_types" : []