summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/Disassembler
diff options
context:
space:
mode:
authorJohnny Chen <johnny.chen@apple.com>2010-04-16 23:02:25 +0000
committerJohnny Chen <johnny.chen@apple.com>2010-04-16 23:02:25 +0000
commited9bee150b1c29af60671b5118be91e1ce6427cd (patch)
tree44a9f3177e3ab6890d11d60e952e33aeb277b7c3 /llvm/lib/Target/ARM/Disassembler
parent5518b81a98c475accdf7ad7248ff00a9fb138419 (diff)
downloadbcm5719-llvm-ed9bee150b1c29af60671b5118be91e1ce6427cd.tar.gz
bcm5719-llvm-ed9bee150b1c29af60671b5118be91e1ce6427cd.zip
Fixed logic error. Should check Builder for validity before calling SetSession
on it. llvm-svn: 101563
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler')
-rw-r--r--llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
index 81fb0850ea9..0e27e16f941 100644
--- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
+++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
@@ -407,7 +407,6 @@ bool ARMDisassembler::getInstruction(MCInst &MI,
});
ARMBasicMCBuilder *Builder = CreateMCBuilder(Opcode, Format);
-
if (!Builder)
return false;
@@ -495,11 +494,11 @@ bool ThumbDisassembler::getInstruction(MCInst &MI,
});
ARMBasicMCBuilder *Builder = CreateMCBuilder(Opcode, Format);
- Builder->SetSession(const_cast<Session *>(&SO));
-
if (!Builder)
return false;
+ Builder->SetSession(const_cast<Session *>(&SO));
+
if (!Builder->Build(MI, insn))
return false;
OpenPOWER on IntegriCloud