Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 33 insertions, 0 deletions

diff --git a/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs b/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs
new file mode 100644
index 000000000..6445f87f7
--- /dev/null
+++ b/tests/incremental/callee_caller_cross_crate/auxiliary/a.rs
@@ -0,0 +1,14 @@
+#![crate_type="rlib"]
+
+#[cfg(rpass1)]
+pub fn function0(x: u32) -> u32 {
+    x
+}
+
+#[cfg(rpass2)]
+pub fn function0(x: i32) -> i32 {
+    x
+}
+
+pub fn function1(x: u32) {
+}
diff --git a/tests/incremental/callee_caller_cross_crate/b.rs b/tests/incremental/callee_caller_cross_crate/b.rs
new file mode 100644
index 000000000..084ed232a
--- /dev/null
+++ b/tests/incremental/callee_caller_cross_crate/b.rs
@@ -0,0 +1,19 @@
+// aux-build:a.rs
+// revisions:rpass1 rpass2
+// compile-flags:-Z query-dep-graph
+
+#![feature(rustc_attrs)]
+
+extern crate a;
+
+#[rustc_clean(except="typeck", cfg="rpass2")]
+pub fn call_function0() {
+    a::function0(77);
+}
+
+#[rustc_clean(cfg="rpass2")]
+pub fn call_function1() {
+    a::function1(77);
+}
+
+pub fn main() { }