diff options
author | Reid Kleckner <rnk@google.com> | 2016-02-09 17:48:27 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2016-02-09 17:48:27 +0000 |
commit | 703b2cb63cb1de7acb8ece35a0d5733e3411f377 (patch) | |
tree | 065b6076038f47db812e1117760847a0b1bec333 /lib/Sema/SemaTemplateInstantiate.cpp | |
parent | dbe65180fb1f2c560db6f44202c3c3251b1cce4f (diff) |
Revert "Avoid forcing emission of delayed dllexported classes on template instantiation"
This reverts commit r260194.
It caused PR26549. There's probably a better way to do this also.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260241 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiate.cpp')
-rw-r--r-- | lib/Sema/SemaTemplateInstantiate.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index db3f47fd91..56858bcc7e 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/lib/Sema/SemaTemplateInstantiate.cpp @@ -1949,13 +1949,6 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation, bool MergeWithParentScope = !Instantiation->isDefinedOutsideFunctionOrMethod(); LocalInstantiationScope Scope(*this, MergeWithParentScope); - // All dllexported classes created during instantiation should be fully - // emitted after instantiation completes. We may not be ready to emit any - // delayed classes already on the stack, so save them away and put them back - // later. - decltype(DelayedDllExportClasses) ExportedClasses; - std::swap(ExportedClasses, DelayedDllExportClasses); - // Pull attributes from the pattern onto the instantiation. InstantiateAttrs(TemplateArgs, Pattern, Instantiation); @@ -2041,9 +2034,6 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation, // default arg exprs for default constructors if necessary now. ActOnFinishCXXNonNestedClass(Instantiation); - // Put back the delayed exported classes that we moved out of the way. - std::swap(ExportedClasses, DelayedDllExportClasses); - // Instantiate late parsed attributes, and attach them to their decls. // See Sema::InstantiateAttrs for (LateInstantiatedAttrVec::iterator I = LateAttrs.begin(), |