[PATCH] D122507: [AArch64] Allow .variant_pcs before binding directive

[Fangrui Song via Phabricator via llvm-commits]

MaskRay updated this revision to Diff 418330.
MaskRay edited the summary of this revision.
MaskRay added a comment.

fix another gas incompatible with registerSymbol


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D122507/new/

https://reviews.llvm.org/D122507

Files:
  llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
  llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
  llvm/test/MC/AArch64/directive-variant_pcs-err.s
  llvm/test/MC/AArch64/directive-variant_pcs.s


Index: llvm/test/MC/AArch64/directive-variant_pcs.s
===================================================================
--- llvm/test/MC/AArch64/directive-variant_pcs.s
+++ llvm/test/MC/AArch64/directive-variant_pcs.s
@@ -1,11 +1,27 @@
-// RUN: llvm-mc -triple aarch64-elf -filetype asm -o - %s | FileCheck %s
-// RUN: llvm-mc -triple aarch64-elf -filetype obj -o - %s \
-// RUN:   | llvm-readobj --symbols - | FileCheck %s --check-prefix=CHECK-ST_OTHER
+// RUN: llvm-mc -triple aarch64-elf -filetype asm %s | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple aarch64-elf -filetype obj %s \
+// RUN:   | llvm-readelf -s - | FileCheck %s --check-prefix=OBJ
 
 .text
-.global foo
-.variant_pcs foo
-// CHECK: .variant_pcs foo
+/// Binding directive before .variant_pcs.
+// ASM:      .globl def1
+// ASM-NEXT: .variant_pcs def1
+// ASM-NEXT: def1:
+.global def1
+.variant_pcs def1
+def1:
 
-// CHECK-ST_OTHER: Name: foo
-// CHECK-ST_OTHER: Other [ (0x80)
+/// .variant_pcs before binding directive.
+// ASM:      .variant_pcs def2
+// ASM-NEXT: .weak def2
+// ASM-NEXT: def2:
+.variant_pcs def2
+.weak def2
+def2:
+
+// ASM:      .variant_pcs undef
+.variant_pcs undef
+
+// OBJ:      NOTYPE GLOBAL DEFAULT [VARIANT_PCS]  [[#]] def1
+// OBJ-NEXT: NOTYPE WEAK   DEFAULT [VARIANT_PCS]  [[#]] def2
+// OBJ-NEXT: NOTYPE GLOBAL DEFAULT [VARIANT_PCS]  UND   undef
Index: llvm/test/MC/AArch64/directive-variant_pcs-err.s
===================================================================
--- llvm/test/MC/AArch64/directive-variant_pcs-err.s
+++ llvm/test/MC/AArch64/directive-variant_pcs-err.s
@@ -3,9 +3,6 @@
 // CHECK:      [[#@LINE+1]]:13: error: expected symbol name
 .variant_pcs
 
-// CHECK:      [[#@LINE+1]]:14: error: unknown symbol
-.variant_pcs foo
-
 .global foo
 // CHECK:      [[#@LINE+1]]:18: error: expected newline
 .variant_pcs foo bar
Index: llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
===================================================================
--- llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
+++ llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
@@ -254,6 +254,7 @@
 }
 
 void AArch64TargetELFStreamer::emitDirectiveVariantPCS(MCSymbol *Symbol) {
+  getStreamer().getAssembler().registerSymbol(*Symbol);
   cast<MCSymbolELF>(Symbol)->setOther(ELF::STO_AARCH64_VARIANT_PCS);
 }
 
Index: llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
===================================================================
--- llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -6526,17 +6526,11 @@
 /// parseDirectiveVariantPCS
 /// ::= .variant_pcs symbolname
 bool AArch64AsmParser::parseDirectiveVariantPCS(SMLoc L) {
-  const AsmToken &Tok = getTok();
-  if (Tok.isNot(AsmToken::Identifier))
+  StringRef Name;
+  if (getParser().parseIdentifier(Name))
     return TokError("expected symbol name");
 
-  StringRef SymbolName = Tok.getIdentifier();
-
-  MCSymbol *Sym = getContext().lookupSymbol(SymbolName);
-  if (!Sym)
-    return TokError("unknown symbol");
-
-  Lex(); // Eat the symbol
+  MCSymbol *Sym = getContext().getOrCreateSymbol(Name);
 
   if (parseEOL())
     return true;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122507.418330.patch
Type: text/x-patch
Size: 3214 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220325/506062af/attachment.bin>