diff options
| author | Kevin Enderby <enderby@apple.com> | 2011-04-27 21:02:27 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2011-04-27 21:02:27 +0000 |
| commit | 886894cb70ae821c6aa21a13d1380b23827cbddc (patch) | |
| tree | ffec76243044a393344023edeb3f07c8782bb8f7 /llvm/lib/Target/ARM/Disassembler | |
| parent | 5394c70d1ec05d12d14260f88ce348d2c854f7c3 (diff) | |
| download | bcm5719-llvm-886894cb70ae821c6aa21a13d1380b23827cbddc.tar.gz bcm5719-llvm-886894cb70ae821c6aa21a13d1380b23827cbddc.zip | |
Fix a bug in the case that there is no add or subtract symbol and the offset
value is zero so it does not add a NULL expr operand.
llvm-svn: 130330
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler')
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp index 942a74b9088..642829cdab0 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp @@ -3800,8 +3800,12 @@ bool ARMBasicMCBuilder::tryAddingSymbolicOperand(uint64_t Value, Expr = MCBinaryExpr::CreateAdd(Add, Off, *Ctx); else Expr = Add; - } else - Expr = Off; + } else { + if (Off != 0) + Expr = Off; + else + Expr = MCConstantExpr::Create(0, *Ctx); + } if (SymbolicOp.VariantKind == LLVMDisassembler_VariantKind_ARM_HI16) MI.addOperand(MCOperand::CreateExpr(ARMMCExpr::CreateUpper16(Expr, *Ctx))); |
