commit 57cbe5c790256791a58c0e394641b0136131d997
author Timur Iskhodzhanov <timurrrr@google.com> Wed Feb 27 13:46:31 2013 +0000
committer Timur Iskhodzhanov <timurrrr@google.com> Wed Feb 27 13:46:31 2013 +0000
tree 32048a3476d8c10d23b5006ceed1b654fe35edf1
parent 8ee2a5adc79c3fcc648953b996a3ea3b4aaf7ef2

Better support for constructors with -cxx-abi microsoft, partly fixes PR12784

llvm-svn: 176186

clang/lib/CodeGen/CGVTables.cpp

diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp
index 73a69b1..b7ddc97 100644
--- a/clang/lib/CodeGen/CGVTables.cpp
+++ b/clang/lib/CodeGen/CGVTables.cpp
@@ -813,8 +813,12 @@
   EmitVTableDefinition(VTable, Linkage, RD);
 
   if (RD->getNumVBases()) {
-    llvm::GlobalVariable *VTT = GetAddrOfVTT(RD);
-    EmitVTTDefinition(VTT, Linkage, RD);
+    if (!CGM.getTarget().getCXXABI().isMicrosoft()) {
+      llvm::GlobalVariable *VTT = GetAddrOfVTT(RD);
+      EmitVTTDefinition(VTT, Linkage, RD);
+    } else {
+      // FIXME: Emit vbtables here.
+    }
   }
 
   // If this is the magic class __cxxabiv1::__fundamental_type_info,