diff options
| author | Hans Wennborg <hans@hanshq.net> | 2016-02-10 22:18:37 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2016-02-10 22:18:37 +0000 |
| commit | 8fab56e0dcf48d545a8aae1eae90b4f3d3f2231b (patch) | |
| tree | 806ef9716bc5c8762bb37ce5f499ff1d439cfdc0 /clang/lib/AST/MicrosoftMangle.cpp | |
| parent | 4022d529594dea28ef11ae78c214cf37f139f053 (diff) | |
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
Diffstat (limited to 'clang/lib/AST/MicrosoftMangle.cpp')
| -rw-r--r-- | clang/lib/AST/MicrosoftMangle.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp index 930cf00d9e3c..0634319cbd1b 100644 --- a/clang/lib/AST/MicrosoftMangle.cpp +++ b/clang/lib/AST/MicrosoftMangle.cpp @@ -2599,10 +2599,7 @@ void MicrosoftMangleContextImpl::mangleCXXVFTable( // NOTE: <cvr-qualifiers> here is always 'B' (const). <storage-class> // is always '6' for vftables. MicrosoftCXXNameMangler Mangler(*this, Out); - if (Derived->hasAttr<DLLImportAttr>()) - 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) |