From 8fab56e0dcf48d545a8aae1eae90b4f3d3f2231b Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Wed, 10 Feb 2016 22:18:37 +0000 Subject: Revert r260388 "[MS ABI] Never reference dllimport'd vtables" This caused the compiler to fail with "invalid linkage type for global declaration" (PR26569). llvm-svn: 260449 --- clang/lib/AST/MicrosoftMangle.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'clang/lib/AST/MicrosoftMangle.cpp') diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp index 930cf00d9e3..0634319cbd1 100644 --- a/clang/lib/AST/MicrosoftMangle.cpp +++ b/clang/lib/AST/MicrosoftMangle.cpp @@ -2599,10 +2599,7 @@ void MicrosoftMangleContextImpl::mangleCXXVFTable( // NOTE: here is always 'B' (const). // is always '6' for vftables. MicrosoftCXXNameMangler Mangler(*this, Out); - if (Derived->hasAttr()) - Mangler.getStream() << "\01??_S"; - else - Mangler.getStream() << "\01??_7"; + Mangler.getStream() << "\01??_7"; Mangler.mangleName(Derived); Mangler.getStream() << "6B"; // '6' for vftable, 'B' for const. for (const CXXRecordDecl *RD : BasePath) -- cgit v1.2.3