1 files changed, 17 insertions, 9 deletions
diff --git a/lib/MC/MCDisassembler/EDDisassembler.cpp b/lib/MC/MCDisassembler/EDDisassembler.cpp
index 14d735dbc7..68a201b96a 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -239,20 +239,28 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader,
   MCInst* inst = new MCInst;
   uint64_t byteSize;
   
-  if (Disassembler->getInstruction(*inst, byteSize, memoryObject, address,
-                                   ErrorStream) != MCDisassembler::Success) {
+  MCDisassembler::DecodeStatus S;
+  S = Disassembler->getInstruction(*inst, byteSize, memoryObject, address,
+                                   ErrorStream);
+  switch (S) {
+  case MCDisassembler::Fail:
+  case MCDisassembler::SoftFail:
     // FIXME: Do something different on soft failure mode?
     delete inst;
     return NULL;
-  }
-  const llvm::EDInstInfo *thisInstInfo = NULL;
+    
+  case MCDisassembler::Success: {
+    const llvm::EDInstInfo *thisInstInfo = NULL;
 
-  if (InstInfos) {
-    thisInstInfo = &InstInfos[inst->getOpcode()];
-  }
+    if (InstInfos) {
+      thisInstInfo = &InstInfos[inst->getOpcode()];
+    }
     
-  EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
-  return sdInst;
+    EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
+    return sdInst;
+  }
+  }
+  return NULL;
 }
 
 void EDDisassembler::initMaps(const MCRegisterInfo &registerInfo) {