commit a8eaf008e92759142982f7b40720b2b2674bd663
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Aug 23 06:16:52 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Aug 23 06:16:52 2012 +0000
tree fdbc6414d49262a6e3dbf2ecd383c3e1b311f9dc
parent 925d58c20aba52ef3901db7402a2067266ed12ea

Fix undefined behavior: member function calls where 'this' is a null pointer.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162430 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaTemplate.cpp

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 98497cb..229d8c0 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -1999,9 +1999,11 @@
     for (unsigned I = 0; I < Depth; ++I)
       TemplateArgLists.addOuterTemplateArguments(0, 0);
 
+    LocalInstantiationScope Scope(*this);
     InstantiatingTemplate Inst(*this, TemplateLoc, Template);
     if (Inst)
       return QualType();
+
     CanonType = SubstType(Pattern->getUnderlyingType(),
                           TemplateArgLists, AliasTemplate->getLocation(),
                           AliasTemplate->getDeclName());