const eval: respect target.min_global_align

Author: folkertdev

compiler/rustc_const_eval/src/interpret/memory.rs

@@ -893,7 +893,10 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 
         // # Global allocations
         if let Some(global_alloc) = self.tcx.try_get_global_alloc(id) {
-            let (size, align) = global_alloc.size_and_align(*self.tcx, self.typing_env);
+            let (size, mut align) = global_alloc.size_and_align(*self.tcx, self.typing_env);
+            if let Some(min_global_align) = self.tcx.sess.target.min_global_align {
+                align = Ord::max(align, min_global_align);
+            }
             let mutbl = global_alloc.mutability(*self.tcx, self.typing_env);
             let kind = match global_alloc {
                 GlobalAlloc::Static { .. } | GlobalAlloc::Memory { .. } => AllocKind::LiveData,

src/tools/miri/tests/pass/static_align.rs

@@ -0,0 +1,53 @@
+// Test that miri respects the `target.min_global_align` value for the target.
+//
+// The only way to observe its effect currently is to test for the alignment of statics with a
+// natural alignment of 1 on s390x. On that target, the `min_global_align` is 2 bytes.
+use core::ptr;
+
+static T0: bool = true;
+static T1: bool = true;
+static T2: bool = true;
+static T3: bool = true;
+static T4: bool = true;
+static T5: bool = true;
+static T6: bool = true;
+static T7: bool = true;
+static T8: bool = true;
+static T9: bool = true;
+
+static F0: bool = false;
+static F1: bool = false;
+static F2: bool = false;
+static F3: bool = false;
+static F4: bool = false;
+static F5: bool = false;
+static F6: bool = false;
+static F7: bool = false;
+static F8: bool = false;
+static F9: bool = false;
+
+fn main() {
+    let min_align = if cfg!(target_arch = "s390x") { 2 } else { 1 };
+
+    assert!(ptr::from_ref(&T0).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T1).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T2).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T3).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T4).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T5).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T6).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T7).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T8).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&T9).addr().is_multiple_of(min_align));
+
+    assert!(ptr::from_ref(&F0).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F1).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F2).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F3).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F4).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F5).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F6).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F7).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F8).addr().is_multiple_of(min_align));
+    assert!(ptr::from_ref(&F9).addr().is_multiple_of(min_align));
+}