commit b455f0e74be0144ab9738ef574d07bd661959525
author Eli Friedman <eli.friedman@gmail.com> Mon Dec 07 23:56:34 2009 +0000
committer Eli Friedman <eli.friedman@gmail.com> Mon Dec 07 23:56:34 2009 +0000
tree fe85af62b94205320c712f6347a48604ecee9075
parent cce3d4f9812182ed4e551b7cf0fc86576be8d9c5

A bunch more thunk fixes from misc testing.

(Yes, I do intend to commit some tests for this.)



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90818 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CodeGenModule.cpp

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 5f822f5..6250e69 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -625,7 +625,13 @@
     getVtableInfo().MaybeEmitVtable(GD);
     if (MD->isVirtual() && MD->isOutOfLine() &&
         (!isa<CXXDestructorDecl>(D) || GD.getDtorType() != Dtor_Base)) {
-      BuildThunksForVirtual(GD);
+      if (isa<CXXDestructorDecl>(D)) {
+        GlobalDecl CanonGD(cast<CXXDestructorDecl>(D->getCanonicalDecl()),
+                           GD.getDtorType());
+        BuildThunksForVirtual(CanonGD);
+      } else {
+        BuildThunksForVirtual(MD->getCanonicalDecl());
+      }
     }
   }