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

[Internalize] Preserve __stack_chk_fail in Internalizer correctly 

Move the section collecting `AlwaysPreserved` up before any
`maybeInternalize` is called. Otherwise, functions in `AlwaysPreserved` (in this case, `__stack_chk_fail`)
are not preserved.

Reviewed By: MaskRay, tejohnson

Differential Revision: https://reviews.llvm.org/D112684
This commit is contained in:
Yuanfang Chen 2021-10-28 11:19:24 -07:00
parent 31a949fada
commit c18ed69873
2 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
llvm/lib/Transforms/IPO/Internalize.cpp
View File

@ -201,21 +201,6 @@ bool InternalizePass::internalizeModule(Module &M, CallGraph *CG) {
AlwaysPreserved.insert(V->getName());
}
// Mark all functions not in the api as internal.
IsWasm = Triple(M.getTargetTriple()).isOSBinFormatWasm();
for (Function &I : M) {
if (!maybeInternalize(I, ComdatMap))
continue;
Changed = true;
if (ExternalNode)
// Remove a callgraph edge from the external node to this function.
ExternalNode->removeOneAbstractEdgeTo((*CG)[&I]);
++NumFunctions;
LLVM_DEBUG(dbgs() << "Internalizing func " << I.getName() << "\n");
}
// Never internalize the llvm.used symbol. It is used to implement
// attribute((used)).
// FIXME: Shouldn't this just filter on llvm.metadata section??
@ -237,6 +222,21 @@ bool InternalizePass::internalizeModule(Module &M, CallGraph *CG) {
else
AlwaysPreserved.insert("__stack_chk_guard");
// Mark all functions not in the api as internal.
IsWasm = Triple(M.getTargetTriple()).isOSBinFormatWasm();
for (Function &I : M) {
if (!maybeInternalize(I, ComdatMap))
continue;
Changed = true;
if (ExternalNode)
// Remove a callgraph edge from the external node to this function.
ExternalNode->removeOneAbstractEdgeTo((*CG)[&I]);
++NumFunctions;
LLVM_DEBUG(dbgs() << "Internalizing func " << I.getName() << "\n");
}
// Mark all global variables with initializers that are not in the api as
// internal as well.
for (auto &GV : M.globals()) {

28
llvm/test/ThinLTO/X86/builtin-nostrip.ll
View File

@ -2,22 +2,15 @@
; Compile with thinlto indices, to enable thinlto.
; RUN: opt -module-summary %s -o %t1.bc
; Test old lto interface with thinlto (currently known to be broken, so
; the FileCheck line is commented out).
; FIXME: The new LTO implementation has been fixed to not internalize
; (and later dead-code-eliminate) builtin functions. However the old LTO
; implementation still internalizes them, and when used with ThinLTO they
; get dead-code eliminated before the optimizations run that insert calls
; to them (thus breaking these inserted calls). This needs to be fixed.
; Test old lto interface with thinlto.
; RUN: llvm-lto -exported-symbol=main -thinlto-action=run %t1.bc
;;; RUN llvm-nm %t1.bc.thinlto.o | FileCheck %s --check-prefix=CHECK-NM
; RUN: llvm-nm %t1.bc.thinlto.o | FileCheck %s --check-prefix=CHECK-NM
; Test new lto interface with thinlto.
; RUN: llvm-lto2 run %t1.bc -o %t.out -save-temps \
; RUN: -r %t1.bc,bar,pl \
; RUN: -r %t1.bc,__stack_chk_fail,pl
; RUN: llvm-nm %t.out.1 | FileCheck %s --check-prefix=CHECK-NM
;
; Re-compile, this time without the thinlto indices.
; RUN: opt %s -o %t4.bc
@ -28,24 +21,14 @@
; RUN: -r %t4.bc,__stack_chk_fail,pl
; RUN: llvm-nm %t5.out.0 | FileCheck %s --check-prefix=CHECK-NM
; Test the old lto interface without thinlto. For now we need to
; use a different nm check, because currently the old lto interface
; internalizes these symbols. Once the old lto interface gets
; fixed, we should be able to use the same CHECK-NM tests as the
; other FileChecks.
; Test the old lto interface without thinlto.
; RUN: llvm-lto -exported-symbol=main %t4.bc -o %t6
; RUN: llvm-nm %t6 | FileCheck %s --check-prefix=CHECK-NM2
; RUN: llvm-nm %t6 | FileCheck %s --check-prefix=CHECK-NM
; The final binary should not contain any of the dead functions;
; make sure memmove and memcpy are there.
; CHECK-NM-NOT: bar
; CHECK-NM-DAG: T __stack_chk_fail
; CHECK-NM: T __stack_chk_fail
; CHECK-NM-NOT: bar
; Test case for old lto without thinlto. Hopefully these can be
; eliminated once the old lto interface is fixed.
; CHECK-NM2-DAG: t __stack_chk_fail
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@ -53,7 +36,6 @@ define void @bar() {
ret void
}
define void @__stack_chk_fail() {
ret void
}