commit a84b4044b79f2cc424c6ae7ee5edb97e948ba806
author Mike Stump <mrs@apple.com> Fri Nov 20 00:02:19 2009 +0000
committer Mike Stump <mrs@apple.com> Fri Nov 20 00:02:19 2009 +0000
tree 0822999698e50d2c24f0626a3a299b13b05907f1
parent 73460a32bc5299a5927d23d2e464d72af796eabf

Fixup key function calculations.


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

lib/CodeGen/CodeGenModule.cpp

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 195acc5..1fbd3b9 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -623,7 +623,9 @@
     const CGRecordLayout &CGLayout = Types.getCGRecordLayout(RD);
     // A definition of a KeyFunction, generates all the class data, such
     // as vtable, rtti and the VTT.
-    if (CGLayout.getKeyFunction() == MD)
+    if (CGLayout.getKeyFunction()
+        && (CGLayout.getKeyFunction()->getCanonicalDecl()
+            == MD->getCanonicalDecl()))
       getVtableInfo().GenerateClassData(RD);
   }
   if (const CXXConstructorDecl *CD = dyn_cast<CXXConstructorDecl>(D))