[PATCH] D67985: CFI: wrong type passed to llvm.type.test with multiple inheritance devirtualization

[Dmitry Mikulin via Phabricator via llvm-commits]

dmikulin created this revision.
Herald added subscribers: llvm-commits, Sanitizers, cfe-commits, Prazek.
Herald added projects: clang, Sanitizers, LLVM.

Fix for https://bugs.llvm.org/show_bug.cgi?id=43390


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D67985

Files:
  clang/lib/CodeGen/CGExprCXX.cpp
  compiler-rt/test/cfi/multiple-inheritance2.cpp


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 <stdio.h>
+
+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<A1*>(&b)->f1();
+    static_cast<A2*>(&b)->f2();
+}
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());
     }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67985.221595.patch
Type: text/x-patch
Size: 1481 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190924/e09dbf9a/attachment.bin>