diff options
author | Hans Wennborg <hans@hanshq.net> | 2013-10-16 01:20:40 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2013-10-16 01:20:40 +0000 |
commit | 508d7b7330968c48e69f0da82c66bdcc0afe6190 (patch) | |
tree | b55d6135b721f51ccb8a9db2b5c3283b5b211430 /lib/MC/MCParser | |
parent | c7ce3e4f42219003f30382be17d966cb2dfb4e71 (diff) | |
download | external_llvm-508d7b7330968c48e69f0da82c66bdcc0afe6190.zip external_llvm-508d7b7330968c48e69f0da82c66bdcc0afe6190.tar.gz external_llvm-508d7b7330968c48e69f0da82c66bdcc0afe6190.tar.bz2 |
MC: Better handling of tricky symbol and section names
Because of win32 mangling, we produce symbol and section names with
funny characters in them, most notably @ characters.
MC would choke on trying to parse its own assembly output. This patch addresses
that by:
- Making @ trigger quoting of symbol names
- Also quote section names in the same way
- Just parse section names like other identifiers (to allow for quotes)
- Don't assume @ signifies a symbol variant if it is in a string.
Differential Revision: http://llvm-reviews.chandlerc.com/D1945
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192758 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, 14 insertions, 13 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 9a36256..50fe415 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -792,19 +792,25 @@ bool AsmParser::parsePrimaryExpr(const MCExpr *&Res, SMLoc &EndLoc) { EndLoc = SMLoc::getFromPointer(Identifier.end()); // This is a symbol reference. - std::pair<StringRef, StringRef> Split = Identifier.split('@'); - MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first); - - // Lookup the symbol variant if used. + StringRef SymbolName = Identifier; MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None; - if (Split.first.size() != Identifier.size()) { - Variant = MCSymbolRefExpr::getVariantKindForName(Split.second); + 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); if (Variant == MCSymbolRefExpr::VK_Invalid) { Variant = MCSymbolRefExpr::VK_None; - return TokError("invalid variant '" + Split.second + "'"); + return TokError("invalid variant '" + VariantName + "'"); } } + 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 df1794c..b3c0943 100644 --- a/lib/MC/MCParser/COFFAsmParser.cpp +++ b/lib/MC/MCParser/COFFAsmParser.cpp @@ -295,12 +295,7 @@ bool COFFAsmParser::ParseSectionSwitch(StringRef Section, } bool COFFAsmParser::ParseSectionName(StringRef &SectionName) { - if (!getLexer().is(AsmToken::Identifier)) - return true; - - SectionName = getTok().getIdentifier(); - Lex(); - return false; + return getParser().parseIdentifier(SectionName); } // .section name [, "flags"] |