From 6a1ecf3ef57784c75a4808aa294b73a1d6adc616 Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Sun, 17 Nov 2024 19:30:43 -0500
Subject: [PATCH] Add read_volatile to volatile test

---
 libgccjit.version      |  2 +-
 tests/run/volatile2.rs | 36 +++++++++++++++---------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/libgccjit.version b/libgccjit.version
index f6b512a0280..26503725ed8 100644
--- a/libgccjit.version
+++ b/libgccjit.version
@@ -1 +1 @@
-29901846ff610daab8a80436cfe36e93b4b5aa1e
+50d1270fd6409407f38b982e606df1dba4bf58ed
diff --git a/tests/run/volatile2.rs b/tests/run/volatile2.rs
index c1bc442454e..a177b817ab3 100644
--- a/tests/run/volatile2.rs
+++ b/tests/run/volatile2.rs
@@ -3,14 +3,6 @@
 // Run-time:
 //   status: 0
 
-#![no_std]
-#![feature(core_intrinsics, start)]
-
-#[panic_handler]
-fn panic_handler(_: &core::panic::PanicInfo) -> ! {
-    core::intrinsics::abort();
-}
-
 mod libc {
     #[link(name = "c")]
     extern "C" {
@@ -44,8 +36,7 @@ static mut COUNT: u32 = 0;
 static mut STORAGE: *mut u8 = core::ptr::null_mut();
 const PAGE_SIZE: usize = 1 << 15;
 
-#[start]
-fn main(_argc: isize, _argv: *const *const u8) -> isize {
+fn main() {
     unsafe {
         // Register a segfault handler
         libc::sigaction(
@@ -67,8 +58,7 @@ fn main(_argc: isize, _argv: *const *const u8) -> isize {
             0,
         ).cast();
         if STORAGE == libc::MAP_FAILED {
-            libc::puts(b"error: mmap failed\0".as_ptr());
-            return 1;
+            panic!("error: mmap failed");
         }
 
         let p_count = (&mut COUNT) as *mut u32;
@@ -81,21 +71,25 @@ fn main(_argc: isize, _argv: *const *const u8) -> isize {
         STORAGE.add(PAGE_SIZE).write_volatile(1);
         STORAGE.add(0).write_volatile(1);
         STORAGE.add(PAGE_SIZE).write_volatile(1);
+        STORAGE.add(0).read_volatile();
+        STORAGE.add(PAGE_SIZE).read_volatile();
+        STORAGE.add(0).read_volatile();
+        STORAGE.add(PAGE_SIZE).read_volatile();
+        STORAGE.add(0).read_volatile();
+        STORAGE.add(PAGE_SIZE).read_volatile();
+        STORAGE.add(0).write_volatile(1);
+        STORAGE.add(PAGE_SIZE).write_volatile(1);
 
-        // The segfault handler should have been called for every
-        // `write_volatile` in `STORAGE`. If the compiler ignores volatility,
-        // some of these writes will be combined, causing a different number of
-        // segfaults.
+        // The segfault handler should have been called for every `write_volatile` and
+        // `read_volatile` in `STORAGE`. If the compiler ignores volatility, some of these writes
+        // will be combined, causing a different number of segfaults.
         //
         // This `p_count` read is done by a volatile read. If the compiler
         // ignores volatility, the compiler will speculate that `*p_count` is
         // unchanged and remove this check, failing the test.
-        if p_count.read_volatile() != 6 {
-            libc::puts(b"error: segfault count mismatch\0".as_ptr());
-            return 1;
+        if p_count.read_volatile() != 14 {
+            panic!("error: segfault count mismatch: {}", p_count.read_volatile());
         }
-
-        0
     }
 }