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

Merge "Update to use clang-r399163." am: c8265d30dc am: 28c67a9aef am: fab3335df5

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

Change-Id: I9d4b0e2ba10a96e2af82122e998246e5f2aaf21b
This commit is contained in:
Stephen Hines
2020-09-23 06:57:55 +00:00
committed by Automerger Merge Worker
parent fa2c1a34ad fab3335df5
commit fdfff76f54
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/android/envsetup.sh
View File

@@ -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

5
vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
View File

@@ -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,