From e878eb035b343d7d819c092102364ec9849716ae Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 18 Dec 2008 02:03:48 +0000 Subject: [PATCH] This is valid in C++. void foo() { return foo(); } git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61188 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaStmt.cpp | 12 ++++++++---- test/SemaCXX/statements.cpp | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 test/SemaCXX/statements.cpp diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 0604470c1d..97cad60a19 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -762,11 +762,15 @@ Sema::ActOnReturnStmt(SourceLocation ReturnLoc, ExprTy *rex) { unsigned D = diag::ext_return_has_expr; if (RetValExp->getType()->isVoidType()) D = diag::ext_return_has_void_expr; - NamedDecl *CurDecl = getCurFunctionOrMethodDecl(); - Diag(ReturnLoc, D) - << CurDecl->getDeclName() << isa(CurDecl) - << RetValExp->getSourceRange(); + // return (some void expression); is legal in C++. + if (D != diag::ext_return_has_void_expr || + !getLangOptions().CPlusPlus) { + NamedDecl *CurDecl = getCurFunctionOrMethodDecl(); + Diag(ReturnLoc, D) + << CurDecl->getDeclName() << isa(CurDecl) + << RetValExp->getSourceRange(); + } } return new ReturnStmt(ReturnLoc, RetValExp); } diff --git a/test/SemaCXX/statements.cpp b/test/SemaCXX/statements.cpp new file mode 100644 index 0000000000..bfd8af5fa9 --- /dev/null +++ b/test/SemaCXX/statements.cpp @@ -0,0 +1,5 @@ +// RUN: clang %s -fsyntax-only -pedantic + +void foo() { + return foo(); +} -- 2.40.0