2 files changed, 48 insertions, 1 deletions

diff --git a/lib/Transforms/NaCl/PromoteIntegers.cpp b/lib/Transforms/NaCl/PromoteIntegers.cpp
index f1e45ae367..8749cdf2e5 100644
--- a/lib/Transforms/NaCl/PromoteIntegers.cpp
+++ b/lib/Transforms/NaCl/PromoteIntegers.cpp
@@ -33,6 +33,8 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/IntegersSubset.h"
+#include "llvm/Support/IntegersSubsetMapping.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
@@ -580,6 +582,32 @@ static void convertInstruction(Instruction *Inst, ConversionState &State) {
                           Phi->getIncomingBlock(I));
     }
     State.recordConverted(Phi, NewPhi);
+  } else if (SwitchInst *Switch = dyn_cast<SwitchInst>(Inst)) {
+    SwitchInst *NewInst = SwitchInst::Create(
+        State.getConverted(Switch->getCondition()),
+        Switch->getDefaultDest(),
+        Switch->getNumCases(),
+        Switch);
+    for (SwitchInst::CaseIt I = Switch->case_begin(),
+             E = Switch->case_end();
+         I != E; ++I) {
+      // Build a new case from the ranges that map to the successor BB. Each
+      // range consists of a high and low value which are typed, so the ranges
+      // must be rebuilt and a new case constructed from them.
+      IntegersSubset CaseRanges = I.getCaseValueEx();
+      IntegersSubsetToBB CaseBuilder;
+      for (unsigned RI = 0, RE = CaseRanges.getNumItems(); RI < RE; ++RI) {
+        CaseBuilder.add(
+            IntItem::fromConstantInt(cast<ConstantInt>(convertConstant(
+                CaseRanges.getItem(RI).getLow().toConstantInt()))),
+            IntItem::fromConstantInt(cast<ConstantInt>(convertConstant(
+                CaseRanges.getItem(RI).getHigh().toConstantInt()))));
+      }
+      IntegersSubset Case = CaseBuilder.getCase();
+      NewInst->addCase(Case, I.getCaseSuccessor());
+    }
+    Switch->eraseFromParent();
+    //State.recordConverted(Switch, NewInst);
   } else {
     errs() << *Inst<<"\n";
     llvm_unreachable("unhandled instruction");
diff --git a/test/Transforms/NaCl/promote-integers.ll b/test/Transforms/NaCl/promote-integers.ll
index 19d5321c47..7fca6e1078 100644
--- a/test/Transforms/NaCl/promote-integers.ll
+++ b/test/Transforms/NaCl/promote-integers.ll
@@ -352,4 +352,23 @@ define void @undefoperand(i32 %a) {
   %a40 = zext i32 %a to i40
   %au = and i40 %a40, undef
   ret void
-}
\ No newline at end of file
+}
+
+; CHECK: @switch
+; CHECK-NEXT: %a24 = zext i16 %a to i32
+; CHECK-NEXT: switch i32 %a24, label %end [
+; CHECK-NEXT: i32 0, label %if1
+; CHECK-NEXT: i32 1, label %if2
+define void @switch(i16 %a) {
+  %a24 = zext i16 %a to i24
+  switch i24 %a24, label %end [
+    i24 0, label %if1
+    i24 1, label %if2
+  ]
+if1:
+  ret void
+if2:
+  ret void
+end:
+  ret void
+}