diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -5734,19 +5734,24 @@ } // If we have a '#', it's an immediate offset, else assume it's a register - // offset. Be friendly and also accept a plain integer (without a leading - // hash) for gas compatibility. + // offset. Be friendly and also accept a plain integer or expression (without + // a leading hash) for gas compatibility. if (Parser.getTok().is(AsmToken::Hash) || Parser.getTok().is(AsmToken::Dollar) || + Parser.getTok().is(AsmToken::LParen) || Parser.getTok().is(AsmToken::Integer)) { - if (Parser.getTok().isNot(AsmToken::Integer)) - Parser.Lex(); // Eat '#' or '$'. + bool StartsWithParen = false; + if (Parser.getTok().isNot(AsmToken::Integer)) { + StartsWithParen = Parser.getTok().is(AsmToken::LParen); + Parser.Lex(); // Eat '#' or '$' or '(' + } E = Parser.getTok().getLoc(); bool isNegative = getParser().getTok().is(AsmToken::Minus); const MCExpr *Offset; - if (getParser().parseExpression(Offset)) + if (getParser().parseExpression(Offset)) { return true; + } // The expression has to be a constant. Memory references with relocations // don't come through here, as they use the