From 631cd5845e8de329d0e227aaa707d7ea228b8f8f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:20:29 +0200
Subject: Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/run-make/issue-83045/Makefile | 33 +++++++++++++++++++++++++++++++++
 tests/run-make/issue-83045/a.rs     |  1 +
 tests/run-make/issue-83045/b.rs     |  1 +
 tests/run-make/issue-83045/c.rs     |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 tests/run-make/issue-83045/Makefile
 create mode 100644 tests/run-make/issue-83045/a.rs
 create mode 100644 tests/run-make/issue-83045/b.rs
 create mode 100644 tests/run-make/issue-83045/c.rs

(limited to 'tests/run-make/issue-83045')

diff --git a/tests/run-make/issue-83045/Makefile b/tests/run-make/issue-83045/Makefile
new file mode 100644
index 000000000..7053da00f
--- /dev/null
+++ b/tests/run-make/issue-83045/Makefile
@@ -0,0 +1,33 @@
+include ../tools.mk
+
+# This test case creates a situation where the crate loader would run
+# into an ICE when confronted with an invalid setup where it cannot
+# find the dependency of a direct dependency.
+#
+# The test case makes sure that the compiler produces the expected
+# error message but does not ICE immediately after.
+#
+# See https://github.com/rust-lang/rust/issues/83045
+
+# This is a platform-independent issue, no need to waste time testing
+# everywhere.
+# only-x86_64
+# only-linux
+
+# NOTE: We use BARE_RUSTC below so that the compiler can't find liba.rlib
+#       If we used RUSTC the additional '-L TMPDIR' option would allow rustc to
+#       actually find the crate.
+#
+#       We check that we get the expected error message
+#       But that we do not get an ICE
+
+all:
+	$(RUSTC) --crate-name=a --crate-type=rlib a.rs --verbose
+	$(RUSTC) --crate-name=b --crate-type=rlib --extern a=$(TMPDIR)/liba.rlib b.rs --verbose
+	$(BARE_RUSTC) --out-dir $(TMPDIR) \
+	              --extern b=$(TMPDIR)/libb.rlib \
+				  --crate-type=rlib \
+				  --edition=2018 \
+				  c.rs 2>&1 | tee $(TMPDIR)/output.txt || exit 0
+	$(CGREP) E0519 < $(TMPDIR)/output.txt
+	$(CGREP) -v "internal compiler error" < $(TMPDIR)/output.txt
diff --git a/tests/run-make/issue-83045/a.rs b/tests/run-make/issue-83045/a.rs
new file mode 100644
index 000000000..66d9f758e
--- /dev/null
+++ b/tests/run-make/issue-83045/a.rs
@@ -0,0 +1 @@
+// empty on purpose
diff --git a/tests/run-make/issue-83045/b.rs b/tests/run-make/issue-83045/b.rs
new file mode 100644
index 000000000..f4876cfa4
--- /dev/null
+++ b/tests/run-make/issue-83045/b.rs
@@ -0,0 +1 @@
+extern crate a;
diff --git a/tests/run-make/issue-83045/c.rs b/tests/run-make/issue-83045/c.rs
new file mode 100644
index 000000000..e0c452549
--- /dev/null
+++ b/tests/run-make/issue-83045/c.rs
@@ -0,0 +1 @@
+use b as _;
-- 
cgit v1.2.3