From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:02:58 +0200
Subject: Adding upstream version 1.64.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../incremental/span_hash_stable/auxiliary/mod.rs  |  7 +++++++
 .../incremental/span_hash_stable/auxiliary/sub1.rs |  5 +++++
 .../incremental/span_hash_stable/auxiliary/sub2.rs |  5 +++++
 src/test/incremental/span_hash_stable/main.rs      | 24 ++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 src/test/incremental/span_hash_stable/auxiliary/mod.rs
 create mode 100644 src/test/incremental/span_hash_stable/auxiliary/sub1.rs
 create mode 100644 src/test/incremental/span_hash_stable/auxiliary/sub2.rs
 create mode 100644 src/test/incremental/span_hash_stable/main.rs

(limited to 'src/test/incremental/span_hash_stable')

diff --git a/src/test/incremental/span_hash_stable/auxiliary/mod.rs b/src/test/incremental/span_hash_stable/auxiliary/mod.rs
new file mode 100644
index 000000000..f3824db4c
--- /dev/null
+++ b/src/test/incremental/span_hash_stable/auxiliary/mod.rs
@@ -0,0 +1,7 @@
+#[cfg(rpass1)]
+pub mod sub2;
+
+pub mod sub1;
+
+#[cfg(rpass2)]
+pub mod sub2;
diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub1.rs b/src/test/incremental/span_hash_stable/auxiliary/sub1.rs
new file mode 100644
index 000000000..70e2ea06b
--- /dev/null
+++ b/src/test/incremental/span_hash_stable/auxiliary/sub1.rs
@@ -0,0 +1,5 @@
+#[rustc_clean(cfg="rpass2")]
+pub struct SomeType {
+    pub x: u32,
+    pub y: i64,
+}
diff --git a/src/test/incremental/span_hash_stable/auxiliary/sub2.rs b/src/test/incremental/span_hash_stable/auxiliary/sub2.rs
new file mode 100644
index 000000000..1167cdb0a
--- /dev/null
+++ b/src/test/incremental/span_hash_stable/auxiliary/sub2.rs
@@ -0,0 +1,5 @@
+#[rustc_clean(cfg="rpass2")]
+pub struct SomeOtherType {
+    pub a: i32,
+    pub b: u64,
+}
diff --git a/src/test/incremental/span_hash_stable/main.rs b/src/test/incremental/span_hash_stable/main.rs
new file mode 100644
index 000000000..367416430
--- /dev/null
+++ b/src/test/incremental/span_hash_stable/main.rs
@@ -0,0 +1,24 @@
+// This test makes sure that it doesn't make a difference in which order we are
+// adding source files to the source_map. The order affects the BytePos values of
+// the spans and this test makes sure that we handle them correctly by hashing
+// file:line:column instead of raw byte offset.
+
+// ignore-asmjs wasm2js does not support source maps yet
+// revisions:rpass1 rpass2
+// compile-flags: -g -Z query-dep-graph
+
+#![feature(rustc_attrs)]
+
+mod auxiliary;
+
+fn main() {
+    let _ = auxiliary::sub1::SomeType {
+        x: 0,
+        y: 1,
+    };
+
+    let _ = auxiliary::sub2::SomeOtherType {
+        a: 2,
+        b: 3,
+    };
+}
-- 
cgit v1.2.3