With the introduction of nullptr, a template argument that refers to a declaration can now be NULL. Use cast_or_null appropriately
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 0c91573..0e1daea 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -1550,7 +1550,7 @@
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 @@
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 @@
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 @@
return true;
if (Converted) {
- Member = cast<NamedDecl>(Context.getCanonicalDecl(Member));
+ Member = cast_or_null<NamedDecl>(Context.getCanonicalDecl(Member));
Converted->push_back(TemplateArgument(StartLoc, Member));
}