From 5ada2a7e27ff7247d2ef7c3338408733a264f976 Mon Sep 17 00:00:00 2001
From: James Molloy <james.molloy@arm.com>
Date: Thu, 1 Sep 2011 22:01:14 +0000
Subject: Fix apparent build error caused by r138948 on certain versions of GCC
 with -Werror. Sorry for the inconvenience.

llvm-svn: 138973
---
 llvm/lib/MC/MCDisassembler/EDDisassembler.cpp | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'llvm/lib/MC/MCDisassembler/EDDisassembler.cpp')

diff --git a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
index 14d735d..68a201b 100644
--- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/llvm/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) {
-- 
cgit v1.1