maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[COFF] Don't emit .gfids sections when CFG is off 

Put them on the list of GuardFidChunks instead of the main Chunks list,
even with CFG is off. It will be ignored if CFG is disabled.

llvm-svn: 359137
This commit is contained in:
Reid Kleckner 2019-04-24 20:38:37 +00:00
parent ef3c1884ec
commit 54c8182a3f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/COFF/InputFiles.cpp
View File

@ -208,9 +208,9 @@ SectionChunk *ObjFile::readSection(uint32_t SectionNumber,
// linked in the regular manner.
if (C->isCodeView())
DebugChunks.push_back(C);
else if (Config->GuardCF != GuardCFLevel::Off && Name == ".gfids$y")
else if (Name == ".gfids$y")
GuardFidChunks.push_back(C);
else if (Config->GuardCF != GuardCFLevel::Off && Name == ".gljmp$y")
else if (Name == ".gljmp$y")
GuardLJmpChunks.push_back(C);
else if (Name == ".sxdata")
SXDataChunks.push_back(C);

10
lld/test/COFF/gfids-icf.s
View File

@ -35,6 +35,16 @@
# CHECK-NEXT: 0x14000{{.*}}
# CHECK-NEXT: ]
# There should be no .gfids section in the output exectuable when we link with
# -guard:cf or with no -guard:cf/nolongjmp flag.
# RUN: llvm-readobj -sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
# RUN: lld-link %t.obj -out:%t.exe -opt:icf -entry:main
# RUN: llvm-readobj -sections %t.exe | FileCheck %s --check-prefix NOGFIDSEC
# NOGFIDSEC: Sections [
# NOGFIDSEC: Section {
# NOGFIDSEC: Name: .text
# NOGFIDSEC-NOT: Name: .gfids
# Indicate that gfids are present.
.def @feat.00; .scl 3; .type 0; .endef