diff options
| -rw-r--r-- | lib/Parse/ParseStmt.cpp | 1 | ||||
| -rw-r--r-- | test/Sema/recover-goto.c | 3 | ||||
| -rw-r--r-- | test/SemaObjC/crash-label.m | 11 | ||||
| -rw-r--r-- | test/SemaObjC/method-no-context.m | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index af927285a4..6c240e608c 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -519,6 +519,7 @@ StmtResult Parser::ParseCompoundStatementBody(bool isStmtExpr) { // We broke out of the while loop because we found a '}' or EOF. if (Tok.isNot(tok::r_brace)) { Diag(Tok, diag::err_expected_rbrace); + Diag(LBraceLoc, diag::note_matching) << "{"; return StmtError(); } diff --git a/test/Sema/recover-goto.c b/test/Sema/recover-goto.c index 0d665f9a60..0e8f6d3da4 100644 --- a/test/Sema/recover-goto.c +++ b/test/Sema/recover-goto.c @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only %s -verify -void a() {goto A; // expected-error {{use of undeclared label}} +void a() { // expected-note {{to match this '{'}} + goto A; // expected-error {{use of undeclared label}} // expected-error {{expected '}'}} diff --git a/test/SemaObjC/crash-label.m b/test/SemaObjC/crash-label.m index d0a5ae40c7..ffcb46344e 100644 --- a/test/SemaObjC/crash-label.m +++ b/test/SemaObjC/crash-label.m @@ -2,8 +2,9 @@ - (NSDictionary*) _executeScript:(NSString *)source { // expected-error 2 {{expected a type}} \ // expected-error {{missing context for method declaration}} - Exit: [nilArgs release]; // expected-error {{use of undeclared identifier}} - } - - (NSDictionary *) _setupKernelStandardMode:(NSString *)source { // expected-error 2 {{expected a type}} \ -expected-error {{missing context for method declaration}} - Exit: if(_ciKernel && !success ) { // expected-error {{use of undeclared identifier}} // expected-error 2 {{expected}} +Exit: [nilArgs release]; // expected-error {{use of undeclared identifier}} +} +- (NSDictionary *) _setupKernelStandardMode:(NSString *)source { // expected-error 2 {{expected a type}} \ +expected-error {{missing context for method declaration}} \ +expected-note{{to match this '{'}} + Exit: if(_ciKernel && !success ) { // expected-error {{use of undeclared identifier}} // expected-error 2 {{expected}} expected-note{{to match this '{'}} diff --git a/test/SemaObjC/method-no-context.m b/test/SemaObjC/method-no-context.m index c88205dfd2..3c45beef04 100644 --- a/test/SemaObjC/method-no-context.m +++ b/test/SemaObjC/method-no-context.m @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s -- im0 { int a; return 0; // expected-error{{missing context for method declaration}} +- im0 { // expected-note{{to match this '{'}} expected-error{{missing context for method declaration}} + int a; return 0; // expected-error{{expected '}'}} |