From 2e2d75fb9749b11e46accfce9e845c64192ca743 Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nicholas@mxc.ca>
Date: Thu, 1 Sep 2011 21:09:04 +0000
Subject: Fix the build for us -Werror users. Remove broken emacs mode major
 notation marking a C++ file as C. No functionality change.

llvm-svn: 138963
---
 llvm/lib/MC/MCDisassembler/EDDisassembler.cpp | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 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 227e229..14d735d 100644
--- a/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -239,29 +239,20 @@ EDInst *EDDisassembler::createInst(EDByteReaderCallback byteReader,
   MCInst* inst = new MCInst;
   uint64_t byteSize;
   
-  MCDisassembler::DecodeStatus S;
-  S = Disassembler->getInstruction(*inst,
-                                   byteSize,
-                                   memoryObject,
-                                   address,
-                                   ErrorStream);
-  switch (S) {
-  case MCDisassembler::Fail:
-  case MCDisassembler::SoftFail:
+  if (Disassembler->getInstruction(*inst, byteSize, memoryObject, address,
+                                   ErrorStream) != MCDisassembler::Success) {
     // FIXME: Do something different on soft failure mode?
     delete inst;
     return NULL;
-  case MCDisassembler::Success: {
-    const llvm::EDInstInfo *thisInstInfo = NULL;
-
-    if (InstInfos) {
-      thisInstInfo = &InstInfos[inst->getOpcode()];
-    }
-    
-    EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
-    return sdInst;
   }
+  const llvm::EDInstInfo *thisInstInfo = NULL;
+
+  if (InstInfos) {
+    thisInstInfo = &InstInfos[inst->getOpcode()];
   }
+    
+  EDInst* sdInst = new EDInst(inst, byteSize, *this, thisInstInfo);
+  return sdInst;
 }
 
 void EDDisassembler::initMaps(const MCRegisterInfo &registerInfo) {
-- 
cgit v1.1