Unrolled build for rust-lang#121358

rust-timer · web-flow · commit 23bd32c6ca96 · 2024-03-09T12:56:05.000-05:00
Rollup merge of rust-lang#121358 - GnomedDev:lower-align-typeid, r=Mark-Simulacrum Reduce alignment of TypeId to u64 alignment Closes rust-lang#115620
diff --git a/library/core/src/any.rs b/library/core/src/any.rs
@@ -605,7 +605,9 @@ impl dyn Any + Send + Sync {
 #[derive(Clone, Copy, Debug, Eq, PartialOrd, Ord)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct TypeId {
-    t: u128,
+    // We avoid using `u128` because that imposes higher alignment requirements on many platforms.
+    // See issue #115620 for more information.
+    t: (u64, u64),
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -637,7 +639,10 @@ impl TypeId {
     #[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
     pub const fn of<T: ?Sized + 'static>() -> TypeId {
         let t: u128 = intrinsics::type_id::<T>();
-        TypeId { t }
+
+        let t1 = (t >> 64) as u64;
+        let t2 = t as u64;
+        TypeId { t: (t1, t2) }
     }
 }
 
@@ -657,7 +662,7 @@ impl hash::Hash for TypeId {
         // - It is correct to do so -- only hashing a subset of `self` is still
         //   with an `Eq` implementation that considers the entire value, as
         //   ours does.
-        (self.t as u64).hash(state);
+        self.t.1.hash(state);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,9 @@ impl dyn Any + Send + Sync {`
`605`	`605`	`#[derive(Clone, Copy, Debug, Eq, PartialOrd, Ord)]`
`606`	`606`	`#[stable(feature = "rust1", since = "1.0.0")]`
`607`	`607`	`pub struct TypeId {`
`608`		`- t: u128,`
	`608`	+ // We avoid using `u128` because that imposes higher alignment requirements on many platforms.
	`609`	`+ // See issue #115620 for more information.`
	`610`	`+ t: (u64, u64),`
`609`	`611`	`}`
`610`	`612`
`611`	`613`	`#[stable(feature = "rust1", since = "1.0.0")]`
`@@ -637,7 +639,10 @@ impl TypeId {`
`637`	`639`	`#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]`
`638`	`640`	`pub const fn of<T: ?Sized + 'static>() -> TypeId {`
`639`	`641`	`let t: u128 = intrinsics::type_id::<T>();`
`640`		`- TypeId { t }`
	`642`	`+`
	`643`	`+ let t1 = (t >> 64) as u64;`
	`644`	`+ let t2 = t as u64;`
	`645`	`+ TypeId { t: (t1, t2) }`
`641`	`646`	`}`
`642`	`647`	`}`
`643`	`648`
`@@ -657,7 +662,7 @@ impl hash::Hash for TypeId {`
`657`	`662`	// - It is correct to do so -- only hashing a subset of `self` is still
`658`	`663`	// with an `Eq` implementation that considers the entire value, as
`659`	`664`	`// ours does.`
`660`		`- (self.t as u64).hash(state);`
	`665`	`+ self.t.1.hash(state);`
`661`	`666`	`}`
`662`	`667`	`}`
`663`	`668`