diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-01-31 12:30:17 -0500 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-01-31 12:31:09 -0500 |
| commit | 31dcdc9e13c324d33a18db3aed7f4b3208ff3744 (patch) | |
| tree | dbbaa8c18fb8181aa229b90b588f222d07ed1252 /src/libpanic_unwind | |
| parent | ff95473b5e8fe4a25f59778e6a071abc026e6447 (diff) | |
Drop cfg(bootstrap) code
Diffstat (limited to 'src/libpanic_unwind')
| -rw-r--r-- | src/libpanic_unwind/seh.rs | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs index d9dca2c0f4f..6f507e85e74 100644 --- a/src/libpanic_unwind/seh.rs +++ b/src/libpanic_unwind/seh.rs @@ -282,12 +282,7 @@ pub unsafe fn panic(data: Box<dyn Any + Send>) -> u32 { // // In any case, we basically need to do something like this until we can // express more operations in statics (and we may never be able to). - if !cfg!(bootstrap) { - atomic_store( - &mut THROW_INFO.pmfnUnwind as *mut _ as *mut u32, - ptr!(exception_cleanup) as u32, - ); - } + atomic_store(&mut THROW_INFO.pmfnUnwind as *mut _ as *mut u32, ptr!(exception_cleanup) as u32); atomic_store( &mut THROW_INFO.pCatchableTypeArray as *mut _ as *mut u32, ptr!(&CATCHABLE_TYPE_ARRAY as *const _) as u32, @@ -300,12 +295,10 @@ pub unsafe fn panic(data: Box<dyn Any + Send>) -> u32 { &mut CATCHABLE_TYPE.pType as *mut _ as *mut u32, ptr!(&TYPE_DESCRIPTOR as *const _) as u32, ); - if !cfg!(bootstrap) { - atomic_store( - &mut CATCHABLE_TYPE.copyFunction as *mut _ as *mut u32, - ptr!(exception_copy) as u32, - ); - } + atomic_store( + &mut CATCHABLE_TYPE.copyFunction as *mut _ as *mut u32, + ptr!(exception_copy) as u32, + ); extern "system" { #[unwind(allowed)] |
