Merge pull request #733 from FractalFir/volatile_load_tmp

Inserted a local variable in volatile_load, to ensure reads don't move across blocks.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/builder.rs b/src/builder.rs
index b1785af444a..1f3d3a3d5c8 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -975,7 +975,11 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
 
     fn volatile_load(&mut self, ty: Type<'gcc>, ptr: RValue<'gcc>) -> RValue<'gcc> {
         let ptr = self.context.new_cast(self.location, ptr, ty.make_volatile().make_pointer());
-        ptr.dereference(self.location).to_rvalue()
+        // (FractalFir): We insert a local here, to ensure this volatile load can't move across
+        // blocks.
+        let local = self.current_func().new_local(self.location, ty, "volatile_tmp");
+        self.block.add_assignment(self.location, local, ptr.dereference(self.location).to_rvalue());
+        local.to_rvalue()
     }
 
     fn atomic_load(