commit 833a003da082ab0db343e0e640069dfc6813e7d6
author Nick Lewycky <nicholas@mxc.ca> Thu Sep 01 21:09:04 2011 +0000
committer Nick Lewycky <nicholas@mxc.ca> Thu Sep 01 21:09:04 2011 +0000
tree 0bfb376f5f3a88b7a8bd42f44b39f15ef448bd3d
parent 81b4e434d98d4d2ed0a7b493b3ecd09dd7735275

Fix the build for us -Werror users.
Remove broken emacs mode major notation marking a C++ file as C.
No functionality change.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138963 91177308-0d34-0410-b5e6-96231b3b80d8

lib/MC/MCDisassembler/EDDisassembler.cpp

diff --git a/lib/MC/MCDisassembler/EDDisassembler.cpp b/lib/MC/MCDisassembler/EDDisassembler.cpp
index 227e229..14d735d 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.cpp
+++ b/lib/MC/MCDisassembler/EDDisassembler.cpp
@@ -239,29 +239,20 @@
   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;
+  }
+  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;
 }
 
 void EDDisassembler::initMaps(const MCRegisterInfo &registerInfo) {