1 files changed, 5 insertions, 0 deletions
diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
index f4d453966b..62fac06ceb 100644
--- a/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -33,6 +33,11 @@ FastISel::SelectInstructions(BasicBlock::iterator Begin, BasicBlock::iterator En
         return I;
       }
       unsigned ResultReg = FastEmit_rr(VT.getSimpleVT(), ISD::ADD, Op0, Op1);
+      if (ResultReg == 0) {
+        // Target-specific code wasn't able to find a machine opcode for
+        // the given ISD opcode and type. Halt "fast" selection and bail.
+        return I;
+      }
       ValueMap[I] = ResultReg;
       break;
     }