[llvm-commits] [llvm] r126181 - /llvm/trunk/tools/llvm-mc/Disassembler.cpp

[Sean Callanan]

Author: spyffe
Date: Mon Feb 21 20:09:15 2011
New Revision: 126181

URL: http://llvm.org/viewvc/llvm-project?rev=126181&view=rev
Log:
Fixed llvm-mc in edis mode to use the result of
operand.evaluate as an error code, not as the
contents of the operand.

Modified:
    llvm/trunk/tools/llvm-mc/Disassembler.cpp

Modified: llvm/trunk/tools/llvm-mc/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?rev=126181&r1=126180&r2=126181&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Mon Feb 21 20:09:15 2011
@@ -328,7 +328,10 @@
     
     uint64_t evaluatedResult;
     void *Arg[] = { disassembler, &Out };
-    evaluatedResult = operand->evaluate(evaluatedResult, verboseEvaluator, Arg);
+    if (operand->evaluate(evaluatedResult, verboseEvaluator, Arg)) {
+      errs() << "error: Couldn't evaluate an operand\n";
+      return -1;
+    }
     Out << "=" << evaluatedResult << " ";
   }