diff options
| author | bors <bors@rust-lang.org> | 2024-09-07 20:37:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-07 20:37:30 +0000 |
| commit | 12b26c13fba25c9e1bc2fdf05f3c2dbb851c83de (patch) | |
| tree | ebe3578a3ce2cccc73d7185a81e3739ac0b13876 /library/panic_unwind | |
| parent | ec867f03bcd6c39156ef13eb5f85bf4fb924ca29 (diff) | |
| parent | 0091b8ab2a16aea880e2fe5d3c876f4f743640d5 (diff) | |
| download | rust-12b26c13fba25c9e1bc2fdf05f3c2dbb851c83de.tar.gz rust-12b26c13fba25c9e1bc2fdf05f3c2dbb851c83de.zip | |
Auto merge of #129941 - BoxyUwU:bump-boostrap, r=albertlarsan68
Bump boostrap compiler to new beta Accidentally left some comments on the update cfgs commit directly xd
Diffstat (limited to 'library/panic_unwind')
| -rw-r--r-- | library/panic_unwind/src/seh.rs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/library/panic_unwind/src/seh.rs b/library/panic_unwind/src/seh.rs index 82c248c5a7b..070c11926f6 100644 --- a/library/panic_unwind/src/seh.rs +++ b/library/panic_unwind/src/seh.rs @@ -157,9 +157,6 @@ mod imp { // going to be cross-lang LTOed anyway. However, using expose is shorter and // requires less unsafe. let addr: usize = ptr.expose_provenance(); - #[cfg(bootstrap)] - let image_base = unsafe { addr_of!(__ImageBase) }.addr(); - #[cfg(not(bootstrap))] let image_base = addr_of!(__ImageBase).addr(); let offset: usize = addr - image_base; Self(offset as u32) @@ -253,9 +250,6 @@ extern "C" { // This is fine since the MSVC runtime uses string comparison on the type name // to match TypeDescriptors rather than pointer equality. static mut TYPE_DESCRIPTOR: _TypeDescriptor = _TypeDescriptor { - #[cfg(bootstrap)] - pVFTable: unsafe { addr_of!(TYPE_INFO_VTABLE) } as *const _, - #[cfg(not(bootstrap))] pVFTable: addr_of!(TYPE_INFO_VTABLE) as *const _, spare: core::ptr::null_mut(), name: TYPE_NAME, |