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/run-make-fulldeps/volatile-intrinsics/Makefile b/tests/run-make-fulldeps/volatile-intrinsics/Makefile
new file mode 100644
index 000000000..2a78c7b9c
--- /dev/null
+++ b/tests/run-make-fulldeps/volatile-intrinsics/Makefile
@@ -0,0 +1,9 @@
+include ../tools.mk
+
+all:
+	# The tests must pass...
+	$(RUSTC) main.rs
+	$(call RUN,main)
+	# ... and the loads/stores must not be optimized out.
+	$(RUSTC) main.rs --emit=llvm-ir
+	$(CGREP) "load volatile" "store volatile" < $(TMPDIR)/main.ll
diff --git a/tests/run-make-fulldeps/volatile-intrinsics/main.rs b/tests/run-make-fulldeps/volatile-intrinsics/main.rs
new file mode 100644
index 000000000..4295d95f3
--- /dev/null
+++ b/tests/run-make-fulldeps/volatile-intrinsics/main.rs
@@ -0,0 +1,24 @@
+#![feature(core_intrinsics, volatile)]
+
+use std::intrinsics::{
+    unaligned_volatile_load, unaligned_volatile_store, volatile_load, volatile_store,
+};
+use std::ptr::{read_volatile, write_volatile};
+
+pub fn main() {
+    unsafe {
+        let mut i: isize = 1;
+        volatile_store(&mut i, 2);
+        assert_eq!(volatile_load(&i), 2);
+    }
+    unsafe {
+        let mut i: isize = 1;
+        unaligned_volatile_store(&mut i, 2);
+        assert_eq!(unaligned_volatile_load(&i), 2);
+    }
+    unsafe {
+        let mut i: isize = 1;
+        write_volatile(&mut i, 2);
+        assert_eq!(read_volatile(&i), 2);
+    }
+}