diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-10-16 08:22:49 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-10-16 08:22:49 +0000 |
commit | 32c24da3730e8e5ea7df3ce7aeffa257b2e7f02f (patch) | |
tree | 4c6d79cde1fda06ead191438dfbdf8ef01c5ea67 /lib/MC/MCParser | |
parent | 2369bf9ecf6f5ee1d06e44a4e9a7849060146f07 (diff) | |
download | llvm-32c24da3730e8e5ea7df3ce7aeffa257b2e7f02f.tar.gz llvm-32c24da3730e8e5ea7df3ce7aeffa257b2e7f02f.tar.bz2 llvm-32c24da3730e8e5ea7df3ce7aeffa257b2e7f02f.tar.xz |
Revert r192758 (and r192759), "MC: Better handling of tricky symbol and section names"
GNU AS didn't like quotes in symbol names.
Error: junk at end of line, first unrecognized character is `"'
.def "@feat.00";
"@feat.00" = 1
Reproduced on Cygwin's 2.23.52.20130309 and mingw32's 2.20.1.20100303.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192775 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCParser')
-rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 20 | ||||
-rw-r--r-- | lib/MC/MCParser/COFFAsmParser.cpp | 7 |
2 files changed, 13 insertions, 14 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 50fe415c89..9a362563a7 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -792,25 +792,19 @@ bool AsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) { EndLoc = SMLoc::getFromPointer(Identifier.end()); // This is a symbol reference. - StringRef SymbolName = Identifier; - MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None; std::pair<StringRef, StringRef> Split = Identifier.split('@'); - - if (Split.first.size() != Identifier.size() && - FirstTokenKind != AsmToken::String) { - SymbolName = Split.first; - StringRef VariantName = Split.second; - - // Lookup the symbol variant. - Variant = MCSymbolRefExpr::getVariantKindForName(VariantName); + MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first); + + // Lookup the symbol variant if used. + MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None; + if (Split.first.size() != Identifier.size()) { + Variant = MCSymbolRefExpr::getVariantKindForName(Split.second); if (Variant == MCSymbolRefExpr::VK_Invalid) { Variant = MCSymbolRefExpr::VK_None; - return TokError("invalid variant '" + VariantName + "'"); + return TokError("invalid variant '" + Split.second + "'"); } } - MCSymbol *Sym = getContext().GetOrCreateSymbol(SymbolName); - // If this is an absolute variable reference, substitute it now to preserve // semantics in the face of reassignment. if (Sym->isVariable() && isa<MCConstantExpr>(Sym->getVariableValue())) { diff --git a/lib/MC/MCParser/COFFAsmParser.cpp b/lib/MC/MCParser/COFFAsmParser.cpp index b3c094366a..df1794c979 100644 --- a/lib/MC/MCParser/COFFAsmParser.cpp +++ b/lib/MC/MCParser/COFFAsmParser.cpp @@ -295,7 +295,12 @@ bool COFFAsmParser::ParseSectionSwitch(StringRef Section, } bool COFFAsmParser::ParseSectionName(StringRef &SectionName) { - return getParser().parseIdentifier(SectionName); + if (!getLexer().is(AsmToken::Identifier)) + return true; + + SectionName = getTok().getIdentifier(); + Lex(); + return false; } // .section name [, "flags"] |