diff options
| author | Chad Rosier <mcrosier@apple.com> | 2013-04-09 19:59:12 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2013-04-09 19:59:12 +0000 |
| commit | 3eb6d7fcd024b67d548e4c3a075682d7cff1599e (patch) | |
| tree | 929014416a0efd92f59585c2a8afc20a40dd55fc /lib/Target/X86/AsmParser | |
| parent | 239e1e49383ff6a1368869bb4b8e9b1c16629225 (diff) | |
| download | external_llvm-3eb6d7fcd024b67d548e4c3a075682d7cff1599e.zip external_llvm-3eb6d7fcd024b67d548e4c3a075682d7cff1599e.tar.gz external_llvm-3eb6d7fcd024b67d548e4c3a075682d7cff1599e.tar.bz2 | |
Revert r179115 as it looks to have killed the ASan tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179120 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/AsmParser')
| -rw-r--r-- | lib/Target/X86/AsmParser/X86AsmParser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp index 11248bd..85caa04 100644 --- a/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -1130,7 +1130,7 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg, if (ParseRegister(TmpReg, Start, End)) { const MCExpr *Disp; SMLoc IdentStart = Tok.getLoc(); - if (getParser().parsePrimaryExpr(Disp, End)) + if (getParser().parseExpression(Disp, End)) return 0; if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, IdentStart)) @@ -1182,7 +1182,7 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg, SM.onRegister(TmpReg); UpdateLocLex = false; break; - } else if (!getParser().parsePrimaryExpr(Disp, End)) { + } else if (!getParser().parseExpression(Disp, End)) { SM.onDispExpr(); UpdateLocLex = false; break; @@ -1324,7 +1324,7 @@ X86Operand *X86AsmParser::ParseIntelMemOperand(unsigned SegReg, const MCExpr *Disp = 0; SMLoc IdentStart = Tok.getLoc(); - if (getParser().parsePrimaryExpr(Disp, End)) + if (getParser().parseExpression(Disp, End)) return 0; if (!isParsingInlineAsm()) @@ -1401,7 +1401,7 @@ X86Operand *X86AsmParser::ParseIntelOffsetOfOperator(SMLoc Start) { SMLoc End; const MCExpr *Val; - if (getParser().parsePrimaryExpr(Val, End)) + if (getParser().parseExpression(Val, End)) return ErrorOperand(Start, "Unable to parse expression!"); // Don't emit the offset operator. @@ -1437,7 +1437,7 @@ X86Operand *X86AsmParser::ParseIntelOperator(SMLoc Start, unsigned OpKind) { SMLoc End; const MCExpr *Val; - if (getParser().parsePrimaryExpr(Val, End)) + if (getParser().parseExpression(Val, End)) return 0; unsigned Length = 0, Size = 0, Type = 0; |