diff options
author | Dmitry Mikulin <dmitry.mikulin@sony.com> | 2019-10-15 16:32:50 +0000 |
---|---|---|
committer | Dmitry Mikulin <dmitry.mikulin@sony.com> | 2019-10-15 16:32:50 +0000 |
commit | 827afc80db6942421553c6a0613eae1a4f57f1bc (patch) | |
tree | a153bf79af7e11c7f617538b7484abe1f29a6b8f | |
parent | f7b604fbbefcd5024d319b06bf1b35730f8ab32a (diff) |
CFI: wrong type passed to llvm.type.test with multiple inheritance devirtualization.
Differential Revision: https://reviews.llvm.org/D67985
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@374909 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 2 | ||||
-rw-r--r-- | test/CodeGenCXX/cfi-multiple-inheritance.cpp | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index 49527e9691..114d806d45 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -382,7 +382,7 @@ RValue CodeGenFunction::EmitCXXMemberOrOperatorMemberCallExpr( const CXXRecordDecl *RD; std::tie(VTable, RD) = CGM.getCXXABI().LoadVTablePtr(*this, This.getAddress(), - MD->getParent()); + CalleeDecl->getParent()); EmitVTablePtrCheckForCall(RD, VTable, CFITCK_NVCall, CE->getBeginLoc()); } diff --git a/test/CodeGenCXX/cfi-multiple-inheritance.cpp b/test/CodeGenCXX/cfi-multiple-inheritance.cpp new file mode 100644 index 0000000000..bebf30d22a --- /dev/null +++ b/test/CodeGenCXX/cfi-multiple-inheritance.cpp @@ -0,0 +1,31 @@ +// Test that correct vtable ptr and type metadata are passed to llvm.type.test +// Related to Bugzilla 43390. + +// RUN: %clang_cc1 -triple x86_64-unknown-linux -fvisibility hidden -std=c++11 -fsanitize=cfi-nvcall -emit-llvm -o - %s | FileCheck %s + +class A1 { +public: + virtual int f1() = 0; +}; + +class A2 { +public: + virtual int f2() = 0; +}; + + +class B : public A1, public A2 { +public: + int f2() final { return 1; } + int f1() final { return 2; } +}; + +// CHECK-LABEL: define hidden i32 @_Z3foov +int foo() { + B b; + return static_cast<A2*>(&b)->f2(); + // CHECK: [[P:%[^ ]*]] = bitcast %class.B* %b to i8** + // CHECK: [[V:%[^ ]*]] = load i8*, i8** [[P]], align 8 + // CHECK: call i1 @llvm.type.test(i8* [[V]], metadata !"_ZTS1B") + // CHECK: call i1 @llvm.type.test(i8* [[V]], metadata !"all-vtables") +} |