Revert "Properly consider the range of enum for range comparisons in C mode"

The approach r183084 took was wrong, back it out.

llvm-svn: 183575

2 files changed, 11 insertions, 22 deletions

diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index d1ba64e8138..da24667804b 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -4020,23 +4020,20 @@ 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)) {
-      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);
+      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*/);
-      } else
-        T = C.getCanonicalType(ET->getDecl()->getIntegerType().getTypePtr());
+      if (NumNegative == 0)
+        return IntRange(NumPositive, true/*NonNegative*/);
+      else
+        return IntRange(std::max(NumPositive + 1, NumNegative),
+                        false/*NonNegative*/);
     }
 
     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 5aa7bc8a80e..4b1637c46c5 100644
--- a/clang/test/Sema/outof-range-constant-compare.c
+++ b/clang/test/Sema/outof-range-constant-compare.c
@@ -147,11 +147,3 @@ int main()
 
     return 1;
 }
-
-typedef enum {
-    alpha=0, bravo, charlie, delta, echo
-} named_t;
-
-static int bar(named_t foo) {
-    return foo > 42;
-}