RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

Revert r192758 (and r192759), "MC: Better handling of tricky symbol and section names"

Browse Source 
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.

llvm-svn: 192775
This commit is contained in:
NAKAMURA Takumi 2013-10-16 08:22:49 +00:00
parent e3641ad5a3
commit ab81f8a305
8 changed files with 23 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/MC/MCParser/AsmParser.cpp
View File

@ -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;
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())) {

7
lib/MC/MCParser/COFFAsmParser.cpp
View File

@ -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"]

21
lib/MC/MCSectionCOFF.cpp
View File

@ -39,22 +39,6 @@ void MCSectionCOFF::setSelection(int Selection,
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(const MCAsmInfo &MAI,
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())

10
lib/MC/MCSymbol.cpp
View File

@ -18,10 +18,12 @@ const MCSection *MCSymbol::AbsolutePseudoSection =
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

2
test/CodeGen/X86/coff-feat00.ll
View File

@ -4,4 +4,4 @@ define i32 @foo() {
ret i32 0
}
; CHECK: "@feat.00" = 1
; CHECK: @feat.00 = 1

2
test/CodeGen/X86/fastcall-correct-mangling.ll
View File

@ -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@20":
; CHECK: @func@20:
ret void
}

4
test/CodeGen/X86/stdcall.ll
View File

@ -5,7 +5,7 @@
define internal x86_stdcallcc void @MyFunc() nounwind {
entry:
; CHECK: "_MyFunc@0":
; CHECK: MyFunc@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@0"
; CHECK: .long _MyFunc@0

20
test/MC/COFF/quoted-names.ll
View File

@ -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@H@std@@YAXXZ" = global i32 0
define weak i32 @"\01??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"() section ".text" {
%res = load i32* @"\01??__E_Generic_object@?$_Error_objects@H@std@@YAXXZ"
ret i32 %res
}
; CHECK: .section ".text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51","xr"
; CHECK: .globl "??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"
; CHECK: "??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"
; READOBJ: Symbol
; READOBJ: Name: ??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51
; READOBJ: Section: .text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51