aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2009-01-24 23:09:00 +0000
committerEli Friedman <eli.friedman@gmail.com>2009-01-24 23:09:00 +0000
commitdca2b7314f73fbb1e897befdc4f0ddaa9905d72c (patch)
treee5da9e3c700be38b35b6567575268a19a5b3f2c8
parent769e411b72465a63454cdd416ff26ff313d43505 (diff)
PR3062: statement expressions should be illegal at file scope. I don't
think this has any significant effects at the moment, but it could matter if we start constant-folding statement expressions like gcc does. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62943 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang/Basic/DiagnosticKinds.def2
-rw-r--r--lib/Sema/SemaExpr.cpp5
-rw-r--r--test/Sema/stmt_exprs.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 13f5403745..93b023e560 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -1301,6 +1301,8 @@ DIAG(ext_typecheck_comparison_of_distinct_pointers, WARNING,
"comparison of distinct pointer types (%0 and %1)")
DIAG(err_typecheck_assign_const, ERROR,
"read-only variable is not assignable")
+DIAG(err_stmtexpr_file_scope, ERROR,
+ "statement expression not allowed at file scope")
DIAG(err_invalid_this_use, ERROR,
"invalid use of 'this' outside of a nonstatic member function")
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index d4babb4baa..1d55ed7c3a 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3940,6 +3940,11 @@ Sema::ExprResult Sema::ActOnStmtExpr(SourceLocation LPLoc, StmtTy *substmt,
assert(SubStmt && isa<CompoundStmt>(SubStmt) && "Invalid action invocation!");
CompoundStmt *Compound = cast<CompoundStmt>(SubStmt);
+ bool isFileScope = getCurFunctionOrMethodDecl() == 0;
+ if (isFileScope) {
+ return Diag(LPLoc, diag::err_stmtexpr_file_scope);
+ }
+
// FIXME: there are a variety of strange constraints to enforce here, for
// example, it is not possible to goto into a stmt expression apparently.
// More semantic analysis is needed.
diff --git a/test/Sema/stmt_exprs.c b/test/Sema/stmt_exprs.c
index ee835a355d..0d6fe8585f 100644
--- a/test/Sema/stmt_exprs.c
+++ b/test/Sema/stmt_exprs.c
@@ -20,3 +20,5 @@ int test5() { return ({L1: L2: L3: 5;}); }
int test6() { return ({5;}); }
void test7() { ({5;}); } // expected-warning {{expression result unused}}
+// PR3062
+int x[({10;})]; // expected-error {{illegal statement expression}}