summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2011-08-31 18:29:05 +0000
committerJim Grosbach <grosbach@apple.com>2011-08-31 18:29:05 +0000
commitc61fc8f301a1e140553295c561bcba981f8c15f1 (patch)
tree0870800e141e1bcbf7adcc5d9689e1109a447214 /llvm/lib
parent7c3bdede25a09d7bfd677bb724a6a03b16fa90dd (diff)
downloadbcm5719-llvm-c61fc8f301a1e140553295c561bcba981f8c15f1.tar.gz
bcm5719-llvm-c61fc8f301a1e140553295c561bcba981f8c15f1.zip
tBcc is OK to be predicated in Thumb2 outside of IT blocks (obviously).
llvm-svn: 138873
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 67176ad5a37..274e14db9c0 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -3337,10 +3337,10 @@ validateInstruction(MCInst &Inst,
"', but expected '" +
ARMCondCodeToString(ARMCC::CondCodes(ITCond)) + "'");
}
- // Check for non-'al' condition codes outside of the IT block.
+ // Check for non-'al' condition codes outside of the IT block.
} else if (isThumbTwo() && MCID.isPredicable() &&
Inst.getOperand(MCID.findFirstPredOperandIdx()).getImm() !=
- ARMCC::AL)
+ ARMCC::AL && Inst.getOpcode() != ARM::tBcc)
return Error(Loc, "predicated instructions must be in IT block");
switch (Inst.getOpcode()) {
OpenPOWER on IntegriCloud