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

Merge "Filter global variables and functions by -ignore-linker-set-key"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-16 09:05:43 +00:00
committed by Gerrit Code Review
parent aa16c32035 f5b6ebad09
commit e1d600b62c
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vndk/tools/header-checker/src/diff/abi_diff.cpp
View File

@@ -382,8 +382,11 @@ bool HeaderAbiDiff::DumpDiffElements(
const T *old_element = pair.first;
const T *new_element = pair.second;
// The old and new linker set keys are supposed to be equal.
if (IgnoreSymbol<T>(old_element, ignored_symbols_,
[](const T *e) {return e->GetLinkerSetKey();})) {
[](const T *e) { return e->GetLinkerSetKey(); }) ||
ignored_linker_set_keys_.find(old_element->GetLinkerSetKey()) !=
ignored_linker_set_keys_.end()) {
continue;
}

8
vndk/tools/header-checker/src/diff/abi_diff_wrappers.cpp
View File

@@ -32,10 +32,6 @@ template <>
bool DiffWrapper<repr::RecordTypeIR>::DumpDiff(
repr::DiffMessageIR::DiffKind diff_kind) {
std::deque<std::string> type_queue;
if (oldp_->GetLinkerSetKey() != newp_->GetLinkerSetKey()) {
llvm::errs() << "Comparing two different unreferenced records\n";
return false;
}
if (!type_cache_->insert(
oldp_->GetSelfType() + newp_->GetSelfType()).second) {
return true;
@@ -48,10 +44,6 @@ template <>
bool DiffWrapper<repr::EnumTypeIR>::DumpDiff(
repr::DiffMessageIR::DiffKind diff_kind) {
std::deque<std::string> type_queue;
if (oldp_->GetLinkerSetKey() != newp_->GetLinkerSetKey()) {
llvm::errs() << "Comparing two different unreferenced enums\n";
return false;
}
if (!type_cache_->insert(
oldp_->GetSelfType() + newp_->GetSelfType()).second) {
return true;

4
vndk/tools/header-checker/tests/test.py
View File

@@ -178,6 +178,10 @@ class HeaderCheckerTest(unittest.TestCase):
def test_libgolden_cpp_return_type_diff(self):
self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_return_type_diff", 8)
self.prepare_and_run_abi_diff_all_archs(
"libgolden_cpp", "libgolden_cpp_return_type_diff", 0,
["-ignore-linker-set-key", "_ZN17HighVolumeSpeaker6ListenEv",
"-ignore-linker-set-key", "_ZN16LowVolumeSpeaker6ListenEv"])
def test_libgolden_cpp_add_odr(self):
self.prepare_and_run_abi_diff_all_archs(