diff --git a/library/core/src/task/wake.rs b/library/core/src/task/wake.rs
index 473b185d24652..1dbd11426e57e 100644
--- a/library/core/src/task/wake.rs
+++ b/library/core/src/task/wake.rs
@@ -90,6 +90,8 @@ impl RawWaker {
 /// pointers to *different* functions can compare equal (since identical functions can be
 /// deduplicated within a codegen unit).
 ///
+/// This struct is guaranteed to be aligned to at least 8 bytes.
+///
 /// # Thread safety
 /// If the [`RawWaker`] will be used to construct a [`Waker`] then
 /// these functions must all be thread-safe (even though [`RawWaker`] is
@@ -106,6 +108,8 @@ impl RawWaker {
 #[stable(feature = "futures_api", since = "1.36.0")]
 #[allow(unpredictable_function_pointer_comparisons)]
 #[derive(PartialEq, Copy, Clone, Debug)]
+// For bit-stuffing pointers we guarantee align >= 8.
+#[repr(align(8))]
 pub struct RawWakerVTable {
     /// This function will be called when the [`RawWaker`] gets cloned, e.g. when
     /// the [`Waker`] in which the [`RawWaker`] is stored gets cloned.
diff --git a/src/bootstrap/stdlib-semver-check-stamp b/src/bootstrap/stdlib-semver-check-stamp
index a2f33f00e3ec3..fad994b27f122 100644
--- a/src/bootstrap/stdlib-semver-check-stamp
+++ b/src/bootstrap/stdlib-semver-check-stamp
@@ -2,4 +2,4 @@ Change this file to explicitly acknowledge making a breaking change to the Rust
 If this file is modified in the same PR as the breaking change, then CI will not fail due to the
 breaking change being detected by cargo-semver-checks.
 
-Last change is for: https://github.com/rust-lang/rust/pull/162909
+Last change is for: https://github.com/rust-lang/rust/pull/158186