Merge ref 'f4665ab8368a' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: f4665ab8368ad2e8a86d4390ae35c28bdd9561bb
Filtered ref: d2e3c00
Upstream diff: rust-lang/rust@a09fbe2...f4665ab

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The Miri Cronjob Bot

tests/pass/static_align.rs

@@ -0,0 +1,14 @@
+#![feature(static_align)]
+
+// When a static uses `align(N)`, its address should be a multiple of `N`.
+
+#[rustc_align_static(256)]
+static FOO: u64 = 0;
+
+#[rustc_align_static(512)]
+static BAR: u64 = 0;
+
+fn main() {
+    assert!(core::ptr::from_ref(&FOO).addr().is_multiple_of(256));
+    assert!(core::ptr::from_ref(&BAR).addr().is_multiple_of(512));
+}