Author: dmikulin Date: Tue Oct 15 09:32:50 2019 New Revision: 374909 URL: http://llvm.org/viewvc/llvm-project?rev=374909&view=rev Log: CFI: wrong type passed to llvm.type.test with multiple inheritance devirtualization.
Differential Revision: https://reviews.llvm.org/D67985 Added: cfe/trunk/test/CodeGenCXX/cfi-multiple-inheritance.cpp Modified: cfe/trunk/lib/CodeGen/CGExprCXX.cpp Modified: cfe/trunk/lib/CodeGen/CGExprCXX.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprCXX.cpp?rev=374909&r1=374908&r2=374909&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGExprCXX.cpp (original) +++ cfe/trunk/lib/CodeGen/CGExprCXX.cpp Tue Oct 15 09:32:50 2019 @@ -382,7 +382,7 @@ RValue CodeGenFunction::EmitCXXMemberOrO const CXXRecordDecl *RD; std::tie(VTable, RD) = CGM.getCXXABI().LoadVTablePtr(*this, This.getAddress(), - MD->getParent()); + CalleeDecl->getParent()); EmitVTablePtrCheckForCall(RD, VTable, CFITCK_NVCall, CE->getBeginLoc()); } Added: cfe/trunk/test/CodeGenCXX/cfi-multiple-inheritance.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cfi-multiple-inheritance.cpp?rev=374909&view=auto ============================================================================== --- cfe/trunk/test/CodeGenCXX/cfi-multiple-inheritance.cpp (added) +++ cfe/trunk/test/CodeGenCXX/cfi-multiple-inheritance.cpp Tue Oct 15 09:32:50 2019 @@ -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") +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
