With the introduction of nullptr, a template argument that refers to a declaration...

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

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 0c91573180ad355161d8584755723a567258564f..0e1daea23cb64574df3f3e47fdf1528c71d46642 100644 (file)
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -1550,7 +1550,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param,
         return true;
 
       if (Converted) {
-        Member = cast<NamedDecl>(Context.getCanonicalDecl(Member));
+        Member = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Member));
         Converted->push_back(TemplateArgument(StartLoc, Member));
       }
 
@@ -1562,7 +1562,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param,
       return true;
 
     if (Converted) {
-      Entity = cast<NamedDecl>(Context.getCanonicalDecl(Entity));
+      Entity = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Entity));
       Converted->push_back(TemplateArgument(StartLoc, Entity));
     }
     return false;
@@ -1603,7 +1603,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param,
       return true;
 
     if (Converted) {
-      Entity = cast<NamedDecl>(Context.getCanonicalDecl(Entity));
+      Entity = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Entity));
       Converted->push_back(TemplateArgument(StartLoc, Entity));
     }
 
@@ -1679,7 +1679,7 @@ bool Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param,
     return true;
   
   if (Converted) {
-    Member = cast<NamedDecl>(Context.getCanonicalDecl(Member));
+    Member = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Member));
     Converted->push_back(TemplateArgument(StartLoc, Member));
   }