summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/MC/MCParser/AsmParser.cpp18
-rw-r--r--lib/MC/MCParser/COFFAsmParser.cpp7
-rw-r--r--lib/MC/MCSectionCOFF.cpp21
-rw-r--r--lib/MC/MCSymbol.cpp10
-rw-r--r--lib/Target/X86/X86AsmPrinter.cpp4
-rw-r--r--test/CodeGen/X86/coff-feat00.ll6
-rw-r--r--test/CodeGen/X86/fastcall-correct-mangling.ll2
-rw-r--r--test/CodeGen/X86/stdcall.ll4
-rw-r--r--test/MC/COFF/quoted-names.ll20
9 files changed, 25 insertions, 67 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"]
diff --git a/lib/MC/MCSectionCOFF.cpp b/lib/MC/MCSectionCOFF.cpp
index a8f5db095b..64aa2c5c49 100644
--- a/lib/MC/MCSectionCOFF.cpp
+++ b/lib/MC/MCSectionCOFF.cpp
@@ -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())
diff --git a/lib/MC/MCSymbol.cpp b/lib/MC/MCSymbol.cpp
index f386c3bc90..b973c57f7b 100644
--- a/lib/MC/MCSymbol.cpp
+++ b/lib/MC/MCSymbol.cpp
@@ -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
diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index d7f7c3e55d..7d7a1add22 100644
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -519,11 +519,9 @@ void X86AsmPrinter::EmitStartOfAsmFile(Module &M) {
if (Subtarget->isTargetEnvMacho())
OutStreamer.SwitchSection(getObjFileLowering().getTextSection());
- if (Subtarget->isTargetCOFF() && Subtarget->isTargetWindows()) {
+ if (Subtarget->isTargetCOFF()) {
// Emit an absolute @feat.00 symbol. This appears to be some kind of
// compiler features bitfield read by link.exe.
- // We only do this on win32, since on cygwin etc. we use the GNU assembler,
- // which doesn't handle this symbol.
if (!Subtarget->is64Bit()) {
MCSymbol *S = MMI->getContext().GetOrCreateSymbol(StringRef("@feat.00"));
OutStreamer.BeginCOFFSymbolDef(S);
diff --git a/test/CodeGen/X86/coff-feat00.ll b/test/CodeGen/X86/coff-feat00.ll
index 048aa34345..1dcd427639 100644
--- a/test/CodeGen/X86/coff-feat00.ll
+++ b/test/CodeGen/X86/coff-feat00.ll
@@ -1,9 +1,7 @@
-; RUN: llc -O0 -mtriple=i386-pc-win32 -filetype=asm -o - %s | FileCheck %s --check-prefix=WIN32
-; RUN: llc -O0 -mtriple=i386-pc-cygwin -filetype=asm -o - %s | FileCheck %s --check-prefix=CYGWIN
+; RUN: llc -O0 -mtriple=i386-pc-win32 -filetype=asm -o - %s | FileCheck %s
define i32 @foo() {
ret i32 0
}
-; WIN32: "@feat.00" = 1
-; CYGWIN-NOT: "@feat.00" = 1
+; CHECK: @feat.00 = 1
diff --git a/test/CodeGen/X86/fastcall-correct-mangling.ll b/test/CodeGen/X86/fastcall-correct-mangling.ll
index 17addbc3e1..3569d36541 100644
--- a/test/CodeGen/X86/fastcall-correct-mangling.ll
+++ b/test/CodeGen/X86/fastcall-correct-mangling.ll
@@ -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
}
diff --git a/test/CodeGen/X86/stdcall.ll b/test/CodeGen/X86/stdcall.ll
index 34f90c5ee3..73826ed0b2 100644
--- a/test/CodeGen/X86/stdcall.ll
+++ b/test/CodeGen/X86/stdcall.ll
@@ -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
diff --git a/test/MC/COFF/quoted-names.ll b/test/MC/COFF/quoted-names.ll
deleted file mode 100644
index 920035f555..0000000000
--- a/test/MC/COFF/quoted-names.ll
+++ /dev/null
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 13:49:32 +0000