Skip to content

Commit c417ca7

Browse files
committed
Auto merge of #46008 - alexcrichton:update-llvm, r=Mark-Simulacrum
rustbuild: Update LLVM and enable ThinLTO This commit updates LLVM to fix #45511 (https://reviews.llvm.org/D39981) and also reenables ThinLTO for libtest now that we shouldn't hit #45768. This also opportunistically enables ThinLTO for libstd which was previously blocked (#45661) on test failures related to debuginfo with a presumed cause of #45511. Closes #45511
2 parents d6d09e0 + ea3fc6c commit c417ca7

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

src/bootstrap/builder.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -624,9 +624,7 @@ impl<'a> Builder<'a> {
624624
cargo.arg("--release");
625625
}
626626

627-
if mode != Mode::Libstd && // FIXME(#45320)
628-
mode != Mode::Libtest && // FIXME(#45511)
629-
self.config.rust_codegen_units.is_none() &&
627+
if self.config.rust_codegen_units.is_none() &&
630628
self.build.is_rust_llvm(compiler.host)
631629
{
632630
cargo.env("RUSTC_THINLTO", "1");
+10-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
-include ../tools.mk
22

3+
LOG := $(TMPDIR)/log.txt
4+
5+
# FIXME(#46126) ThinLTO for libstd broke this test
6+
ifeq (1,0)
37
all:
48
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
59
ifdef SANITIZER_SUPPORT
610
$(RUSTC) -C opt-level=1 -g -Z sanitizer=leak -Z print-link-args leak.rs | grep -q librustc_lsan
7-
$(TMPDIR)/leak 2>&1 | grep -q 'detected memory leaks'
11+
$(TMPDIR)/leak 2>&1 | tee $(LOG)
12+
grep -q 'detected memory leaks' $(LOG)
13+
endif
814
endif
15+
16+
else
17+
all:
918
endif
1019

0 commit comments

Comments
 (0)