From 325a769a21b38d9e467e5629d3a5bbf16ca5ed1f Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 6 Nov 2017 18:57:51 +0100
Subject: [PATCH 1/3] Disable LLVM assertions on Nightly, enable them in "alt"
 builds.

---
 src/bootstrap/config.rs | 2 +-
 src/ci/run.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 33c7141e704..35e62f17f2e 100644
--- 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 b4fa033c4a6..deea4fec4dc 100755
--- 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

From 8b8bdb63a43d97d919d0910fa33d14907c9aeb27 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 7 Nov 2017 07:31:06 +0100
Subject: [PATCH 2/3] Make the try branch use alternate builds.

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db34f140448..af418c15cdd 100644
--- 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
@@ -314,7 +314,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

From 7625c79f2a8947388012d0636cac914c47771eff Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Sun, 12 Nov 2017 14:56:45 +0100
Subject: [PATCH 3/3] Do not silence output in run-make/sanitizer-memory

---
 src/test/run-make/sanitizer-memory/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/run-make/sanitizer-memory/Makefile b/src/test/run-make/sanitizer-memory/Makefile
index 7502ef0e7a7..f3a896cd4ab 100644
--- 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