summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
diff options
context:
space:
mode:
authorDaniel Sanders <daniel.sanders@imgtec.com>2016-02-29 11:24:49 +0000
committerDaniel Sanders <daniel.sanders@imgtec.com>2016-02-29 11:24:49 +0000
commit90f0d0b8e3cb0f1ecfd9e4e0636fe778b7615ef9 (patch)
treee520c033244575472ce9a2b0eef823215ded4b23 /llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
parentf5b2a47ac69a91be61a99f16d5b6bbab02e92b77 (diff)
downloadbcm5719-llvm-90f0d0b8e3cb0f1ecfd9e4e0636fe778b7615ef9.tar.gz
bcm5719-llvm-90f0d0b8e3cb0f1ecfd9e4e0636fe778b7615ef9.zip
[mips] Make symbols an acceptable branch target when expanding compare-to-immediate-and-branch macros.
Reviewers: vkalintiris Subscribers: llvm-commits, vkalintiris, dim, seanbruno, dsanders Differential Revision: http://reviews.llvm.org/D15369 llvm-svn: 262213
Diffstat (limited to 'llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp')
-rw-r--r--llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
index 5b1b65f37e5..b848a68ad42 100644
--- a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -2559,7 +2559,8 @@ bool MipsAsmParser::expandBranchImm(MCInst &Inst, SMLoc IDLoc,
assert(ImmOp.isImm() && "expected immediate operand kind");
const MCOperand &MemOffsetOp = Inst.getOperand(2);
- assert(MemOffsetOp.isImm() && "expected immediate operand kind");
+ assert((MemOffsetOp.isImm() || MemOffsetOp.isExpr()) &&
+ "expected immediate or expression operand");
unsigned OpCode = 0;
switch(Inst.getOpcode()) {
OpenPOWER on IntegriCloud