From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/run-make/issue-85401-static-mir/Makefile | 16 ---------------- src/test/run-make/issue-85401-static-mir/bar.rs | 4 ---- src/test/run-make/issue-85401-static-mir/baz.rs | 3 --- src/test/run-make/issue-85401-static-mir/foo.rs | 5 ----- 4 files changed, 28 deletions(-) delete mode 100644 src/test/run-make/issue-85401-static-mir/Makefile delete mode 100644 src/test/run-make/issue-85401-static-mir/bar.rs delete mode 100644 src/test/run-make/issue-85401-static-mir/baz.rs delete mode 100644 src/test/run-make/issue-85401-static-mir/foo.rs (limited to 'src/test/run-make/issue-85401-static-mir') diff --git a/src/test/run-make/issue-85401-static-mir/Makefile b/src/test/run-make/issue-85401-static-mir/Makefile deleted file mode 100644 index 99590166b..000000000 --- a/src/test/run-make/issue-85401-static-mir/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -include ../../run-make-fulldeps/tools.mk - -# Regression test for issue #85401 -# Verify that we do not ICE when trying to access MIR for statics, -# but emit an error when linking. - -OUTPUT_FILE := $(TMPDIR)/build-output - -all: - $(RUSTC) --crate-type rlib --crate-name foo -Crelocation-model=pic --edition=2018 foo.rs -Zalways-encode-mir=yes --emit metadata -o $(TMPDIR)/libfoo.rmeta - $(RUSTC) --crate-type rlib --crate-name bar -Crelocation-model=pic --edition=2018 bar.rs -o $(TMPDIR)/libbar.rlib --extern=foo=$(TMPDIR)/libfoo.rmeta - $(RUSTC) --crate-type bin --crate-name baz -Crelocation-model=pic --edition=2018 baz.rs -o $(TMPDIR)/baz -L $(TMPDIR) --extern=bar=$(TMPDIR)/libbar.rlib > $(OUTPUT_FILE) 2>&1; [ $$? -eq 1 ] - cat $(OUTPUT_FILE) - $(CGREP) 'crate `foo` required to be available in rlib format, but was not found in this form' < $(OUTPUT_FILE) - # -v tests are fragile, hopefully this text won't change - $(CGREP) -v "internal compiler error" < $(OUTPUT_FILE) diff --git a/src/test/run-make/issue-85401-static-mir/bar.rs b/src/test/run-make/issue-85401-static-mir/bar.rs deleted file mode 100644 index 15b12ecf3..000000000 --- a/src/test/run-make/issue-85401-static-mir/bar.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub fn bar() { - println!("bar {}", foo::FOO); - foo::foo(); -} diff --git a/src/test/run-make/issue-85401-static-mir/baz.rs b/src/test/run-make/issue-85401-static-mir/baz.rs deleted file mode 100644 index 2ff4c51e5..000000000 --- a/src/test/run-make/issue-85401-static-mir/baz.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - bar::bar() -} diff --git a/src/test/run-make/issue-85401-static-mir/foo.rs b/src/test/run-make/issue-85401-static-mir/foo.rs deleted file mode 100644 index d064c4546..000000000 --- a/src/test/run-make/issue-85401-static-mir/foo.rs +++ /dev/null @@ -1,5 +0,0 @@ -pub static FOO: &str = "foo"; - -pub fn foo() { - println!("foo"); -} -- cgit v1.2.3