Clean up enum constants so that they're finally sane. Fixes PR3173 and a
recently introduced crash.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91070 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 6574ad2..c7a47c9 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -5694,6 +5694,7 @@
// First value, set to zero.
EltTy = Context.IntTy;
EnumVal.zextOrTrunc(static_cast<uint32_t>(Context.getTypeSize(EltTy)));
+ EnumVal.setIsSigned(true);
}
}
@@ -5908,19 +5909,8 @@
// enumerator value fits in an int, type it as an int, otherwise type it the
// same as the enumerator decl itself. This means that in "enum { X = 1U }"
// that X has type 'int', not 'unsigned'.
- if (ECD->getType() == Context.IntTy) {
- // Make sure the init value is signed.
- llvm::APSInt IV = ECD->getInitVal();
- IV.setIsSigned(true);
- ECD->setInitVal(IV);
-
- if (getLangOptions().CPlusPlus)
- // C++ [dcl.enum]p4: Following the closing brace of an
- // enum-specifier, each enumerator has the type of its
- // enumeration.
- ECD->setType(EnumType);
- continue; // Already int type.
- }
+ if (!getLangOptions().CPlusPlus && ECD->getType() == Context.IntTy)
+ continue;
// Determine whether the value fits into an int.
llvm::APSInt InitVal = ECD->getInitVal();
@@ -5935,7 +5925,7 @@
QualType NewTy;
unsigned NewWidth;
bool NewSign;
- if (FitsInInt) {
+ if (FitsInInt && !getLangOptions().CPlusPlus) {
NewTy = Context.IntTy;
NewWidth = IntWidth;
NewSign = true;