More APSInt appeasement

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62884 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 20 insertions, 12 deletions

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 15e2d5d13f..55d11b4398 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -671,18 +671,26 @@ Sema::OwningExprResult Sema::ActOnDesignatedInitializer(Designation &Desig,
       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;
     }