summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/VTableBuilder.cpp
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2016-02-10 22:18:37 +0000
committerHans Wennborg <hans@hanshq.net>2016-02-10 22:18:37 +0000
commit8fab56e0dcf48d545a8aae1eae90b4f3d3f2231b (patch)
tree806ef9716bc5c8762bb37ce5f499ff1d439cfdc0 /clang/lib/AST/VTableBuilder.cpp
parent4022d529594dea28ef11ae78c214cf37f139f053 (diff)
downloadbcm5719-llvm-8fab56e0dcf48d545a8aae1eae90b4f3d3f2231b.tar.gz
bcm5719-llvm-8fab56e0dcf48d545a8aae1eae90b4f3d3f2231b.zip
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/VTableBuilder.cpp')
-rw-r--r--clang/lib/AST/VTableBuilder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/AST/VTableBuilder.cpp b/clang/lib/AST/VTableBuilder.cpp
index b728b279182..bae018652f9 100644
--- a/clang/lib/AST/VTableBuilder.cpp
+++ b/clang/lib/AST/VTableBuilder.cpp
@@ -2548,6 +2548,7 @@ public:
// Only include the RTTI component if we know that we will provide a
// definition of the vftable.
HasRTTIComponent = Context.getLangOpts().RTTIData &&
+ !MostDerivedClass->hasAttr<DLLImportAttr>() &&
MostDerivedClass->getTemplateSpecializationKind() !=
TSK_ExplicitInstantiationDeclaration;
OpenPOWER on IntegriCloud