diff options
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 25 | ||||
| -rw-r--r-- | clang/test/Sema/outof-range-constant-compare.c | 8 |
2 files changed, 22 insertions, 11 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index da24667804b..d1ba64e8138 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -4020,20 +4020,23 @@ struct IntRange { if (const ComplexType *CT = dyn_cast<ComplexType>(T)) T = CT->getElementType().getTypePtr(); - // For enum types, use the known bit width of the enumerators. if (const EnumType *ET = dyn_cast<EnumType>(T)) { - EnumDecl *Enum = ET->getDecl(); - if (!Enum->isCompleteDefinition()) - return IntRange(C.getIntWidth(QualType(T, 0)), false); + if (C.getLangOpts().CPlusPlus) { + // For enum types, use the known bit width of the enumerators. + EnumDecl *Enum = ET->getDecl(); + if (!Enum->isCompleteDefinition()) + return IntRange(C.getIntWidth(QualType(T, 0)), false); - unsigned NumPositive = Enum->getNumPositiveBits(); - unsigned NumNegative = Enum->getNumNegativeBits(); + unsigned NumPositive = Enum->getNumPositiveBits(); + unsigned NumNegative = Enum->getNumNegativeBits(); - if (NumNegative == 0) - return IntRange(NumPositive, true/*NonNegative*/); - else - return IntRange(std::max(NumPositive + 1, NumNegative), - false/*NonNegative*/); + if (NumNegative == 0) + return IntRange(NumPositive, true/*NonNegative*/); + else + return IntRange(std::max(NumPositive + 1, NumNegative), + false/*NonNegative*/); + } else + T = C.getCanonicalType(ET->getDecl()->getIntegerType().getTypePtr()); } const BuiltinType *BT = cast<BuiltinType>(T); diff --git a/clang/test/Sema/outof-range-constant-compare.c b/clang/test/Sema/outof-range-constant-compare.c index 4b1637c46c5..5aa7bc8a80e 100644 --- a/clang/test/Sema/outof-range-constant-compare.c +++ b/clang/test/Sema/outof-range-constant-compare.c @@ -147,3 +147,11 @@ int main() return 1; } + +typedef enum { + alpha=0, bravo, charlie, delta, echo +} named_t; + +static int bar(named_t foo) { + return foo > 42; +} |
