RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

[MC][ELF] Error for sh_type, sh_flags or sh_entsize change

Browse Source 
Heads-up message: https://lists.llvm.org/pipermail/llvm-dev/2020-February/139390.html

GNU as started to emit warnings for changed sh_type or sh_flags in 2000.
GNU as>=2.35 will emit errors for most sh_type/sh_flags change, and error for entsize change.

Some cases remain warnings for legacy reasons:

   .section .init_array,"ax", @progbits
   .section .init_array,"ax", @init_array
   # And some obscure sh_flags changes (OS/Processor specific flags)

The rationale of a diagnostic (warning or error) is that sh_type,
sh_flags or sh_entsize changes usually indicate user errors. The values
are taken from the first .section directive. Successive directives are ignored.

We just try to be rigid and emit errors for all sh_type/sh_flags/sh_entsize change.

A possible improvement in the future is to reuse
llvm-readobj/ELFDumper.cpp:getSectionTypeString so that we can name the
type in the diagnostics.

Reviewed By: psmith

Differential Revision: https://reviews.llvm.org/D73999
This commit is contained in:
Fangrui Song 2020-02-04 14:28:20 -08:00
parent 0492ef49dc
commit 75db90da40
5 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/MC/MCParser/ELFAsmParser.cpp
View File

@ -634,20 +634,29 @@ EndStmt:
}
}
MCSection *ELFSection = getContext().getELFSection(
MCSectionELF *Section = getContext().getELFSection(
SectionName, Type, Flags, Size, GroupName, UniqueID, LinkedToSym);
getStreamer().SwitchSection(ELFSection, Subsection);
getStreamer().SwitchSection(Section, Subsection);
if (Section->getType() != Type)
Error(loc, "changed section type for " + SectionName + ", expected: 0x" +
utohexstr(Section->getType()));
if (Section->getFlags() != Flags)
Error(loc, "changed section flags for " + SectionName + ", expected: 0x" +
utohexstr(Section->getFlags()));
if (Section->getEntrySize() != Size)
Error(loc, "changed section entsize for " + SectionName +
", expected: " + Twine(Section->getEntrySize()));
if (getContext().getGenDwarfForAssembly()) {
bool InsertResult = getContext().addGenDwarfSection(ELFSection);
bool InsertResult = getContext().addGenDwarfSection(Section);
if (InsertResult) {
if (getContext().getDwarfVersion() <= 2)
Warning(loc, "DWARF2 only supports one section per compilation unit");
if (!ELFSection->getBeginSymbol()) {
if (!Section->getBeginSymbol()) {
MCSymbol *SectionStartSymbol = getContext().createTempSymbol();
getStreamer().emitLabel(SectionStartSymbol);
ELFSection->setBeginSymbol(SectionStartSymbol);
Section->setBeginSymbol(SectionStartSymbol);
}
}
}

14
test/MC/ELF/exclude-debug-dwo.s
View File

@ -10,23 +10,23 @@
# CHECK: .debug_loc.dwo {{.*}} E
# CHECK: .debug_str_offsets.dwo {{.*}} E
.section .debug_info.dwo
.section .debug_info.dwo,"e"
nop
.section .debug_types.dwo
.section .debug_types.dwo,"e"
nop
.section .debug_abbrev.dwo
.section .debug_abbrev.dwo,"e"
nop
.section .debug_str.dwo
.section .debug_str.dwo,"MSe",@progbits,1
nop
.section .debug_line.dwo
.section .debug_line.dwo,"e"
nop
.section .debug_loc.dwo
.section .debug_loc.dwo,"e"
nop
.section .debug_str_offsets.dwo
.section .debug_str_offsets.dwo,"e"
nop

12
test/MC/ELF/section-entsize-changed.s Normal file
View File

@ -0,0 +1,12 @@
# RUN: not llvm-mc -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --implicit-check-not=error:
foo:
.section .foo,"aM",@progbits,1
# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section entsize for .foo, expected: 1
.section .foo,"aM",@progbits,4
# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section entsize for .foo, expected: 1
.pushsection .foo,"aM",@progbits,4
.pushsection .foo,"aM",@progbits,1

12
test/MC/ELF/section-flags-changed.s Normal file
View File

@ -0,0 +1,12 @@
# RUN: not llvm-mc -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --implicit-check-not=error:
foo:
.section .foo,"ax",@progbits
# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foo, expected: 0x6
.section .foo,"awx",@progbits
# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section flags for .foo, expected: 0x6
.pushsection .foo,"a",@progbits
.pushsection .foo,"ax",@progbits

11
test/MC/ELF/section-type-changed.s Normal file
View File

@ -0,0 +1,11 @@
# RUN: not llvm-mc -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --implicit-check-not=error:
.section .foo,"a",@progbits
# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section type for .foo, expected: 0x1
.section .foo,"a",@init_array
# CHECK: {{.*}}.s:[[# @LINE+1]]:1: error: changed section type for .foo, expected: 0x1
.pushsection .foo,"a",@nobits
.pushsection .foo,"a",@progbits