1. Sort switch cases using APInt safe comparison.

2. Make sure debug output of APInt values is safe for all bit widths.

llvm-svn: 34855

1 files changed, 2 insertions, 2 deletions

diff --git a/llvm/lib/Transforms/Utils/LowerSwitch.cpp b/llvm/lib/Transforms/Utils/LowerSwitch.cpp
index bcbadd0040c..c005d42197e 100644
--- a/llvm/lib/Transforms/Utils/LowerSwitch.cpp
+++ b/llvm/lib/Transforms/Utils/LowerSwitch.cpp
@@ -59,7 +59,7 @@ namespace {
 
       const ConstantInt* CI1 = cast<const ConstantInt>(C1.first);
       const ConstantInt* CI2 = cast<const ConstantInt>(C2.first);
-      return CI1->getZExtValue() < CI2->getZExtValue();
+      return CI1->getValue().ult(CI2->getValue());
     }
   };
 
@@ -128,7 +128,7 @@ BasicBlock* LowerSwitch::switchConvert(CaseItr Begin, CaseItr End,
 
   Case& Pivot = *(Begin + Mid);
   DOUT << "Pivot ==> "
-       << cast<ConstantInt>(Pivot.first)->getSExtValue() << "\n";
+       << cast<ConstantInt>(Pivot.first)->getValue().toStringSigned(10) << "\n";
 
   BasicBlock* LBranch = switchConvert(LHS.begin(), LHS.end(), Val,
                                       OrigBlock, Default);