Sync from rust 71e4c005caa812a16fcb08d0bf1e6f1eda7c8381

bjorn3 · bjorn3 · commit b5061469903a · 2025-07-02T13:00:24.000Z
diff --git a/src/constant.rs b/src/constant.rs
@@ -134,7 +134,7 @@ pub(crate) fn codegen_const_value<'tcx>(
                 }
             }
             Scalar::Ptr(ptr, _size) => {
-                let (prov, offset) = ptr.into_parts(); // we know the `offset` is relative
+                let (prov, offset) = ptr.prov_and_relative_offset();
                 let alloc_id = prov.alloc_id();
                 let base_addr = match fx.tcx.global_alloc(alloc_id) {
                     GlobalAlloc::Memory(alloc) => {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ pub(crate) fn codegen_const_value<'tcx>(`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`Scalar::Ptr(ptr, _size) => {`
`137`		- let (prov, offset) = ptr.into_parts(); // we know the `offset` is relative
	`137`	`+ let (prov, offset) = ptr.prov_and_relative_offset();`
`138`	`138`	`let alloc_id = prov.alloc_id();`
`139`	`139`	`let base_addr = match fx.tcx.global_alloc(alloc_id) {`
`140`	`140`	`GlobalAlloc::Memory(alloc) => {`