remove some defensive code: LocalInstantiationScope::getInstantiationOf

and findInstantiationOf can never return null, even on invalid code.


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

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index f58e744578..0ad9f7c53f 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -2168,8 +2168,7 @@ bool Sema::Subst(const TemplateArgumentLoc *Args, unsigned NumArgs,
 
 Decl *LocalInstantiationScope::getInstantiationOf(const Decl *D) {
   llvm::PointerUnion<Decl *, DeclArgumentPack *> *Found= findInstantiationOf(D);
-  if (!Found)
-    return 0;
+  assert(Found);
   
   if (Found->is<Decl *>())
     return Found->get<Decl *>();
@@ -2202,8 +2201,7 @@ LocalInstantiationScope::findInstantiationOf(const Decl *D) {
       break;
   }
   
-  assert(D->isInvalidDecl() && 
-         "declaration was not instantiated in this scope!");
+  assert(0 && "declaration was not instantiated in this scope!");
   return 0;
 }