From 42167b94a3d749bae3f89ae73baa5ee6edd8ae9a Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Thu, 13 Dec 2018 11:55:43 +0100 Subject: [PATCH 1/2] fix issue 54153 by ignoring issue-18804 test on windows/mac. As a drive-by, add `-C no-prepopulate-passes` as suggested by nikic. --- src/test/run-pass/issues/issue-18804/main.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/run-pass/issues/issue-18804/main.rs b/src/test/run-pass/issues/issue-18804/main.rs index 2abcd4b7ba99c..23c02f18862ee 100644 --- a/src/test/run-pass/issues/issue-18804/main.rs +++ b/src/test/run-pass/issues/issue-18804/main.rs @@ -14,9 +14,14 @@ // ignore-asmjs no weak symbol support // ignore-emscripten no weak symbol support +// ignore-windows no extern_weak linkage +// ignore-macos no extern_weak linkage // aux-build:lib.rs +// rust-lang/rust#56772: nikic says we need this to be proper test. +// compile-flags: -C no-prepopulate-passes + extern crate lib; fn main() { From 933efd755b1cad9ec5046f315ac4e1f95ab9baba Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Mon, 17 Dec 2018 13:45:27 +0100 Subject: [PATCH 2/2] Address LLVM assertion failure by prepopulating with *just* name-anon-globals. --- src/test/run-pass/issues/issue-18804/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-pass/issues/issue-18804/main.rs b/src/test/run-pass/issues/issue-18804/main.rs index 23c02f18862ee..4b32cc12dfd2a 100644 --- a/src/test/run-pass/issues/issue-18804/main.rs +++ b/src/test/run-pass/issues/issue-18804/main.rs @@ -20,7 +20,7 @@ // aux-build:lib.rs // rust-lang/rust#56772: nikic says we need this to be proper test. -// compile-flags: -C no-prepopulate-passes +// compile-flags: -C no-prepopulate-passes -C passes=name-anon-globals extern crate lib;