mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #94915 - bjorn3:fix_test_box_def, r=tmiasko

Browse source 
Fix definition of Box in ssa-analysis-regression-50041.rs

The Box in liballoc always has a field for the allocator. It is quite
hard to support both the old and new definition of Box in cg_clif so
this change uses the new definition in this test too.
This commit is contained in:
bors 2022-03-14 11:17:42 +00:00
commit 0ac4658909
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/test/ui/mir/ssa-analysis-regression-50041.rs
View file

@ -6,7 +6,7 @@
#![no_std]
#[lang = "owned_box"]
pub struct Box<T: ?Sized>(*mut T);
pub struct Box<T: ?Sized>(*mut T, ());
impl<T: ?Sized> Drop for Box<T> {
fn drop(&mut self) {
@ -15,7 +15,7 @@ impl<T: ?Sized> Drop for Box<T> {
#[lang = "box_free"]
#[inline(always)]
unsafe fn box_free<T: ?Sized>(ptr: *mut T) {
unsafe fn box_free<T: ?Sized>(ptr: *mut T, _: ()) {
dealloc(ptr)
}