diff options
| author | bors <bors@rust-lang.org> | 2023-06-17 16:10:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-17 16:10:57 +0000 |
| commit | a8a29070f07e47a244c8199ad582f93172019743 (patch) | |
| tree | 763b2ef51eb7ab864c4f3bb635e1c8060d19361d /compiler/rustc_codegen_gcc | |
| parent | e1c29d137dd779dcfce447d8d149ee6b8e9bdf78 (diff) | |
| parent | a5c6cb888eac7ad8905a3902b985e412aaceb002 (diff) | |
| download | rust-a8a29070f07e47a244c8199ad582f93172019743.tar.gz rust-a8a29070f07e47a244c8199ad582f93172019743.zip | |
Auto merge of #100036 - DrMeepster:box_free_free_box, r=oli-obk
Remove `box_free` lang item This PR removes the `box_free` lang item, replacing it with `Box`'s `Drop` impl. Box dropping is still slightly magic because the contained value is still dropped by the compiler.
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/mini_core.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_gcc/example/mini_core.rs b/compiler/rustc_codegen_gcc/example/mini_core.rs index 637b8dc53fe..c27b610f2ab 100644 --- a/compiler/rustc_codegen_gcc/example/mini_core.rs +++ b/compiler/rustc_codegen_gcc/example/mini_core.rs @@ -490,7 +490,8 @@ impl<T: ?Sized + Unsize<U>, U: ?Sized, A: Allocator> CoerceUnsized<Box<U, A>> fo impl<T: ?Sized, A: Allocator> Drop for Box<T, A> { fn drop(&mut self) { - // drop is currently performed by compiler. + // inner value is dropped by compiler + libc::free(self.pointer.0 as *mut u8); } } @@ -507,11 +508,6 @@ unsafe fn allocate(size: usize, _align: usize) -> *mut u8 { libc::malloc(size) } -#[lang = "box_free"] -unsafe fn box_free<T: ?Sized>(ptr: Unique<T>, _alloc: ()) { - libc::free(ptr.pointer.0 as *mut u8); -} - #[lang = "drop"] pub trait Drop { fn drop(&mut self); |
