RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-03 02:53:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r179115 as it looks to have killed the ASan tests.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179120 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chad Rosier 2013-04-09 19:59:12 +00:00
parent 239e1e4938
commit 3eb6d7fcd0
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/MC/MCParser/MCAsmParser.h
View File

@ -151,13 +151,6 @@ public:
virtual bool parseExpression(const MCExpr *&Res, SMLoc &EndLoc) = 0; virtual bool parseExpression(const MCExpr *&Res, SMLoc &EndLoc) = 0;
bool parseExpression(const MCExpr *&Res); bool parseExpression(const MCExpr *&Res);
/// parsePrimaryExpr - Parse a primary expression.
///
/// @param Res - The value of the expression. The result is undefined
/// on error.
/// @result - False on success.
virtual bool parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) = 0;
/// parseParenExpression - Parse an arbitrary expression, assuming that an /// parseParenExpression - Parse an arbitrary expression, assuming that an
/// initial '(' has already been consumed. /// initial '(' has already been consumed.
/// ///

5
lib/MC/MCParser/AsmParser.cpp
View File

@ -221,7 +221,6 @@ public:
bool parseExpression(const MCExpr *&Res); bool parseExpression(const MCExpr *&Res);
virtual bool parseExpression(const MCExpr *&Res, SMLoc &EndLoc); virtual bool parseExpression(const MCExpr *&Res, SMLoc &EndLoc);
virtual bool parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc);
virtual bool parseParenExpression(const MCExpr *&Res, SMLoc &EndLoc); virtual bool parseParenExpression(const MCExpr *&Res, SMLoc &EndLoc);
virtual bool parseAbsoluteExpression(int64_t &Res); virtual bool parseAbsoluteExpression(int64_t &Res);
@ -870,10 +869,6 @@ bool AsmParser::parseExpression(const MCExpr *&Res) {
return parseExpression(Res, EndLoc); return parseExpression(Res, EndLoc);
} }
bool AsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
return ParsePrimaryExpr(Res, EndLoc);
}
const MCExpr * const MCExpr *
AsmParser::ApplyModifierToExpr(const MCExpr *E, AsmParser::ApplyModifierToExpr(const MCExpr *E,
MCSymbolRefExpr::VariantKind Variant) { MCSymbolRefExpr::VariantKind Variant) {

10
lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@ -1130,7 +1130,7 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg,
if (ParseRegister(TmpReg, Start, End)) { if (ParseRegister(TmpReg, Start, End)) {
const MCExpr *Disp; const MCExpr *Disp;
SMLoc IdentStart = Tok.getLoc(); SMLoc IdentStart = Tok.getLoc();
if (getParser().parsePrimaryExpr(Disp, End)) if (getParser().parseExpression(Disp, End))
return 0; return 0;
if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, IdentStart)) if (X86Operand *Err = ParseIntelVarWithQualifier(Disp, IdentStart))
@ -1182,7 +1182,7 @@ X86Operand *X86AsmParser::ParseIntelBracExpression(unsigned SegReg,
SM.onRegister(TmpReg); SM.onRegister(TmpReg);
UpdateLocLex = false; UpdateLocLex = false;
break; break;
} else if (!getParser().parsePrimaryExpr(Disp, End)) { } else if (!getParser().parseExpression(Disp, End)) {
SM.onDispExpr(); SM.onDispExpr();
UpdateLocLex = false; UpdateLocLex = false;
break; break;
@ -1324,7 +1324,7 @@ X86Operand *X86AsmParser::ParseIntelMemOperand(unsigned SegReg,
const MCExpr *Disp = 0; const MCExpr *Disp = 0;
SMLoc IdentStart = Tok.getLoc(); SMLoc IdentStart = Tok.getLoc();
if (getParser().parsePrimaryExpr(Disp, End)) if (getParser().parseExpression(Disp, End))
return 0; return 0;
if (!isParsingInlineAsm()) if (!isParsingInlineAsm())
@ -1401,7 +1401,7 @@ X86Operand *X86AsmParser::ParseIntelOffsetOfOperator(SMLoc Start) {
SMLoc End; SMLoc End;
const MCExpr *Val; const MCExpr *Val;
if (getParser().parsePrimaryExpr(Val, End)) if (getParser().parseExpression(Val, End))
return ErrorOperand(Start, "Unable to parse expression!"); return ErrorOperand(Start, "Unable to parse expression!");
// Don't emit the offset operator. // Don't emit the offset operator.
@ -1437,7 +1437,7 @@ X86Operand *X86AsmParser::ParseIntelOperator(SMLoc Start, unsigned OpKind) {
SMLoc End; SMLoc End;
const MCExpr *Val; const MCExpr *Val;
if (getParser().parsePrimaryExpr(Val, End)) if (getParser().parseExpression(Val, End))
return 0; return 0;
unsigned Length = 0, Size = 0, Type = 0; unsigned Length = 0, Size = 0, Type = 0;