From fd6c685f2e937d3e3a5b37f9da556c52134e7c35 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Wed, 27 Nov 2013 22:57:44 +0000 Subject: Sema: Instantiation of variable definitions weren't local enough We wouldn't properly save and restore the pending local instantiations we had built up prior to instantiation of a variable definition. This would lead to us instantiating too much causing crashes and other general badness. This fixes PR14374. llvm-svn: 195887 --- clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'clang/lib/Sema') diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 136bb5aa4f8..0e6e204e661 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -3222,10 +3222,8 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation, // while we're still within our own instantiation context. SmallVector SavedVTableUses; std::deque SavedPendingInstantiations; - std::deque - SavedPendingLocalImplicitInstantiations; - SavedPendingLocalImplicitInstantiations.swap( - PendingLocalImplicitInstantiations); + SavePendingLocalImplicitInstantiationsRAII + SavedPendingLocalImplicitInstantiations(*this); if (Recursive) { VTableUses.swap(SavedVTableUses); PendingInstantiations.swap(SavedPendingInstantiations); @@ -3306,8 +3304,6 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation, "PendingInstantiations should be empty before it is discarded."); PendingInstantiations.swap(SavedPendingInstantiations); } - SavedPendingLocalImplicitInstantiations.swap( - PendingLocalImplicitInstantiations); } VarTemplateSpecializationDecl *Sema::BuildVarTemplateInstantiation( @@ -3727,6 +3723,8 @@ void Sema::InstantiateVariableDefinition(SourceLocation PointOfInstantiation, // while we're still within our own instantiation context. SmallVector SavedVTableUses; std::deque SavedPendingInstantiations; + SavePendingLocalImplicitInstantiationsRAII + SavedPendingLocalImplicitInstantiations(*this); if (Recursive) { VTableUses.swap(SavedVTableUses); PendingInstantiations.swap(SavedPendingInstantiations); -- cgit v1.2.3