From d0feade20f0d50ea8fa986748d80d316a1ac04b0 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 10 Apr 2020 10:01:35 +0200
Subject: [PATCH 1/3] add '-A unused' before user-configured compile_flags

---
 src/runtest.rs | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/runtest.rs b/src/runtest.rs
index a2cc155..d2fed0d 100644
--- a/src/runtest.rs
+++ b/src/runtest.rs
@@ -1112,22 +1112,22 @@ actual:\n\
     }
 
     fn compile_test(&self) -> ProcRes {
-        let mut rustc = self.make_compile_args(
-            &self.testpaths.file, TargetLocation::ThisFile(self.make_exe_name()));
-
-        rustc.arg("-L").arg(&self.aux_output_dir_name());
-
-        match self.config.mode {
+        let allow_unused = match self.config.mode {
             CompileFail | Ui => {
                 // compile-fail and ui tests tend to have tons of unused code as
                 // it's just testing various pieces of the compile, but we don't
                 // want to actually assert warnings about all this code. Instead
                 // let's just ignore unused code warnings by defaults and tests
                 // can turn it back on if needed.
-                rustc.args(&["-A", "unused"]);
+                AllowUnused::Yes
             }
-            _ => {}
-        }
+            _ => AllowUnused::No
+        };
+
+        let mut rustc = self.make_compile_args(
+            &self.testpaths.file, TargetLocation::ThisFile(self.make_exe_name()), allow_unused);
+
+        rustc.arg("-L").arg(&self.aux_output_dir_name());
 
         self.compose_and_run_compiler(rustc, None)
     }
@@ -1271,7 +1271,7 @@ actual:\n\
                 testpaths: &aux_testpaths,
                 revision: self.revision
             };
-            let mut aux_rustc = aux_cx.make_compile_args(&aux_testpaths.file, aux_output);
+            let mut aux_rustc = aux_cx.make_compile_args(&aux_testpaths.file, aux_output, AllowUnused::No);
 
             let crate_type = if aux_props.no_prefer_dynamic {
                 None
@@ -1367,7 +1367,7 @@ actual:\n\
         result
     }
 
-    fn make_compile_args(&self, input_file: &Path, output_file: TargetLocation) -> Command {
+    fn make_compile_args(&self, input_file: &Path, output_file: TargetLocation, allow_unused: AllowUnused) -> Command {
         let mut rustc = Command::new(&self.config.rustc_path);
         rustc.arg(input_file)
             .arg("-L").arg(&self.config.build_base);
@@ -1471,6 +1471,13 @@ actual:\n\
             rustc.arg(format!("-Clinker={}", linker));
         }
 
+        match allow_unused {
+            AllowUnused::Yes => {
+                rustc.args(&["-A", "unused"]);
+            }
+            AllowUnused::No => {}
+        }
+
         rustc.args(&self.props.compile_flags);
 
         rustc
@@ -1699,7 +1706,7 @@ actual:\n\
 
         let output_file = TargetLocation::ThisDirectory(
             self.output_base_name().parent().unwrap().to_path_buf());
-        let mut rustc = self.make_compile_args(&self.testpaths.file, output_file);
+        let mut rustc = self.make_compile_args(&self.testpaths.file, output_file, AllowUnused::No);
         rustc.arg("-L").arg(aux_dir)
             .arg("--emit=llvm-ir");
 
@@ -2343,6 +2350,7 @@ actual:\n\
             let mut rustc = self.make_compile_args(
                 &self.testpaths.file.with_extension(UI_FIXED),
                 TargetLocation::ThisFile(self.make_exe_name()),
+                AllowUnused::No,
             );
             rustc.arg("-L").arg(&self.aux_output_dir_name());
             let res = self.compose_and_run_compiler(rustc, None);
@@ -2667,6 +2675,11 @@ enum ExpectedLine<T: AsRef<str>> {
     Text(T)
 }
 
+enum AllowUnused {
+    Yes,
+    No,
+}
+
 impl<T> fmt::Debug for ExpectedLine<T>
 where
     T: AsRef<str> + fmt::Debug

From ef17d19f084233c75f0617a3e2e57f88c27b7be3 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 10 Apr 2020 10:24:39 +0200
Subject: [PATCH 2/3] move -A unused further up in the CLI args

---
 src/runtest.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/runtest.rs b/src/runtest.rs
index d2fed0d..6d88e42 100644
--- a/src/runtest.rs
+++ b/src/runtest.rs
@@ -1462,6 +1462,13 @@ actual:\n\
             }
         }
 
+        match allow_unused {
+            AllowUnused::Yes => {
+                rustc.args(&["-A", "unused"]);
+            }
+            AllowUnused::No => {}
+        }
+
         if self.props.force_host {
             rustc.args(self.split_maybe_args(&self.config.host_rustcflags));
         } else {
@@ -1471,13 +1478,6 @@ actual:\n\
             rustc.arg(format!("-Clinker={}", linker));
         }
 
-        match allow_unused {
-            AllowUnused::Yes => {
-                rustc.args(&["-A", "unused"]);
-            }
-            AllowUnused::No => {}
-        }
-
         rustc.args(&self.props.compile_flags);
 
         rustc

From a2e8292f3bd1ac5c101a1e4b6d17fe923bbb2e51 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 10 Apr 2020 10:31:09 +0200
Subject: [PATCH 3/3] sync with upstream

---
 src/runtest.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/runtest.rs b/src/runtest.rs
index 6d88e42..8ed7cb6 100644
--- a/src/runtest.rs
+++ b/src/runtest.rs
@@ -1462,11 +1462,10 @@ actual:\n\
             }
         }
 
-        match allow_unused {
-            AllowUnused::Yes => {
-                rustc.args(&["-A", "unused"]);
-            }
-            AllowUnused::No => {}
+        // Add `-A unused` before `config` flags and in-test (`props`) flags, so that they can
+        // overwrite this.
+        if let AllowUnused::Yes = allow_unused {
+            rustc.args(&["-A", "unused"]);
         }
 
         if self.props.force_host {