summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-01-15 07:04:38 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-01-15 07:04:38 +0000
commit8e1a913cfacad6de89eaa3cdd95d19fbe1743ac6 (patch)
treef08466fc9690779fcc1de8a31ff6fd422173f181 /clang/lib
parentbe30c2c56eeb2e2532a4a5f6d67aa64e9e58c7b9 (diff)
downloadbcm5719-llvm-8e1a913cfacad6de89eaa3cdd95d19fbe1743ac6.tar.gz
bcm5719-llvm-8e1a913cfacad6de89eaa3cdd95d19fbe1743ac6.zip
Sema: Recover when a function template is in an extern "C" block
llvm-svn: 226135
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaDecl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 007470344f1..9b9a6afbfd8 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -7010,12 +7010,12 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
// Check that we can declare a template here.
if (CheckTemplateDeclScope(S, TemplateParams))
- return nullptr;
+ NewFD->setInvalidDecl();
// A destructor cannot be a template.
if (Name.getNameKind() == DeclarationName::CXXDestructorName) {
Diag(NewFD->getLocation(), diag::err_destructor_template);
- return nullptr;
+ NewFD->setInvalidDecl();
}
// If we're adding a template to a dependent context, we may need to
OpenPOWER on IntegriCloud