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

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

diff --git a/.travis.yml b/.travis.yml
index 33982838eae32a68ce84b1b272d099d82ad65262..62336a7ff2ad58d8093111e6be8d3f6b5f388119 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,14 +16,14 @@ matrix:
       if: type = pull_request OR branch = auto
 
     - env: IMAGE=dist-x86_64-linux DEPLOY=1
-      if: branch = try OR branch = auto
+      if: branch = auto
 
     # "alternate" deployments, these are "nightlies" but don't have assertions
     # turned on, they're deployed to a different location primarily for projects
     # which are stuck on nightly and don't want llvm assertions in the artifacts
     # that they use.
     - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
-      if: branch = auto
+      if: branch = try OR branch = auto
 
     - env: >
         RUST_CHECK_TARGET=dist
@@ -322,7 +322,7 @@ deploy:
       secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
     on:
       branch: try
-      condition: $DEPLOY = 1
+      condition: $DEPLOY_ALT = 1
 
   # this is the same as the above deployment provider except that it uploads to
   # a slightly different directory and has a different trigger

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 33c7141e7044a8a2a1e57b31652be5736f8f8c51..35e62f17f2e07b370062a5caaaa80285a7a6cae5 100644 (file)
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -528,7 +528,7 @@ pub fn parse(args: &[String]) -> 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[..] {

diff --git a/src/ci/run.sh b/src/ci/run.sh
index b4fa033c4a668aeb465fb49a4db628ce1a3e9287..deea4fec4dcfbcae188c180ab041108d305a22df 100755 (executable)
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -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

diff --git a/src/test/run-make/sanitizer-memory/Makefile b/src/test/run-make/sanitizer-memory/Makefile
index 7502ef0e7a7b750467ecde8e32e013b21d87557d..f3a896cd4ab9d85e825e4ae7a1861e126cfa27d5 100644 (file)
--- a/src/test/run-make/sanitizer-memory/Makefile
+++ b/src/test/run-make/sanitizer-memory/Makefile
@@ -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