[cfe-commits] r62884 - in /cfe/trunk: lib/Sema/SemaInit.cpp test/Sema/designated-initializers.c

[Douglas Gregor]

Author: dgregor
Date: Fri Jan 23 16:22:29 2009
New Revision: 62884

URL: http://llvm.org/viewvc/llvm-project?rev=62884&view=rev
Log:
More APSInt appeasement

Modified:
    cfe/trunk/lib/Sema/SemaInit.cpp
    cfe/trunk/test/Sema/designated-initializers.c

Modified: cfe/trunk/lib/Sema/SemaInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=62884&r1=62883&r2=62884&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaInit.cpp (original)
+++ cfe/trunk/lib/Sema/SemaInit.cpp Fri Jan 23 16:22:29 2009
@@ -671,18 +671,26 @@
       if (CheckArrayDesignatorExpr(*this, StartIndex, StartValue) ||
           CheckArrayDesignatorExpr(*this, EndIndex, EndValue))
         Invalid = true;
-      else if (EndValue < StartValue) {
-        Diag(D.getEllipsisLoc(), diag::err_array_designator_empty_range)
-          << StartValue.toString(10) << EndValue.toString(10) 
-          << StartIndex->getSourceRange() << EndIndex->getSourceRange();
-        Invalid = true;
-      } else {
-        Designators.push_back(ASTDesignator(InitExpressions.size(),
-                                            D.getLBracketLoc(), 
-                                            D.getEllipsisLoc(),
-                                            D.getRBracketLoc()));
-        InitExpressions.push_back(StartIndex);
-        InitExpressions.push_back(EndIndex);
+      else {
+        // Make sure we're comparing values with the same bit width.
+        if (StartValue.getBitWidth() > EndValue.getBitWidth())
+          EndValue.extend(StartValue.getBitWidth());
+        else if (StartValue.getBitWidth() < EndValue.getBitWidth())
+          StartValue.extend(EndValue.getBitWidth());
+
+        if (EndValue < StartValue) {
+          Diag(D.getEllipsisLoc(), diag::err_array_designator_empty_range)
+            << StartValue.toString(10) << EndValue.toString(10) 
+            << StartIndex->getSourceRange() << EndIndex->getSourceRange();
+          Invalid = true;
+        } else {
+          Designators.push_back(ASTDesignator(InitExpressions.size(),
+                                              D.getLBracketLoc(), 
+                                              D.getEllipsisLoc(),
+                                              D.getRBracketLoc()));
+          InitExpressions.push_back(StartIndex);
+          InitExpressions.push_back(EndIndex);
+        }
       }
       break;
     }

Modified: cfe/trunk/test/Sema/designated-initializers.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/designated-initializers.c?rev=62884&r1=62883&r2=62884&view=diff

==============================================================================
--- cfe/trunk/test/Sema/designated-initializers.c (original)
+++ cfe/trunk/test/Sema/designated-initializers.c Fri Jan 23 16:22:29 2009
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify -arch x86_64 %s
 
 int complete_array_from_init[] = { 1, 2, [10] = 5, 1, 2, [5] = 2, 6 };