[llvm] 4ef560e - [ELF] Handle .init_array prefix consistently

[Nikita Popov via llvm-commits]

Author: Nikita Popov
Date: 2022-01-04T09:42:58+01:00
New Revision: 4ef560ec6026a2cef71748852c68cd4a79c0ac0a

URL: https://github.com/llvm/llvm-project/commit/4ef560ec6026a2cef71748852c68cd4a79c0ac0a
DIFF: https://github.com/llvm/llvm-project/commit/4ef560ec6026a2cef71748852c68cd4a79c0ac0a.diff

LOG: [ELF] Handle .init_array prefix consistently

Currently, the code in TargetLoweringObjectFile only assigns
@init_array section type to plain .init_array sections, but not
prioritized sections like .init_array.00001.

This is inconsistent with the interpretation in the AsmParser
(see https://github.com/llvm/llvm-project/blob/791523bae6153b13bb41ba05c9fc89e502cc4a1a/llvm/lib/MC/MCParser/ELFAsmParser.cpp#L621-L632)
and upcoming expectations in LLD
(see https://github.com/rust-lang/rust/issues/92181 for context).

This patch assigns @init_array section type to all sections with an
.init_array prefix. The same is done for .fini_array and
.preinit_array as well. With that, the logic matches the AsmParser.

Differential Revision: https://reviews.llvm.org/D116528

Added: 
    

Modified: 
    llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
    llvm/test/CodeGen/X86/attribute-sections.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index d1c2cdeb133b8..29482a316c8a9 100644
--- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -478,6 +478,11 @@ static SectionKind getELFKindForNamedSection(StringRef Name, SectionKind K) {
   return K;
 }
 
+static bool hasPrefix(StringRef SectionName, StringRef Prefix) {
+  return SectionName.consume_front(Prefix) &&
+         (SectionName.empty() || SectionName[0] == '.');
+}
+
 static unsigned getELFSectionType(StringRef Name, SectionKind K) {
   // Use SHT_NOTE for section whose name starts with ".note" to allow
   // emitting ELF notes from C variable declaration.
@@ -485,13 +490,13 @@ static unsigned getELFSectionType(StringRef Name, SectionKind K) {
   if (Name.startswith(".note"))
     return ELF::SHT_NOTE;
 
-  if (Name == ".init_array")
+  if (hasPrefix(Name, ".init_array"))
     return ELF::SHT_INIT_ARRAY;
 
-  if (Name == ".fini_array")
+  if (hasPrefix(Name, ".fini_array"))
     return ELF::SHT_FINI_ARRAY;
 
-  if (Name == ".preinit_array")
+  if (hasPrefix(Name, ".preinit_array"))
     return ELF::SHT_PREINIT_ARRAY;
 
   if (K.isBSS() || K.isThreadBSS())

diff  --git a/llvm/test/CodeGen/X86/attribute-sections.ll b/llvm/test/CodeGen/X86/attribute-sections.ll
index 30353346b5c96..c5d5ea682f00e 100644
--- a/llvm/test/CodeGen/X86/attribute-sections.ll
+++ b/llvm/test/CodeGen/X86/attribute-sections.ll
@@ -1,18 +1,36 @@
-; RUN: llc < %s -mtriple=i386-unknown-linux-gnu | FileCheck %s -check-prefix=LINUX
+; RUN: llc < %s -mtriple=i386-unknown-linux-gnu | FileCheck %s
 
 declare i32 @foo()
- at G0 = global i32 ()* @foo, section ".init_array"
 
-; LINUX:  .section  .init_array,"aw"
-; LINUX:  .globl G0
+ at init_array1 = global i32 ()* @foo, section ".init_array"
+ at init_array2 = global i32 ()* @foo, section ".init_array.00001"
+ at init_array3 = global i32 ()* @foo, section ".init_arrayfoo"
 
- at G1 = global i32 ()* @foo, section ".fini_array"
+; CHECK-LABEL: .section  .init_array,"aw", at init_array
+; CHECK: init_array1:
+; CHECK-LABEL: .section  .init_array.00001,"aw", at init_array
+; CHECK: init_array2:
+; CHECK-LABEL: .section  .init_arrayfoo,"aw", at progbits
+; CHECK: init_array3:
 
-; LINUX:  .section  .fini_array,"aw"
-; LINUX:  .globl G1
+ at fini_array1 = global i32 ()* @foo, section ".fini_array"
+ at fini_array2 = global i32 ()* @foo, section ".fini_array.00001"
+ at fini_array3 = global i32 ()* @foo, section ".fini_arrayfoo"
 
- at G2 = global i32 ()* @foo, section ".preinit_array"
+; CHECK-LABEL: .section  .fini_array,"aw", at fini_array
+; CHECK: fini_array1:
+; CHECK-LABEL: .section  .fini_array.00001,"aw", at fini_array
+; CHECK: fini_array2:
+; CHECK-LABEL: .section  .fini_arrayfoo,"aw", at progbits
+; CHECK: fini_array3:
 
-; LINUX:  .section .preinit_array,"aw"
-; LINUX:  .globl G2
+ at preinit_array1 = global i32 ()* @foo, section ".preinit_array"
+ at preinit_array2 = global i32 ()* @foo, section ".preinit_array.00001"
+ at preinit_array3 = global i32 ()* @foo, section ".preinit_arrayfoo"
 
+; CHECK-LABEL: .section  .preinit_array,"aw", at preinit_array
+; CHECK: preinit_array1:
+; CHECK-LABEL: .section  .preinit_array.00001,"aw", at preinit_array
+; CHECK: preinit_array2:
+; CHECK-LABEL: .section  .preinit_arrayfoo,"aw", at progbits
+; CHECK: preinit_array3: