fix rdar://9024687, a crash on invalid that we used to silently ignore.
llvm-svn: 125962
This commit is contained in:
parent
d1fd6963f5
commit
9ba479bd2c
|
@ -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;
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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}}
|
||||
|
|
Loading…
Reference in New Issue