Skip to content

Revert "MC: Support quoted symbol names" #139296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joker-eph merged 1 commit into from
May 9, 2025
Merged

Revert "MC: Support quoted symbol names" #139296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions llvm/lib/MC/MCContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,27 +212,6 @@ MCDataFragment *MCContext::allocInitialFragment(MCSection &Sec) {
MCSymbol *MCContext::getOrCreateSymbol(const Twine &Name) {
SmallString<128> NameSV;
StringRef NameRef = Name.toStringRef(NameSV);
if (NameRef.contains('\\')) {
NameSV = NameRef;
size_t S = 0;
// Support escaped \\ and \" as in GNU Assembler. GAS issues a warning for
// other characters following \\, which we do not implement due to code
// structure.
for (size_t I = 0, E = NameSV.size(); I < E; ++I) {
char C = NameSV[I];
if (C == '\\') {
switch (NameSV[I + 1]) {
case '"':
case '\\':
C = NameSV[++I];
break;
}
}
NameSV[S++] = C;
}
NameSV.resize(S);
NameRef = NameSV;
}

assert(!NameRef.empty() && "Normal symbols cannot be unnamed!");

Expand Down
2 changes: 0 additions & 2 deletions llvm/lib/MC/MCSymbol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ void MCSymbol::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
OS << "\\n";
else if (C == '"')
OS << "\\\"";
else if (C == '\\')
OS << "\\\\";
else
OS << C;
}
Expand Down
3 changes: 0 additions & 3 deletions llvm/test/MC/AsmParser/quoted.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"a b":
call "a b"

# CHECK: "a b\\":
"a b\\":

#--- err.s
"a\":
# ERR: 1:2: error: unterminated string constant
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/MC/COFF/safeseh.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

// check that we quote the output of .safeseh

.safeseh "\\foo"
// CHECK: .safeseh "\\foo"
.safeseh "\01foo"
// CHECK: .safeseh "\01foo"
22 changes: 3 additions & 19 deletions llvm/test/MC/ELF/symbol-names.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,12 @@
// RUN: llvm-mc -triple=x86_64 -filetype=obj %s | llvm-objdump -tdr - | FileCheck %s
// RUN: llvm-mc -triple i686-pc-linux -filetype=obj %s -o - | llvm-readobj --symbols - | FileCheck %s

// MC allows ?'s in symbol names as an extension.

// CHECK-LABEL:SYMBOL TABLE:
// CHECK-NEXT: 0000000000000001 l F .text 0000000000000000 a"b\{{$}}
// CHECK-NEXT: 0000000000000006 l .text 0000000000000000 a\{{$}}
// CHECK-NEXT: 0000000000000000 g F .text 0000000000000000 foo?bar
// CHECK-NEXT: 0000000000000000 *UND* 0000000000000000 a"b\q{{$}}
// CHECK-EMPTY:

.text
.globl foo?bar
.type foo?bar, @function
foo?bar:
ret

// CHECK-LABEL:<a"b\>:
// CHECK-NEXT: callq {{.*}} <a"b\>
// CHECK-LABEL:<a\>:
// CHECK-NEXT: callq {{.*}}
// CHECK-NEXT: R_X86_64_PLT32 a"b\q-0x4
.type "a\"b\\", @function
"a\"b\\":
call "a\"b\\"
"a\\":
/// GAS emits a warning for \q
call "a\"b\q"
// CHECK: Symbol
// CHECK: Name: foo?bar