user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #45810 - SimonSapin:ac-dc, r=aturon

Browse source 
Disable LLVM assertions on Nightly, enable them in "alt" builds.

Per IRC discussion https://mozilla.logbot.info/rust-infra/20171106#c13812170-c13812204

Background: https://internals.rust-lang.org/t/disabling-llvm-assertions-in-nightly-builds/5388/14
This commit is contained in:
bors 2017-11-13 11:46:55 +00:00
commit b7ccb0a5a7
4 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/config.rs
View file

@ -528,7 +528,7 @@ impl Config {
// Now that we've reached the end of our configuration, infer the
// default values for all options that we haven't otherwise stored yet.
let default = config.channel == "nightly";
let default = false;
config.llvm_assertions = llvm_assertions.unwrap_or(default);
let default = match &config.channel[..] {

2
src/ci/run.sh
View file

@ -49,7 +49,7 @@ if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
elif [ "$DEPLOY_ALT" != "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
fi
else
# We almost always want debug assertions enabled, but sometimes this takes too

6
src/test/run-make/sanitizer-memory/Makefile
View file

@ -3,8 +3,10 @@
all:
ifeq ($(TARGET),x86_64-unknown-linux-gnu)
ifdef SANITIZER_SUPPORT
$(RUSTC) -g -Z sanitizer=memory -Z print-link-args uninit.rs | grep -q librustc_msan
$(TMPDIR)/uninit 2>&1 | grep -q use-of-uninitialized-value
$(RUSTC) -g -Z sanitizer=memory -Z print-link-args uninit.rs | tee $(TMPDIR)/out
grep -q librustc_msan $(TMPDIR)/out
$(TMPDIR)/uninit 2>&1 | tee $(TMPDIR)/out
grep -q use-of-uninitialized-value $(TMPDIR)/out
endif
endif