commit e976aab1dffca7fd436991d9e18ef857f57e2867
author NAKAMURA Takumi <geek4civic@gmail.com> Wed Feb 25 00:18:22 2015 +0000
committer NAKAMURA Takumi <geek4civic@gmail.com> Wed Feb 25 00:18:22 2015 +0000
tree 82a45c69437e9307ca4b12ce4f9815a6ea795065
parent e0dd0f23b8d24a1b302ec547c168e5a021a4121b

Revert r230314, "Fix codegen for virtual methods that are (re-) exported from multiple modules."

It crashes for targeting (i686|x86_64)-win32.

  clang: clang/lib/AST/VTableBuilder.cpp:142: {anonymous}::FinalOverriders::OverriderInfo {anonymous}::FinalOverriders::getOverrider(const clang::CXXMethodDecl*, clang::CharUnits) const: Assertion `OverridersMap.count(std::make_pair(MD, BaseOffset)) && "Did not find overrider!"' failed.

llvm-svn: 230406

clang/lib/AST/VTableBuilder.cpp

diff --git a/clang/lib/AST/VTableBuilder.cpp b/clang/lib/AST/VTableBuilder.cpp
index c0777e0..ddb1f05 100644
--- a/clang/lib/AST/VTableBuilder.cpp
+++ b/clang/lib/AST/VTableBuilder.cpp
@@ -411,8 +411,7 @@
   for (const auto *MD : RD->methods()) {
     if (!MD->isVirtual())
       continue;
-    MD = MD->getCanonicalDecl();
-
+  
     OverriderInfo Overrider = getOverrider(MD, Base.getBaseOffset());
 
     Out << "  ";
@@ -696,7 +695,6 @@
   for (const auto *MD : RD->methods()) {
     if (!MD->isVirtual())
       continue;
-    MD = MD->getCanonicalDecl();
 
     CharUnits OffsetOffset = getCurrentOffsetOffset();
     
@@ -1516,7 +1514,6 @@
   for (const auto *MD : RD->methods()) {
     if (!MD->isVirtual())
       continue;
-    MD = MD->getCanonicalDecl();
 
     // Get the final overrider.
     FinalOverriders::OverriderInfo Overrider = 
@@ -2199,7 +2196,6 @@
     // We only want virtual member functions.
     if (!MD->isVirtual())
       continue;
-    MD = MD->getCanonicalDecl();
 
     std::string MethodName =
       PredefinedExpr::ComputeName(PredefinedExpr::PrettyFunctionNoVirtual,