Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 44 insertions, 0 deletions

diff --git a/tests/incremental/rlib_cross_crate/auxiliary/a.rs b/tests/incremental/rlib_cross_crate/auxiliary/a.rs
new file mode 100644
index 000000000..5a26df9ae
--- /dev/null
+++ b/tests/incremental/rlib_cross_crate/auxiliary/a.rs
@@ -0,0 +1,16 @@
+// no-prefer-dynamic
+// compile-flags: -Z query-dep-graph
+
+#![crate_type="rlib"]
+
+#[cfg(rpass1)]
+pub type X = u32;
+
+#[cfg(rpass2)]
+pub type X = i32;
+
+// this version doesn't actually change anything:
+#[cfg(rpass3)]
+pub type X = i32;
+
+pub type Y = char;
diff --git a/tests/incremental/rlib_cross_crate/b.rs b/tests/incremental/rlib_cross_crate/b.rs
new file mode 100644
index 000000000..639cfc918
--- /dev/null
+++ b/tests/incremental/rlib_cross_crate/b.rs
@@ -0,0 +1,28 @@
+// Same test as `type_alias_cross_crate`, but with
+// `no-prefer-dynamic`, ensuring that we test what happens when we
+// build rlibs (before we were only testing dylibs, which meant we
+// didn't realize we had to preserve a `bc` file as well).
+
+// aux-build:a.rs
+// revisions:rpass1 rpass2 rpass3
+// no-prefer-dynamic
+// compile-flags: -Z query-dep-graph
+
+#![feature(rustc_attrs)]
+
+extern crate a;
+
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
+#[rustc_clean(cfg="rpass3")]
+pub fn use_X() -> u32 {
+    let x: a::X = 22;
+    x as u32
+}
+
+#[rustc_clean(cfg="rpass2")]
+#[rustc_clean(cfg="rpass3")]
+pub fn use_Y() {
+    let x: a::Y = 'c';
+}
+
+pub fn main() { }