LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Reduce nested objects in JSON dump"

Browse Source
This commit is contained in:
Hsin-Yi Chen
2018-09-19 06:23:30 +00:00
committed by Gerrit Code Review
parent 83e7410d9b 69ea5b0784
commit 6ce82f92a0
8 changed files with 1333 additions and 1681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/header-abi-util/include/ir_representation_json.h
View File

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

52
vndk/tools/header-checker/header-abi-util/src/ir_representation_json.cpp
View File

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

119
vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump
View File

@@ -3,53 +3,42 @@
"builtin_types" :
[
{
"alignment" : 4,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "float",
"name" : "float",
"referenced_type" : "type-3",
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "int",
"name" : "int",
"referenced_type" : "type-2",
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : true,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "unsigned int",
"name" : "unsigned int",
"referenced_type" : "type-6",
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 0,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 0,
"linker_set_key" : "void",
"name" : "void",
"referenced_type" : "type-10",
@@ -57,7 +46,6 @@
"size" : 0,
"source_file" : ""
}
}
],
"elf_functions" :
[
@@ -117,6 +105,7 @@
[
{
"access" : "private",
"alignment" : 4,
"enum_fields" :
[
{
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower"
}
],
"tag_info" :
{
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
},
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker::Volume",
"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"
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"underlying_type" : "type-6",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
}
],
"function_types" : [],
@@ -170,7 +152,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -186,7 +168,7 @@
],
"return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -202,7 +184,7 @@
],
"return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -218,7 +200,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -234,7 +216,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -255,7 +237,7 @@
],
"return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -271,7 +253,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -287,15 +269,13 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
}
],
"global_vars" : [],
"lvalue_reference_types" : [],
"pointer_types" :
[
{
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker *",
@@ -304,10 +284,7 @@
"self_type" : "type-9",
"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 *",
@@ -316,10 +293,7 @@
"self_type" : "type-12",
"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 *",
@@ -328,10 +302,7 @@
"self_type" : "type-7",
"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 *",
@@ -341,13 +312,13 @@
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}
],
"qualified_types" : [],
"record_types" :
[
{
"access" : "public",
"alignment" : 4,
"base_specifiers" : [],
"fields" :
[
@@ -359,24 +330,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS12SuperSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class",
"referenced_type" : "type-1",
"self_type" : "type-1",
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_args" : [],
"unique_id" : "_ZTS12SuperSpeaker",
"vtable_components" :
[
{
@@ -416,10 +378,10 @@
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 4,
"base_specifiers" :
[
{
@@ -430,24 +392,15 @@
],
"fields" : [],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS17HighVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-11",
"self_type" : "type-11",
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS17HighVolumeSpeaker",
"vtable_components" :
[
{
@@ -487,10 +440,10 @@
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 4,
"base_specifiers" :
[
{
@@ -515,24 +468,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS16LowVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-5",
"self_type" : "type-5",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS16LowVolumeSpeaker",
"vtable_components" :
[
{
@@ -573,7 +517,6 @@
}
]
}
}
],
"rvalue_reference_types" : []
}

119
vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump
View File

@@ -3,53 +3,42 @@
"builtin_types" :
[
{
"alignment" : 4,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "float",
"name" : "float",
"referenced_type" : "type-3",
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "int",
"name" : "int",
"referenced_type" : "type-2",
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : true,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "unsigned int",
"name" : "unsigned int",
"referenced_type" : "type-6",
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 0,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 0,
"linker_set_key" : "void",
"name" : "void",
"referenced_type" : "type-10",
@@ -57,7 +46,6 @@
"size" : 0,
"source_file" : ""
}
}
],
"elf_functions" :
[
@@ -117,6 +105,7 @@
[
{
"access" : "private",
"alignment" : 4,
"enum_fields" :
[
{
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower"
}
],
"tag_info" :
{
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
},
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker::Volume",
"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"
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"underlying_type" : "type-6",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
}
],
"function_types" : [],
@@ -170,7 +152,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -186,7 +168,7 @@
],
"return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -202,7 +184,7 @@
],
"return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -218,7 +200,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -234,7 +216,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -255,7 +237,7 @@
],
"return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -271,7 +253,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -287,15 +269,13 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
}
],
"global_vars" : [],
"lvalue_reference_types" : [],
"pointer_types" :
[
{
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "SuperSpeaker *",
@@ -304,10 +284,7 @@
"self_type" : "type-9",
"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 *",
@@ -316,10 +293,7 @@
"self_type" : "type-12",
"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 *",
@@ -328,10 +302,7 @@
"self_type" : "type-7",
"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 *",
@@ -341,13 +312,13 @@
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}
],
"qualified_types" : [],
"record_types" :
[
{
"access" : "public",
"alignment" : 8,
"base_specifiers" : [],
"fields" :
[
@@ -359,24 +330,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS12SuperSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class",
"referenced_type" : "type-1",
"self_type" : "type-1",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_args" : [],
"unique_id" : "_ZTS12SuperSpeaker",
"vtable_components" :
[
{
@@ -416,10 +378,10 @@
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 8,
"base_specifiers" :
[
{
@@ -430,24 +392,15 @@
],
"fields" : [],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS17HighVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-11",
"self_type" : "type-11",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS17HighVolumeSpeaker",
"vtable_components" :
[
{
@@ -487,10 +440,10 @@
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 8,
"base_specifiers" :
[
{
@@ -515,24 +468,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS16LowVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-5",
"self_type" : "type-5",
"size" : 24,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS16LowVolumeSpeaker",
"vtable_components" :
[
{
@@ -573,7 +517,6 @@
}
]
}
}
],
"rvalue_reference_types" : []
}

119
vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump
View File

@@ -3,53 +3,42 @@
"builtin_types" :
[
{
"alignment" : 4,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "float",
"name" : "float",
"referenced_type" : "type-3",
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "int",
"name" : "int",
"referenced_type" : "type-2",
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : true,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "unsigned int",
"name" : "unsigned int",
"referenced_type" : "type-6",
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 0,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 0,
"linker_set_key" : "void",
"name" : "void",
"referenced_type" : "type-10",
@@ -57,7 +46,6 @@
"size" : 0,
"source_file" : ""
}
}
],
"elf_functions" :
[
@@ -117,6 +105,7 @@
[
{
"access" : "private",
"alignment" : 4,
"enum_fields" :
[
{
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower"
}
],
"tag_info" :
{
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
},
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker::Volume",
"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"
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"underlying_type" : "type-6",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
}
],
"function_types" : [],
@@ -170,7 +152,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -186,7 +168,7 @@
],
"return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -202,7 +184,7 @@
],
"return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -218,7 +200,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -234,7 +216,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -255,7 +237,7 @@
],
"return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -271,7 +253,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -287,15 +269,13 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
}
],
"global_vars" : [],
"lvalue_reference_types" : [],
"pointer_types" :
[
{
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker *",
@@ -304,10 +284,7 @@
"self_type" : "type-9",
"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 *",
@@ -316,10 +293,7 @@
"self_type" : "type-12",
"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 *",
@@ -328,10 +302,7 @@
"self_type" : "type-7",
"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 *",
@@ -341,13 +312,13 @@
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}
],
"qualified_types" : [],
"record_types" :
[
{
"access" : "public",
"alignment" : 4,
"base_specifiers" : [],
"fields" :
[
@@ -359,24 +330,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS12SuperSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class",
"referenced_type" : "type-1",
"self_type" : "type-1",
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_args" : [],
"unique_id" : "_ZTS12SuperSpeaker",
"vtable_components" :
[
{
@@ -416,10 +378,10 @@
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 4,
"base_specifiers" :
[
{
@@ -430,24 +392,15 @@
],
"fields" : [],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS17HighVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-11",
"self_type" : "type-11",
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS17HighVolumeSpeaker",
"vtable_components" :
[
{
@@ -487,10 +440,10 @@
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 4,
"base_specifiers" :
[
{
@@ -515,24 +468,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS16LowVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-5",
"self_type" : "type-5",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS16LowVolumeSpeaker",
"vtable_components" :
[
{
@@ -573,7 +517,6 @@
}
]
}
}
],
"rvalue_reference_types" : []
}

119
vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump
View File

@@ -3,53 +3,42 @@
"builtin_types" :
[
{
"alignment" : 4,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "float",
"name" : "float",
"referenced_type" : "type-3",
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "int",
"name" : "int",
"referenced_type" : "type-2",
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : true,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "unsigned int",
"name" : "unsigned int",
"referenced_type" : "type-6",
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 0,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 0,
"linker_set_key" : "void",
"name" : "void",
"referenced_type" : "type-10",
@@ -57,7 +46,6 @@
"size" : 0,
"source_file" : ""
}
}
],
"elf_functions" :
[
@@ -117,6 +105,7 @@
[
{
"access" : "private",
"alignment" : 4,
"enum_fields" :
[
{
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower"
}
],
"tag_info" :
{
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
},
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker::Volume",
"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"
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"underlying_type" : "type-6",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
}
],
"function_types" : [],
@@ -170,7 +152,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -186,7 +168,7 @@
],
"return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -202,7 +184,7 @@
],
"return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -218,7 +200,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -234,7 +216,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -255,7 +237,7 @@
],
"return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -271,7 +253,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -287,15 +269,13 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
}
],
"global_vars" : [],
"lvalue_reference_types" : [],
"pointer_types" :
[
{
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "SuperSpeaker *",
@@ -304,10 +284,7 @@
"self_type" : "type-9",
"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 *",
@@ -316,10 +293,7 @@
"self_type" : "type-12",
"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 *",
@@ -328,10 +302,7 @@
"self_type" : "type-7",
"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 *",
@@ -341,13 +312,13 @@
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}
],
"qualified_types" : [],
"record_types" :
[
{
"access" : "public",
"alignment" : 8,
"base_specifiers" : [],
"fields" :
[
@@ -359,24 +330,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS12SuperSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class",
"referenced_type" : "type-1",
"self_type" : "type-1",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_args" : [],
"unique_id" : "_ZTS12SuperSpeaker",
"vtable_components" :
[
{
@@ -416,10 +378,10 @@
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 8,
"base_specifiers" :
[
{
@@ -430,24 +392,15 @@
],
"fields" : [],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS17HighVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-11",
"self_type" : "type-11",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS17HighVolumeSpeaker",
"vtable_components" :
[
{
@@ -487,10 +440,10 @@
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 8,
"base_specifiers" :
[
{
@@ -515,24 +468,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS16LowVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-5",
"self_type" : "type-5",
"size" : 24,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS16LowVolumeSpeaker",
"vtable_components" :
[
{
@@ -573,7 +517,6 @@
}
]
}
}
],
"rvalue_reference_types" : []
}

119
vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump
View File

@@ -3,53 +3,42 @@
"builtin_types" :
[
{
"alignment" : 4,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "float",
"name" : "float",
"referenced_type" : "type-3",
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "int",
"name" : "int",
"referenced_type" : "type-2",
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : true,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "unsigned int",
"name" : "unsigned int",
"referenced_type" : "type-6",
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 0,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 0,
"linker_set_key" : "void",
"name" : "void",
"referenced_type" : "type-10",
@@ -57,7 +46,6 @@
"size" : 0,
"source_file" : ""
}
}
],
"elf_functions" :
[
@@ -117,6 +105,7 @@
[
{
"access" : "private",
"alignment" : 4,
"enum_fields" :
[
{
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower"
}
],
"tag_info" :
{
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
},
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker::Volume",
"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"
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"underlying_type" : "type-6",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
}
],
"function_types" : [],
@@ -170,7 +152,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -186,7 +168,7 @@
],
"return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -202,7 +184,7 @@
],
"return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -218,7 +200,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -234,7 +216,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -255,7 +237,7 @@
],
"return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -271,7 +253,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -287,15 +269,13 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
}
],
"global_vars" : [],
"lvalue_reference_types" : [],
"pointer_types" :
[
{
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker *",
@@ -304,10 +284,7 @@
"self_type" : "type-9",
"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 *",
@@ -316,10 +293,7 @@
"self_type" : "type-12",
"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 *",
@@ -328,10 +302,7 @@
"self_type" : "type-7",
"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 *",
@@ -341,13 +312,13 @@
"size" : 4,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}
],
"qualified_types" : [],
"record_types" :
[
{
"access" : "public",
"alignment" : 4,
"base_specifiers" : [],
"fields" :
[
@@ -359,24 +330,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS12SuperSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class",
"referenced_type" : "type-1",
"self_type" : "type-1",
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_args" : [],
"unique_id" : "_ZTS12SuperSpeaker",
"vtable_components" :
[
{
@@ -416,10 +378,10 @@
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 4,
"base_specifiers" :
[
{
@@ -430,24 +392,15 @@
],
"fields" : [],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS17HighVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-11",
"self_type" : "type-11",
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS17HighVolumeSpeaker",
"vtable_components" :
[
{
@@ -487,10 +440,10 @@
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 4,
"base_specifiers" :
[
{
@@ -515,24 +468,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS16LowVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-5",
"self_type" : "type-5",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS16LowVolumeSpeaker",
"vtable_components" :
[
{
@@ -573,7 +517,6 @@
}
]
}
}
],
"rvalue_reference_types" : []
}

119
vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump
View File

@@ -3,53 +3,42 @@
"builtin_types" :
[
{
"alignment" : 4,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "float",
"name" : "float",
"referenced_type" : "type-3",
"self_type" : "type-3",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "int",
"name" : "int",
"referenced_type" : "type-2",
"self_type" : "type-2",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 4,
"is_integral" : true,
"is_unsigned" : true,
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "unsigned int",
"name" : "unsigned int",
"referenced_type" : "type-6",
"self_type" : "type-6",
"size" : 4,
"source_file" : ""
}
},
{
"alignment" : 0,
"is_integral" : false,
"is_unsigned" : false,
"type_info" :
{
"alignment" : 0,
"linker_set_key" : "void",
"name" : "void",
"referenced_type" : "type-10",
@@ -57,7 +46,6 @@
"size" : 0,
"source_file" : ""
}
}
],
"elf_functions" :
[
@@ -117,6 +105,7 @@
[
{
"access" : "private",
"alignment" : 4,
"enum_fields" :
[
{
@@ -136,21 +125,14 @@
"name" : "SuperSpeaker::Volume::Lower"
}
],
"tag_info" :
{
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
},
"type_info" :
{
"alignment" : 4,
"linker_set_key" : "SuperSpeaker::Volume",
"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"
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"underlying_type" : "type-6",
"unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
}
],
"function_types" : [],
@@ -170,7 +152,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -186,7 +168,7 @@
],
"return_type" : "type-9",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -202,7 +184,7 @@
],
"return_type" : "type-8",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -218,7 +200,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -234,7 +216,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -255,7 +237,7 @@
],
"return_type" : "type-12",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -271,7 +253,7 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
},
{
"access" : "public",
@@ -287,15 +269,13 @@
],
"return_type" : "type-10",
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_info" : []
"template_args" : []
}
],
"global_vars" : [],
"lvalue_reference_types" : [],
"pointer_types" :
[
{
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "SuperSpeaker *",
@@ -304,10 +284,7 @@
"self_type" : "type-9",
"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 *",
@@ -316,10 +293,7 @@
"self_type" : "type-12",
"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 *",
@@ -328,10 +302,7 @@
"self_type" : "type-7",
"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 *",
@@ -341,13 +312,13 @@
"size" : 8,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
}
}
],
"qualified_types" : [],
"record_types" :
[
{
"access" : "public",
"alignment" : 8,
"base_specifiers" : [],
"fields" :
[
@@ -359,24 +330,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS12SuperSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "SuperSpeaker",
"name" : "SuperSpeaker",
"record_kind" : "class",
"referenced_type" : "type-1",
"self_type" : "type-1",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
"template_args" : [],
"unique_id" : "_ZTS12SuperSpeaker",
"vtable_components" :
[
{
@@ -416,10 +378,10 @@
"mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 8,
"base_specifiers" :
[
{
@@ -430,24 +392,15 @@
],
"fields" : [],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS17HighVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "HighVolumeSpeaker",
"name" : "HighVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-11",
"self_type" : "type-11",
"size" : 16,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS17HighVolumeSpeaker",
"vtable_components" :
[
{
@@ -487,10 +440,10 @@
"mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
}
]
}
},
{
"access" : "public",
"alignment" : 8,
"base_specifiers" :
[
{
@@ -515,24 +468,15 @@
}
],
"is_anonymous" : false,
"record_kind" : "class",
"tag_info" :
{
"unique_id" : "_ZTS16LowVolumeSpeaker"
},
"template_info" : [],
"type_info" :
{
"alignment" : 8,
"linker_set_key" : "LowVolumeSpeaker",
"name" : "LowVolumeSpeaker",
"record_kind" : "class",
"referenced_type" : "type-5",
"self_type" : "type-5",
"size" : 24,
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
},
"vtable_layout" :
{
"source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
"template_args" : [],
"unique_id" : "_ZTS16LowVolumeSpeaker",
"vtable_components" :
[
{
@@ -573,7 +517,6 @@
}
]
}
}
],
"rvalue_reference_types" : []
}