diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | test/Parser/control-scope.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 98b8dbc9c0..c9b5405fbe 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3497,7 +3497,7 @@ Sema::DeclTy *Sema::ActOnEnumConstant(Scope *S, DeclTy *theEnumDecl, else Diag(IdLoc, diag::err_redefinition) << Id; Diag(PrevDecl->getLocation(), diag::note_previous_definition); - Val->Destroy(Context); + if (Val) Val->Destroy(Context); return 0; } } diff --git a/test/Parser/control-scope.c b/test/Parser/control-scope.c index 3d588d63b4..4beed7eecd 100644 --- a/test/Parser/control-scope.c +++ b/test/Parser/control-scope.c @@ -1,8 +1,8 @@ -// RUN: not clang %s -std=c90 && +// RUN: clang %s -std=c90 -verify && // RUN: clang %s -std=c99 int f (int z) { - if (z + sizeof (enum {a})) - return 1 + sizeof (enum {a}); + if (z + sizeof (enum {a})) // expected-note {{previous definition is here}} + return 1 + sizeof (enum {a}); // expected-error {{redefinition of enumerator 'a'}} return 0; } |