From f5b86b8487d6ea18cc82f9a0acbbb45a96473c31 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Tue, 22 Sep 2020 13:30:42 -0700 Subject: [PATCH] Update to use clang-r399163. Bug: http://b/155835175 Test: OUT_DIR=out prebuilts/clang-tools/build-prebuilts.sh Change-Id: I8fd0569170eca2f7b35814b2d582c55b532bc815 --- vndk/tools/header-checker/android/envsetup.sh | 4 ++-- vndk/tools/header-checker/src/dumper/abi_wrappers.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh index ba4b531b6..dc0a20017 100644 --- a/vndk/tools/header-checker/android/envsetup.sh +++ b/vndk/tools/header-checker/android/envsetup.sh @@ -15,5 +15,5 @@ # limitations under the License. export LLVM_BUILD_HOST_TOOLS=true -export LLVM_PREBUILTS_VERSION=clang-r383902b -export LLVM_RELEASE_VERSION=11.0.2 +export LLVM_PREBUILTS_VERSION=clang-r399163 +export LLVM_RELEASE_VERSION=11.0.4 diff --git a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp index 0bcdc56ff..624220465 100644 --- a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp +++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp @@ -743,8 +743,9 @@ repr::VTableComponentIR RecordDeclWrapper::SetupRecordVTableComponent( } if (thunk_info.isEmpty()) { - mangle_contextp_->mangleCXXDtor( - vtable_component.getDestructorDecl(), dtor_type, ostream); + auto GD = clang::GlobalDecl( + vtable_component.getDestructorDecl(), dtor_type); + mangle_contextp_->mangleName(GD, ostream); } else { mangle_contextp_->mangleCXXDtorThunk( vtable_component.getDestructorDecl(), dtor_type,