maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

MC/AsmParser: Inline AsmParser::CreateSymbol into callers. 

llvm-svn: 108183
This commit is contained in:
Daniel Dunbar 2010-07-12 19:52:10 +00:00
parent d388c93f87
commit 101c14c940
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/MC/MCParser/AsmParser.h
View File

@ -98,10 +98,8 @@ public:
/// } /// }
private: private:
MCSymbol *CreateSymbol(StringRef Name);
bool ParseStatement(); bool ParseStatement();
void PrintMessage(SMLoc Loc, const std::string &Msg, const char *Type) const; void PrintMessage(SMLoc Loc, const std::string &Msg, const char *Type) const;
/// EnterIncludeFile - Enter the specified file. This returns true on failure. /// EnterIncludeFile - Enter the specified file. This returns true on failure.

17
llvm/lib/MC/MCParser/AsmParser.cpp
View File

@ -246,11 +246,6 @@ bool AsmParser::ParseParenExpr(const MCExpr *&Res, SMLoc &EndLoc) {
return false; return false;
} }
MCSymbol *AsmParser::CreateSymbol(StringRef Name) {
// FIXME: Inline into callers.
return Ctx.GetOrCreateSymbol(Name);
}
/// ParsePrimaryExpr - Parse a primary expression and return it. /// ParsePrimaryExpr - Parse a primary expression and return it.
/// primaryexpr ::= (parenexpr /// primaryexpr ::= (parenexpr
/// primaryexpr ::= symbol /// primaryexpr ::= symbol
@ -271,7 +266,7 @@ bool AsmParser::ParsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) {
case AsmToken::Identifier: { case AsmToken::Identifier: {
// This is a symbol reference. // This is a symbol reference.
std::pair<StringRef, StringRef> Split = getTok().getIdentifier().split('@'); std::pair<StringRef, StringRef> Split = getTok().getIdentifier().split('@');
MCSymbol *Sym = CreateSymbol(Split.first); MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first);
// Mark the symbol as used in an expression. // Mark the symbol as used in an expression.
Sym->setUsedInExpr(true); Sym->setUsedInExpr(true);
@ -581,7 +576,7 @@ bool AsmParser::ParseStatement() {
// implicitly marked as external. // implicitly marked as external.
MCSymbol *Sym; MCSymbol *Sym;
if (LocalLabelVal == -1) if (LocalLabelVal == -1)
Sym = CreateSymbol(IDVal); Sym = getContext().GetOrCreateSymbol(IDVal);
else else
Sym = Ctx.CreateDirectionalLocalSymbol(LocalLabelVal); Sym = Ctx.CreateDirectionalLocalSymbol(LocalLabelVal);
if (!Sym->isUndefined() || Sym->isVariable()) if (!Sym->isUndefined() || Sym->isVariable())
@ -938,7 +933,7 @@ bool AsmParser::ParseAssignment(const StringRef &Name) {
return Error(EqualLoc, "invalid reassignment of non-absolute variable '" + return Error(EqualLoc, "invalid reassignment of non-absolute variable '" +
Name + "'"); Name + "'");
} else } else
Sym = CreateSymbol(Name); Sym = getContext().GetOrCreateSymbol(Name);
// FIXME: Handle '.'. // FIXME: Handle '.'.
@ -1373,7 +1368,7 @@ bool AsmParser::ParseDirectiveSymbolAttribute(MCSymbolAttr Attr) {
if (ParseIdentifier(Name)) if (ParseIdentifier(Name))
return TokError("expected identifier in directive"); return TokError("expected identifier in directive");
MCSymbol *Sym = CreateSymbol(Name); MCSymbol *Sym = getContext().GetOrCreateSymbol(Name);
getStreamer().EmitSymbolAttribute(Sym, Attr); getStreamer().EmitSymbolAttribute(Sym, Attr);
@ -1398,7 +1393,7 @@ bool AsmParser::ParseDirectiveELFType() {
return TokError("expected identifier in directive"); return TokError("expected identifier in directive");
// Handle the identifier as the key symbol. // Handle the identifier as the key symbol.
MCSymbol *Sym = CreateSymbol(Name); MCSymbol *Sym = getContext().GetOrCreateSymbol(Name);
if (getLexer().isNot(AsmToken::Comma)) if (getLexer().isNot(AsmToken::Comma))
return TokError("unexpected token in '.type' directive"); return TokError("unexpected token in '.type' directive");
@ -1474,7 +1469,7 @@ bool AsmParser::ParseDirectiveComm(bool IsLocal) {
return TokError("expected identifier in directive"); return TokError("expected identifier in directive");
// Handle the identifier as the key symbol. // Handle the identifier as the key symbol.
MCSymbol *Sym = CreateSymbol(Name); MCSymbol *Sym = getContext().GetOrCreateSymbol(Name);
if (getLexer().isNot(AsmToken::Comma)) if (getLexer().isNot(AsmToken::Comma))
return TokError("unexpected token in directive"); return TokError("unexpected token in directive");