Implement sema checking for noreturn.

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

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index fb1820d8ecba3089f44cc974f37b5a9519d12466..306fcaccfa5c2d5a109b79a857593f3fd842f2aa 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1598,6 +1598,8 @@ def ext_return_has_expr : ExtWarn<
   "void %select{function|method}1 %0 should not return a value">;
 def ext_return_has_void_expr : Extension<
   "void %select{function|method}1 %0 should not return void expression">;
+def err_noreturn_function_has_return_expr : Error<
+  "function %0 declared 'noreturn' should not return">;
 
 def err_shufflevector_non_vector : Error<
   "first two arguments to __builtin_shufflevector must be vectors">;

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index cf240291c7b26767ca6ee230840b46623457fa6a..311496c720e66445a546a1c42c87be2a6966b18a 100644 (file)
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -788,9 +788,14 @@ Sema::ActOnReturnStmt(SourceLocation ReturnLoc, ExprArg rex) {
     return ActOnBlockReturnStmt(ReturnLoc, RetValExp);
 
   QualType FnRetType;
-  if (FunctionDecl *FD = getCurFunctionDecl())
+  if (const FunctionDecl *FD = getCurFunctionDecl()) {
     FnRetType = FD->getResultType();
-  else if (ObjCMethodDecl *MD = getCurMethodDecl())
+    if (FD->hasAttr<NoReturnAttr>()) {
+      Diag(ReturnLoc, diag::err_noreturn_function_has_return_expr)
+        << getCurFunctionOrMethodDecl()->getDeclName();
+      return StmtError();
+    }
+  } else if (ObjCMethodDecl *MD = getCurMethodDecl())
     FnRetType = MD->getResultType();
   else // If we don't have a function/method context, bail.
     return StmtError();

diff --git a/test/Sema/attr-noreturn.c b/test/Sema/attr-noreturn.c
index 35c2bb5fdb460d7c33605750dc553b83121e2584..1335c765b3d2c035dd0b4eb5644145dd06395935 100644 (file)
--- a/test/Sema/attr-noreturn.c
+++ b/test/Sema/attr-noreturn.c
@@ -12,3 +12,10 @@ int f1() __attribute__((noreturn));
 int g0 __attribute__((noreturn)); // expected-warning {{'noreturn' attribute only applies to function types}}
 
 int f2() __attribute__((noreturn(1, 2))); // expected-error {{attribute requires 0 argument(s)}}
+
+void f3() __attribute__((noreturn));
+
+void f3() {
+  return;  // expected-error {{function 'f3' declared 'noreturn' should not return}}
+}
+