This is an archive of the discontinued LLVM Phabricator instance.

Differential D28839

ThinLTOBitcodeWriter: Clear comdats on filtered globals.
ClosedPublic

Authored by pcc on Jan 17 2017, 5:54 PM.

Details

Reviewers
mehdi_amini
Commits
rG20a00933fbf5: ThinLTOBitcodeWriter: Clear comdats on filtered globals.
rL292431: ThinLTOBitcodeWriter: Clear comdats on filtered globals.

Diff Detail

Event Timeline

pcc created this revision.Jan 17 2017, 5:54 PM
Harbormaster completed remote builds in B3016: Diff 84787.Jan 17 2017, 5:54 PM
mehdi_amini accepted this revision.Jan 17 2017, 10:09 PM

LGTM

This revision is now accepted and ready to land.Jan 17 2017, 10:09 PM
Closed by commit rL292431: ThinLTOBitcodeWriter: Clear comdats on filtered globals. (authored by pcc). · Explain WhyJan 18 2017, 12:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Transforms/
IPO/
2 lines
test/
Transforms/
ThinLTOBitcodeWriter/
6 lines

Diff 84787

llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp

Show First 20 Lines • Show All 194 Lines • ▼ Show 20 Lines
void filterModule( void filterModule(
Module *M, function_ref<bool(const GlobalValue *)> ShouldKeepDefinition) { Module *M, function_ref<bool(const GlobalValue *)> ShouldKeepDefinition) {
for (Function &F : *M) { for (Function &F : *M) {
if (ShouldKeepDefinition(&F)) if (ShouldKeepDefinition(&F))
continue; continue;
F.deleteBody(); F.deleteBody();
F.setComdat(nullptr);
F.clearMetadata(); F.clearMetadata();
} }
for (GlobalVariable &GV : M->globals()) { for (GlobalVariable &GV : M->globals()) {
if (ShouldKeepDefinition(&GV)) if (ShouldKeepDefinition(&GV))
continue; continue;
GV.setInitializer(nullptr); GV.setInitializer(nullptr);
GV.setLinkage(GlobalValue::ExternalLinkage); GV.setLinkage(GlobalValue::ExternalLinkage);
GV.setComdat(nullptr);
GV.clearMetadata(); GV.clearMetadata();
} }
for (Module::alias_iterator I = M->alias_begin(), E = M->alias_end(); for (Module::alias_iterator I = M->alias_begin(), E = M->alias_end();
I != E;) { I != E;) {
GlobalAlias *GA = &*I++; GlobalAlias *GA = &*I++;
if (ShouldKeepDefinition(GA)) if (ShouldKeepDefinition(GA))
continue; continue;
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines

llvm/test/Transforms/ThinLTOBitcodeWriter/split.ll

; RUN: opt -thinlto-bc -o %t %s ; RUN: opt -thinlto-bc -o %t %s
; RUN: llvm-modextract -b -n 0 -o %t0 %t ; RUN: llvm-modextract -b -n 0 -o %t0 %t
; RUN: llvm-modextract -b -n 1 -o %t1 %t ; RUN: llvm-modextract -b -n 1 -o %t1 %t
; RUN: not llvm-modextract -b -n 2 -o - %t 2>&1 | FileCheck --check-prefix=ERROR %s ; RUN: not llvm-modextract -b -n 2 -o - %t 2>&1 | FileCheck --check-prefix=ERROR %s
; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=M0 %s ; RUN: llvm-dis -o - %t0 | FileCheck --check-prefix=M0 %s
; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=M1 %s ; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=M1 %s
; RUN: llvm-bcanalyzer -dump %t0 | FileCheck --check-prefix=BCA0 %s ; RUN: llvm-bcanalyzer -dump %t0 | FileCheck --check-prefix=BCA0 %s
; RUN: llvm-bcanalyzer -dump %t1 | FileCheck --check-prefix=BCA1 %s ; RUN: llvm-bcanalyzer -dump %t1 | FileCheck --check-prefix=BCA1 %s
; ERROR: llvm-modextract: error: module index out of range; bitcode file contains 2 module(s) ; ERROR: llvm-modextract: error: module index out of range; bitcode file contains 2 module(s)
; BCA0: <GLOBALVAL_SUMMARY_BLOCK ; BCA0: <GLOBALVAL_SUMMARY_BLOCK
; BCA1-NOT: <GLOBALVAL_SUMMARY_BLOCK ; BCA1-NOT: <GLOBALVAL_SUMMARY_BLOCK
$g = comdat any
; M0: @g = external global i8{{$}} ; M0: @g = external global i8{{$}}
; M1: @g = global i8 42, !type !0 ; M1: @g = global i8 42, comdat, !type !0
@g = global i8 42, !type !0 @g = global i8 42, comdat, !type !0
; M0: define i8* @f() ; M0: define i8* @f()
; M1-NOT: @f() ; M1-NOT: @f()
define i8* @f() { define i8* @f() {
ret i8* @g ret i8* @g
} }
; M1: !0 = !{i32 0, !"typeid"} ; M1: !0 = !{i32 0, !"typeid"}
!0 = !{i32 0, !"typeid"} !0 = !{i32 0, !"typeid"}