LLD: ELF: Correctly identify SHT_NOTE sections with !SHF_ALLOC as type*Note

[• tstellarAMD]

Ping.

[• tstellarAMD]

Ping.

[ruiu]

lib/ReaderWriter/ELF/Atoms.cpp

77 ↗

(On Diff #29911)

Don't you have to assign it to _contentType?

[• tstellarAMD]

lib/ReaderWriter/ELF/Atoms.cpp

77 ↗

(On Diff #29911)

I don't think this is necessary. This function is called from only one place: ELFDefinedAtom<ELFT>::contentType()
and the return value is assigned to _contentType here.

[ruiu]

LGTM

lib/ReaderWriter/ELF/Atoms.cpp

77 ↗

(On Diff #29911)

Then maybe we should remove other assignments to _contentType from this function? (I'm not suggesting to do that in this patch, but in a separate one.)

lld/trunk/lib/ReaderWriter/ELF/Atoms.cpp

DefinedAtom::ContentType ELFDefinedAtom<ELFT>::doContentType() const {
   using namespace llvm::ELF;
 
   if (_section->sh_type == SHT_GROUP)
     return typeGroupComdat;
   if (!_symbol && _sectionName.startswith(".gnu.linkonce"))
     return typeGnuLinkOnce;
 
   uint64_t flags = _section->sh_flags;
-  if (!(flags & SHF_ALLOC))
+
+  if (!(flags & SHF_ALLOC)) {
+    if (_section->sh_type == SHT_NOTE)
+      return (flags == SHF_WRITE) ? typeRWNote : typeRONote;
     return _contentType = typeNoAlloc;
+  }
+
   if (_section->sh_flags == (SHF_ALLOC | SHF_WRITE | SHF_TLS))
     return _section->sh_type == SHT_NOBITS ? typeThreadZeroFill
                                            : typeThreadData;
 
   if (_section->sh_flags == SHF_ALLOC && _section->sh_type == SHT_PROGBITS)
     return _contentType = typeConstant;
   if (_symbol->getType() == STT_GNU_IFUNC)
     return _contentType = typeResolver;

lld/trunk/test/elf/note.test

 # Check that the linker is not ignoring input sections.
 # RUN: yaml2obj -format=elf %s > %t.obj
 # RUN: lld -flavor gnu -target x86_64 %t.obj -o %t.exe --noinhibit-exec
-# RUN: llvm-objdump -h %t.exe | FileCheck %s
+# RUN: llvm-readobj -s %t.exe | FileCheck %s
 
-# CHECK: {{[0-9]+}} .note
+# CHECK: Section {
+# CHECK: Name: .note
+# CHECK-NEXT: Type: SHT_NOTE
 
 ---
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   OSABI:           ELFOSABI_GNU
   Type:            ET_REL
   Machine:         EM_X86_64