diff options
Diffstat (limited to 'lib/MC/MCParser')
-rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 18 | ||||
-rw-r--r-- | lib/MC/MCParser/COFFAsmParser.cpp | 7 |
2 files changed, 12 insertions, 13 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 75f5c78b70..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('@'); + MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first); - if (Split.first.size() != Identifier.size() && - FirstTokenKind != AsmToken::String) { - SymbolName = Split.first; - StringRef VariantName = Split.second; - - // Lookup the symbol variant. - Variant = MCSymbolRefExpr::getVariantKindForName(VariantName); + // 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"] |