diff options
| author | Chris Lattner <sabre@nondot.org> | 2011-02-18 21:16:39 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2011-02-18 21:16:39 +0000 |
| commit | febb5b884b1bb946b83800cb77cbea0119570d84 (patch) | |
| tree | 400179903207b30c74d3cf2435a3c8425ac86cbc | |
| parent | f4699d14b03d805ad9ccaa6288836ac2a8612925 (diff) | |
fix rdar://9024687, a crash on invalid that we used to silently ignore.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125962 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseExpr.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaLookup.cpp | 5 | ||||
| -rw-r--r-- | test/Sema/scope-check.c | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index ad673f8198..9d7ec9d454 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -148,6 +148,8 @@ def err_expected_semi_for : Error<"expected ';' in 'for' statement specifier">; def err_expected_colon_after : Error<"expected ':' after %0">; def err_label_end_of_compound_statement : Error< "label at end of compound statement: expected statement">; +def err_address_of_label_outside_fn : Error< + "use of address-of-label extension outside of a function body">; def err_expected_string_literal : Error<"expected string literal">; def err_expected_asm_operand : Error< "expected string literal or '[' for asm operand">, CatInlineAsm; diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index 84d77300eb..616c251583 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -794,6 +794,9 @@ ExprResult Parser::ParseCastExpression(bool isUnaryExpression, if (Tok.isNot(tok::identifier)) return ExprError(Diag(Tok, diag::err_expected_ident)); + if (getCurScope()->getFnParent() == 0) + return ExprError(Diag(Tok, diag::err_address_of_label_outside_fn)); + Diag(AmpAmpLoc, diag::ext_gnu_address_of_label); LabelDecl *LD = Actions.LookupOrCreateLabel(Tok.getIdentifierInfo(), Tok.getLocation()); diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index 789f9c9f4f..b4946cf8d6 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -2780,8 +2780,9 @@ LabelDecl *Sema::LookupOrCreateLabel(IdentifierInfo *II, SourceLocation Loc, if (Res == 0) { // If not forward referenced or defined already, create the backing decl. Res = LabelDecl::Create(Context, CurContext, Loc, II); - PushOnScopeChains(Res, isLocalLabel ? CurScope : CurScope->getFnParent(), - true); + Scope *S = isLocalLabel ? CurScope : CurScope->getFnParent(); + assert(S && "Not in a function?"); + PushOnScopeChains(Res, S, true); } return cast<LabelDecl>(Res); diff --git a/test/Sema/scope-check.c b/test/Sema/scope-check.c index 1a2fc2b360..a9494d3e3f 100644 --- a/test/Sema/scope-check.c +++ b/test/Sema/scope-check.c @@ -229,3 +229,6 @@ void test15(int n, void *pc) { vla[0] = 'a'; } } + +// rdar://9024687 +int test16(int [sizeof &&z]); // expected-error {{use of address-of-label extension outside of a function body}} |