From 02408c67c404267a23ee1e1ab23344fc4b1bff17 Mon Sep 17 00:00:00 2001 From: Steve Naroff Date: Thu, 7 Aug 2008 14:08:16 +0000 Subject: [PATCH] Sema::ActOnEnumBody(): handle nested enum redefinitions. Fixes Nested enum redefinition crashes sema. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54463 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDecl.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index b513dde466..61e29de8d4 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2223,11 +2223,23 @@ Sema::DeclTy *Sema::ActOnEnumConstant(Scope *S, DeclTy *theEnumDecl, return New; } +// FIXME: For consistency with ActOnFields(), we should have the parser +// pass in the source location for the left/right braces. void Sema::ActOnEnumBody(SourceLocation EnumLoc, DeclTy *EnumDeclX, DeclTy **Elements, unsigned NumElements) { EnumDecl *Enum = cast(static_cast(EnumDeclX)); - assert(!Enum->isDefinition() && "Enum redefinitions can't reach here"); + if (Enum && Enum->isDefinition()) { + // Diagnose code like: + // enum e0 { + // E0 = sizeof(enum e0 { E1 }) + // }; + Diag(Enum->getLocation(), diag::err_nested_redefinition, + Enum->getName()); + Diag(EnumLoc, diag::err_previous_definition); + Enum->setInvalidDecl(); + return; + } // TODO: If the result value doesn't fit in an int, it must be a long or long // long value. ISO C does not support this, but GCC does as an extension, // emit a warning. -- 2.40.0