Use libcore's align_offset

Author: pvdrz

src/shims/mod.rs

@@ -1,3 +1,4 @@
+
 pub mod foreign_items;
 pub mod intrinsics;
 pub mod tls;
@@ -27,9 +28,25 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         }
         // There are some more lang items we want to hook that CTFE does not hook (yet).
         if this.tcx.lang_items().align_offset_fn() == Some(instance.def.def_id()) {
-            // FIXME: return a real value in case the target allocation has an
-            // alignment bigger than the one requested.
-            let n = u128::max_value();
+
+            let n = {
+                let ptr = this.read_scalar(args[0])?.not_undef()?.assert_ptr();
+                let align = this.force_bits(
+                    this.read_scalar(args[1])?.not_undef()?,
+                    this.pointer_size()
+                )? as usize;
+
+                let stride = this.memory().get(ptr.alloc_id)?.align.bytes() as usize;
+                // if the allocation alignment is at least the required alignment, we use the
+                // libcore implementation
+                if stride >= align {
+                    ((stride + ptr.offset.bytes() as usize) as *const ())
+                        .align_offset(align) as u128
+                } else {
+                    u128::max_value()
+                }
+            };
+
             let dest = dest.unwrap();
             let n = this.truncate(n, dest.layout);
             this.write_scalar(Scalar::from_uint(n, dest.layout.size), dest)?;