Work around vtable index issue due to base class definition being replaced by later PCM.

Axel-Naumann · Axel-Naumann · commit fc1cb8039199 · 2012-10-03T10:13:01.000Z
Mark llvm/clang patch by putting it into a separate ROOT-patches dir; makes it easier to revert later. git-svn-id: http://root.cern.ch/svn/root/trunk@46281 27541ba8-7e3a-0410-8455-c3a389f83636
diff --git a/interpreter/llvm/src/ROOT-patches/AST-VTableBuilder.cpp b/interpreter/llvm/src/ROOT-patches/AST-VTableBuilder.cpp
@@ -0,0 +1,44 @@
+Index: tools/clang/lib/AST/VTableBuilder.cpp
+===================================================================
+--- tools/clang/lib/AST/VTableBuilder.cpp	(revision 46280)
++++ tools/clang/lib/AST/VTableBuilder.cpp	(working copy)
+@@ -1160,7 +1160,8 @@
+       continue;
+     }
+ 
+-    if (MD->getParent() == MostDerivedClass)
++    if (MD->getParent()->getCanonicalDecl()
++        == MostDerivedClass->getCanonicalDecl())
+       AddThunk(MD, Thunk);
+   }
+ }
+@@ -1353,7 +1354,8 @@
+   
+   // If the overrider is the first base in the primary base chain, we know
+   // that the overrider will be used.
+-  if (Overrider->getParent() == FirstBaseInPrimaryBaseChain)
++  if (Overrider->getParent()->getCanonicalDecl()
++      == FirstBaseInPrimaryBaseChain->getCanonicalDecl())
+     return true;
+   
+   VTableBuilder::PrimaryBasesSetVectorTy PrimaryBases;
+@@ -1417,7 +1419,8 @@
+       const CXXMethodDecl *OverriddenMD = *I;
+       
+       // We found our overridden method.
+-      if (OverriddenMD->getParent() == PrimaryBase)
++      if (OverriddenMD->getParent()->getCanonicalDecl()
++          == PrimaryBase->getCanonicalDecl())
+         return OverriddenMD;
+     }
+   }
+@@ -1512,7 +1515,8 @@
+                                   Overrider);
+ 
+           if (ThisAdjustment.VCallOffsetOffset &&
+-              Overrider.Method->getParent() == MostDerivedClass) {
++              Overrider.Method->getParent()->getCanonicalDecl()
++              == MostDerivedClass->getCanonicalDecl()) {
+ 
+             // There's no return adjustment from OverriddenMD and MD,
+             // but that doesn't mean there isn't one between MD and
diff --git a/interpreter/llvm/src/tools/clang/lib/AST/VTableBuilder.cpp b/interpreter/llvm/src/tools/clang/lib/AST/VTableBuilder.cpp
@@ -1160,7 +1160,8 @@ void VTableBuilder::ComputeThisAdjustments() {
       continue;
     }
 
-    if (MD->getParent() == MostDerivedClass)
+    if (MD->getParent()->getCanonicalDecl()
+        == MostDerivedClass->getCanonicalDecl())
       AddThunk(MD, Thunk);
   }
 }
@@ -1353,7 +1354,8 @@ VTableBuilder::IsOverriderUsed(const CXXMethodDecl *Overrider,
   
   // If the overrider is the first base in the primary base chain, we know
   // that the overrider will be used.
-  if (Overrider->getParent() == FirstBaseInPrimaryBaseChain)
+  if (Overrider->getParent()->getCanonicalDecl()
+      == FirstBaseInPrimaryBaseChain->getCanonicalDecl())
     return true;
   
   VTableBuilder::PrimaryBasesSetVectorTy PrimaryBases;
@@ -1417,7 +1419,8 @@ FindNearestOverriddenMethod(const CXXMethodDecl *MD,
       const CXXMethodDecl *OverriddenMD = *I;
       
       // We found our overridden method.
-      if (OverriddenMD->getParent() == PrimaryBase)
+      if (OverriddenMD->getParent()->getCanonicalDecl()
+          == PrimaryBase->getCanonicalDecl())
         return OverriddenMD;
     }
   }
@@ -1512,7 +1515,8 @@ VTableBuilder::AddMethods(BaseSubobject Base, CharUnits BaseOffsetInLayoutClass,
                                   Overrider);
 
           if (ThisAdjustment.VCallOffsetOffset &&
-              Overrider.Method->getParent() == MostDerivedClass) {
+              Overrider.Method->getParent()->getCanonicalDecl()
+              == MostDerivedClass->getCanonicalDecl()) {
 
             // There's no return adjustment from OverriddenMD and MD,
             // but that doesn't mean there isn't one between MD and
