Index: clang/lib/CodeGen/CGExprCXX.cpp =================================================================== --- clang/lib/CodeGen/CGExprCXX.cpp +++ clang/lib/CodeGen/CGExprCXX.cpp @@ -382,7 +382,7 @@ const CXXRecordDecl *RD; std::tie(VTable, RD) = CGM.getCXXABI().LoadVTablePtr(*this, This.getAddress(), - MD->getParent()); + CalleeDecl->getParent()); EmitVTablePtrCheckForCall(RD, VTable, CFITCK_NVCall, CE->getBeginLoc()); } Index: compiler-rt/test/cfi/multiple-inheritance2.cpp =================================================================== --- /dev/null +++ compiler-rt/test/cfi/multiple-inheritance2.cpp @@ -0,0 +1,38 @@ +// Test that virtual functions of the derived class can be called through +// pointers of both base classes without CFI errors. +// Related to Bugzilla 43390. + +// RUN: %clangxx_cfi -o %t1 %s +// RUN: %run %t1 2>&1 | FileCheck --check-prefix=CFI %s + +// CFI: In f1 +// CFI: In f2 +// CFI-NOT: control flow integrity check + +// REQUIRES: cxxabi + +#include + +class A1 { +public: + virtual void f1() = 0; +}; + +class A2 { +public: + virtual void f2() = 0; +}; + + +class B : public A1, public A2 { +public: + void f2() final { fprintf(stderr, "In f2\n"); } + void f1() final { fprintf(stderr, "In f1\n"); } +}; + +int main() { + B b; + + static_cast(&b)->f1(); + static_cast(&b)->f2(); +}