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

Merge "Fix the bug that generates multiple definition of references" am: e07e343451 am: 2706b0c951

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2379448

Change-Id: Ib40747a9e97d000d9d4982fe13a685a04af15dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hsin-Yi Chen
2023-01-10 04:24:09 +00:00
committed by Automerger Merge Worker
parent ed61429250 2706b0c951
commit 0dff861946
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/src/linker/module_merger.cpp
View File

@@ -131,7 +131,7 @@ MergeStatus ModuleMerger::MergeReferencingTypeInternal(
// The type was already added to the parent graph. So change the // The type was already added to the parent graph. So change the
// referenced type to the global type id. // referenced type to the global type id.
references_type->SetReferencedType(local_to_global_it->second.type_id_); references_type->SetReferencedType(local_to_global_it->second.type_id_);
return local_to_global_it->second; return MergeStatus(false, local_to_global_it->second.type_id_);
} }
// If that did not go through, look at the addend's type_map_ and get the // If that did not go through, look at the addend's type_map_ and get the
@@ -470,7 +470,7 @@ MergeStatus ModuleMerger::MergeType(
// parent graph. This does not add the node itself though. // parent graph. This does not add the node itself though.
auto type_it = local_to_global_type_id_map->find(addend_node->GetSelfType()); auto type_it = local_to_global_type_id_map->find(addend_node->GetSelfType());
if (type_it != local_to_global_type_id_map->end()) { if (type_it != local_to_global_type_id_map->end()) {
return type_it->second; return MergeStatus(false, type_it->second.type_id_);
} }
MergeStatus merge_status = LookupType( MergeStatus merge_status = LookupType(

2
vndk/tools/header-checker/tests/reference_dumps/arm64/libdiff_multi_definitions.so.lsdump
View File

@@ -69,7 +69,7 @@
"parameters" : "parameters" :
[ [
{ {
"referenced_type" : "_ZTIP18DefinedInOneHeader#ODR:/link_to_def2.h.sdump" "referenced_type" : "_ZTIP18DefinedInOneHeader"
} }
], ],
"return_type" : "_ZTIv", "return_type" : "_ZTIv",

2
vndk/tools/header-checker/tests/reference_dumps/arm64/libmerge_multi_definitions.so.lsdump
View File

@@ -69,7 +69,7 @@
"parameters" : "parameters" :
[ [
{ {
"referenced_type" : "_ZTIP18DefinedInOneHeader#ODR:/def2.h.sdump" "referenced_type" : "_ZTIP18DefinedInOneHeader"
} }
], ],
"return_type" : "_ZTIv", "return_type" : "_ZTIv",