[llvm] r192775 - Revert r192758 (and r192759), "MC: Better handling of tricky symbol and section names"
David Majnemer
david.majnemer at gmail.com
Wed Oct 16 06:50:04 PDT 2013
The official GNU Assembler documentation seems to say that quotes in
section names are fine:
"To generate a symbol name containing multibyte characters enclose it
within double quotes and use escape codes. [1]"
[1] https://sourceware.org/binutils/docs/as/Symbol-Names.html
On Wed, Oct 16, 2013 at 1:22 AM, NAKAMURA Takumi <geek4civic at gmail.com>wrote:
> Author: chapuni
> Date: Wed Oct 16 03:22:49 2013
> New Revision: 192775
>
> URL: http://llvm.org/viewvc/llvm-project?rev=192775&view=rev
> Log:
> 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.
>
> Removed:
> llvm/trunk/test/MC/COFF/quoted-names.ll
> Modified:
> llvm/trunk/lib/MC/MCParser/AsmParser.cpp
> llvm/trunk/lib/MC/MCParser/COFFAsmParser.cpp
> llvm/trunk/lib/MC/MCSectionCOFF.cpp
> llvm/trunk/lib/MC/MCSymbol.cpp
> llvm/trunk/test/CodeGen/X86/coff-feat00.ll
> llvm/trunk/test/CodeGen/X86/fastcall-correct-mangling.ll
> llvm/trunk/test/CodeGen/X86/stdcall.ll
>
> Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
> +++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Wed Oct 16 03:22:49 2013
> @@ -792,25 +792,19 @@ bool AsmParser::parsePrimaryExpr(const M
> 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;
> + MCSymbol *Sym = getContext().GetOrCreateSymbol(Split.first);
>
> - // 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())) {
>
> Modified: llvm/trunk/lib/MC/MCParser/COFFAsmParser.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/COFFAsmParser.cpp?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/MC/MCParser/COFFAsmParser.cpp (original)
> +++ llvm/trunk/lib/MC/MCParser/COFFAsmParser.cpp Wed Oct 16 03:22:49 2013
> @@ -295,7 +295,12 @@ bool COFFAsmParser::ParseSectionSwitch(S
> }
>
> 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"]
>
> Modified: llvm/trunk/lib/MC/MCSectionCOFF.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCSectionCOFF.cpp?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/MC/MCSectionCOFF.cpp (original)
> +++ llvm/trunk/lib/MC/MCSectionCOFF.cpp Wed Oct 16 03:22:49 2013
> @@ -39,22 +39,6 @@ void MCSectionCOFF::setSelection(int Sel
> Characteristics |= COFF::IMAGE_SCN_LNK_COMDAT;
> }
>
> -static bool isAcceptableSectionNameChar(char C) {
> - return (C >= 'a' && C <= 'z') ||
> - (C >= 'A' && C <= 'Z') ||
> - (C >= '0' && C <= '9') ||
> - C == '_' || C == '$' || C == '.';
> -}
> -
> -/// NameNeedsQuoting - Return true if the identifier \p Str needs quotes
> to be
> -/// syntactically correct.
> -static bool sectionNameNeedsQuoting(StringRef Name) {
> - for (unsigned i = 0, e = Name.size(); i != e; ++i)
> - if (!isAcceptableSectionNameChar(Name[i]))
> - return true;
> - return false;
> -}
> -
> void MCSectionCOFF::PrintSwitchToSection(const MCAsmInfo &MAI,
> raw_ostream &OS,
> const MCExpr *Subsection) const {
> @@ -65,10 +49,7 @@ void MCSectionCOFF::PrintSwitchToSection
> return;
> }
>
> - if (sectionNameNeedsQuoting(getSectionName()))
> - OS << "\t.section\t" << '"' << getSectionName() << '"' << ",\"";
> - else
> - OS << "\t.section\t" << getSectionName() << ",\"";
> + OS << "\t.section\t" << getSectionName() << ",\"";
> if (getKind().isText())
> OS << 'x';
> if (getKind().isWriteable())
>
> Modified: llvm/trunk/lib/MC/MCSymbol.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCSymbol.cpp?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/MC/MCSymbol.cpp (original)
> +++ llvm/trunk/lib/MC/MCSymbol.cpp Wed Oct 16 03:22:49 2013
> @@ -18,10 +18,12 @@ const MCSection *MCSymbol::AbsolutePseud
> reinterpret_cast<const MCSection *>(1);
>
> static bool isAcceptableChar(char C) {
> - return (C >= 'a' && C <= 'z') ||
> - (C >= 'A' && C <= 'Z') ||
> - (C >= '0' && C <= '9') ||
> - C == '_' || C == '$' || C == '.';
> + if ((C < 'a' || C > 'z') &&
> + (C < 'A' || C > 'Z') &&
> + (C < '0' || C > '9') &&
> + C != '_' && C != '$' && C != '.' && C != '@')
> + return false;
> + return true;
> }
>
> /// NameNeedsQuoting - Return true if the identifier \p Str needs quotes
> to be
>
> Modified: llvm/trunk/test/CodeGen/X86/coff-feat00.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/coff-feat00.ll?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/coff-feat00.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/coff-feat00.ll Wed Oct 16 03:22:49 2013
> @@ -4,4 +4,4 @@ define i32 @foo() {
> ret i32 0
> }
>
> -; CHECK: "@feat.00" = 1
> +; CHECK: @feat.00 = 1
>
> Modified: llvm/trunk/test/CodeGen/X86/fastcall-correct-mangling.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fastcall-correct-mangling.ll?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/fastcall-correct-mangling.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/fastcall-correct-mangling.ll Wed Oct 16
> 03:22:49 2013
> @@ -3,7 +3,7 @@
> ; Check that a fastcall function gets correct mangling
>
> define x86_fastcallcc void @func(i64 %X, i8 %Y, i8 %G, i16 %Z) {
> -; CHECK: "@func at 20":
> +; CHECK: @func at 20:
> ret void
> }
>
>
> Modified: llvm/trunk/test/CodeGen/X86/stdcall.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stdcall.ll?rev=192775&r1=192774&r2=192775&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/stdcall.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/stdcall.ll Wed Oct 16 03:22:49 2013
> @@ -5,7 +5,7 @@
>
> define internal x86_stdcallcc void @MyFunc() nounwind {
> entry:
> -; CHECK: "_MyFunc at 0":
> +; CHECK: MyFunc at 0:
> ; CHECK: ret
> ret void
> }
> @@ -20,5 +20,5 @@ entry:
>
> @B = global %0 { void (...)* bitcast (void ()* @MyFunc to void (...)*) },
> align 4
> ; CHECK: _B:
> -; CHECK: .long "_MyFunc at 0"
> +; CHECK: .long _MyFunc at 0
>
>
> Removed: llvm/trunk/test/MC/COFF/quoted-names.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/COFF/quoted-names.ll?rev=192774&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/MC/COFF/quoted-names.ll (original)
> +++ llvm/trunk/test/MC/COFF/quoted-names.ll (removed)
> @@ -1,20 +0,0 @@
> -; Check that certain symbol and section names are quoted in the asm
> output.
> -; RUN: llc -mtriple=i686-pc-win32 %s -o - | FileCheck %s
> -
> -; Check that the symbol and section names can round-trip through the
> assembler.
> -; RUN: llc -mtriple=i686-pc-win32 %s -o - | llvm-mc -triple i686-pc-win32
> -filetype=obj | llvm-readobj -s -section-symbols | FileCheck %s
> --check-prefix=READOBJ
> -
> -@"\01??__E_Generic_object@?$_Error_objects at H@std@@YAXXZ" = global i32 0
> -
> -define weak i32 @"\01??_B?$num_put at _WV?$back_insert_iterator at V
> ?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@@std@
> @@std@@51"() section ".text" {
> - %res = load i32* @"\01??__E_Generic_object@?$_Error_objects at H@std@
> @YAXXZ"
> - ret i32 %res
> -}
> -
> -; CHECK: .section ".text$??_B?$num_put at _WV?$back_insert_iterator at V
> ?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@@std@
> @@std@@51","xr"
> -; CHECK: .globl "??_B?$num_put at _WV?$back_insert_iterator at V?$basic_string@
> _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@@std@@@std@@51"
> -; CHECK: "??_B?$num_put at _WV?$back_insert_iterator at V?$basic_string@
> _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@@std@@@std@@51"
> -
> -; READOBJ: Symbol
> -; READOBJ: Name: ??_B?$num_put at _WV?$back_insert_iterator at V?$basic_string@
> _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@@std@@@std@@51
> -; READOBJ: Section: .text$??_B?$num_put at _WV?$back_insert_iterator at V
> ?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@@std@
> @@std@@51
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131016/aec3bc17/attachment.html>
More information about the llvm-commits
mailing list