summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
diff options
context:
space:
mode:
authorAndre Vieira <andre.simoesdiasvieira@arm.com>2017-09-11 11:11:17 +0000
committerAndre Vieira <andre.simoesdiasvieira@arm.com>2017-09-11 11:11:17 +0000
commitc429aabb916fbf951abcb1c091239db642ccb233 (patch)
tree140cf4cd82e0060d28ad05b2c3cd36aa0dee8073 /llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
parent9707ba09570740288416dd187eece06375ac79c3 (diff)
downloadbcm5719-llvm-c429aabb916fbf951abcb1c091239db642ccb233.tar.gz
bcm5719-llvm-c429aabb916fbf951abcb1c091239db642ccb233.zip
[ARM] Enable the use of SVC anywhere in an IT block
Differential Revision: https://reviews.llvm.org/D37374 llvm-svn: 312908
Diffstat (limited to 'llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 5e5931dcf21..43135ad2103 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -8717,9 +8717,10 @@ template <> inline bool IsCPSRDead<MCInst>(const MCInst *Instr) {
bool ARMAsmParser::isITBlockTerminator(MCInst &Inst) const {
const MCInstrDesc &MCID = MII.get(Inst.getOpcode());
- // All branch & call instructions terminate IT blocks.
- if (MCID.isTerminator() || MCID.isCall() || MCID.isReturn() ||
- MCID.isBranch() || MCID.isIndirectBranch())
+ // All branch & call instructions terminate IT blocks with the exception of
+ // SVC.
+ if (MCID.isTerminator() || (MCID.isCall() && Inst.getOpcode() != ARM::tSVC) ||
+ MCID.isReturn() || MCID.isBranch() || MCID.isIndirectBranch())
return true;
// Any arithmetic instruction which writes to the PC also terminates the IT
OpenPOWER on IntegriCloud