commit e7c7d70278d1fc7e1badf243d5e02ecd2011c881
author Nico Weber <nicolasweber@gmx.de> Sat Mar 31 18:26:25 2018 +0000
committer Nico Weber <nicolasweber@gmx.de> Sat Mar 31 18:26:25 2018 +0000
tree 26231a15be891271d44d01aee76ca6973fae9125
parent 6124cae8f7656c9c75941dc2f480404dde491200

Revert r328845, it caused crbug.com/827810.

llvm-svn: 328922

clang/lib/AST/VTableBuilder.cpp

diff --git a/clang/lib/AST/VTableBuilder.cpp b/clang/lib/AST/VTableBuilder.cpp
index 5f1ccdf..a95791c 100644
--- a/clang/lib/AST/VTableBuilder.cpp
+++ b/clang/lib/AST/VTableBuilder.cpp
@@ -2367,6 +2367,8 @@
 
 class VFTableBuilder {
 public:
+  typedef MicrosoftVTableContext::MethodVFTableLocation MethodVFTableLocation;
+
   typedef llvm::DenseMap<GlobalDecl, MethodVFTableLocation>
     MethodVFTableLocationsTy;
 
@@ -3542,9 +3544,10 @@
   }
 }
 
-static bool vfptrIsEarlierInMDC(const ASTRecordLayout &Layout,
-                                const MethodVFTableLocation &LHS,
-                                const MethodVFTableLocation &RHS) {
+static bool
+vfptrIsEarlierInMDC(const ASTRecordLayout &Layout,
+                    const MicrosoftVTableContext::MethodVFTableLocation &LHS,
+                    const MicrosoftVTableContext::MethodVFTableLocation &RHS) {
   CharUnits L = LHS.VFPtrOffset;
   CharUnits R = RHS.VFPtrOffset;
   if (LHS.VBase)
@@ -3730,7 +3733,7 @@
   return *VFTableLayouts[id];
 }
 
-const MethodVFTableLocation &
+const MicrosoftVTableContext::MethodVFTableLocation &
 MicrosoftVTableContext::getMethodVFTableLocation(GlobalDecl GD) {
   assert(cast<CXXMethodDecl>(GD.getDecl())->isVirtual() &&
          "Only use this method for virtual methods or dtors");