aboutsummaryrefslogtreecommitdiff
path: root/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
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
commitc9a9b442853ee086492d6ad1384a2de2fea9b43b (patch)
tree31aa2d03a34ef5c2db0cdab79a2fca5415eff025 /lib/Target/ARM/AsmParser/ARMAsmParser.cpp
parentba567d670d32e102a70b106fbfe284835085cb3f (diff)
tBcc is OK to be predicated in Thumb2 outside of IT blocks (obviously).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138873 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
-rw-r--r--lib/Target/ARM/AsmParser/ARMAsmParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 67176ad5a3..274e14db9c 100644
--- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/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()) {