INSTR_COST=2.

Author: cjgillot

compiler/rustc_mir_transform/src/inline.rs

@@ -22,7 +22,7 @@ use std::ops::{Range, RangeFrom};
 
 pub(crate) mod cycle;
 
-const INSTR_COST: usize = 1;
+const INSTR_COST: usize = 2;
 const CALL_PENALTY: usize = 25;
 const LANDINGPAD_PENALTY: usize = 50;
 const RESUME_PENALTY: usize = 45;

tests/mir-opt/inline/inline_into_box_place.main.Inline.panic-abort.diff

@@ -12,59 +12,12 @@
 +         scope 3 (inlined std::ptr::drop_in_place::<Vec<A>> - shim(Some(Vec<A>))) {
 +             let mut _6: &mut std::vec::Vec<A>;
 +             let mut _7: ();
-+             scope 4 (inlined <Vec<A> as Drop>::drop) {
-+                 debug self => _6;
-+                 let mut _8: *mut [A];
-+                 let mut _9: *mut A;
-+                 let mut _10: usize;
-+                 scope 5 {
-+                     scope 6 (inlined Vec::<A>::as_mut_ptr) {
-+                         debug self => _6;
-+                         let mut _11: &alloc::raw_vec::RawVec<A>;
-+                         scope 7 (inlined alloc::raw_vec::RawVec::<A>::ptr) {
-+                             debug self => _11;
-+                             let mut _13: std::ptr::NonNull<A>;
-+                             scope 8 (inlined Unique::<A>::as_ptr) {
-+                                 debug ((self: Unique<A>).0: std::ptr::NonNull<A>) => _13;
-+                                 debug ((self: Unique<A>).1: std::marker::PhantomData<A>) => const ZeroSized: PhantomData<A>;
-+                                 scope 9 (inlined NonNull::<A>::as_ptr) {
-+                                     debug self => _13;
-+                                     let mut _12: *const A;
-+                                 }
-+                             }
-+                         }
-+                     }
-+                     scope 10 (inlined slice_from_raw_parts_mut::<A>) {
-+                         debug data => _9;
-+                         debug len => _10;
-+                         let mut _14: *mut ();
-+                         scope 11 (inlined ptr::mut_ptr::<impl *mut A>::cast::<()>) {
-+                             debug self => _9;
-+                         }
-+                         scope 12 (inlined std::ptr::from_raw_parts_mut::<[A]>) {
-+                             debug data_address => _14;
-+                             debug metadata => _10;
-+                             let mut _15: std::ptr::metadata::PtrRepr<[A]>;
-+                             let mut _16: std::ptr::metadata::PtrComponents<[A]>;
-+                             let mut _17: *const ();
-+                             scope 13 {
-+                             }
-+                         }
-+                     }
-+                     scope 14 (inlined std::ptr::drop_in_place::<[A]> - shim(Some([A]))) {
-+                         let mut _18: usize;
-+                         let mut _19: usize;
-+                         let mut _20: *mut A;
-+                         let mut _21: bool;
-+                     }
-+                 }
-+             }
 +         }
       }
       scope 2 {
-+         scope 15 (inlined std::ptr::drop_in_place::<Option<B>> - shim(Some(Option<B>))) {
-+             let mut _22: isize;
-+             let mut _23: isize;
++         scope 4 (inlined std::ptr::drop_in_place::<Option<B>> - shim(Some(Option<B>))) {
++             let mut _8: isize;
++             let mut _9: isize;
 +         }
       }
 
@@ -76,42 +29,7 @@
 +         StorageLive(_6);
 +         StorageLive(_7);
 +         _6 = &mut (*_4);
-+         StorageLive(_8);
-+         StorageLive(_9);
-+         StorageLive(_11);
-+         _11 = &((*_6).0: alloc::raw_vec::RawVec<A>);
-+         StorageLive(_13);
-+         _13 = ((((*_6).0: alloc::raw_vec::RawVec<A>).0: std::ptr::Unique<A>).0: std::ptr::NonNull<A>);
-+         StorageLive(_12);
-+         _12 = (_13.0: *const A);
-+         _9 = move _12 as *mut A (PtrToPtr);
-+         StorageDead(_12);
-+         StorageDead(_13);
-+         StorageDead(_11);
-+         StorageLive(_10);
-+         _10 = ((*_6).1: usize);
-+         StorageLive(_14);
-+         _14 = _9 as *mut () (PtrToPtr);
-+         StorageLive(_15);
-+         StorageLive(_16);
-+         StorageLive(_17);
-+         _17 = _14 as *const () (PointerCoercion(MutToConstPointer));
-+         _16 = ptr::metadata::PtrComponents::<[A]> { data_address: move _17, metadata: _10 };
-+         StorageDead(_17);
-+         _15 = ptr::metadata::PtrRepr::<[A]> { const_ptr: move _16 };
-+         StorageDead(_16);
-+         _8 = (_15.1: *mut [A]);
-+         StorageDead(_15);
-+         StorageDead(_14);
-+         StorageDead(_10);
-+         StorageDead(_9);
-+         StorageLive(_18);
-+         StorageLive(_19);
-+         StorageLive(_20);
-+         StorageLive(_21);
-+         _18 = Len((*_8));
-+         _19 = const 0_usize;
-+         goto -> bb4;
++         _7 = <Vec<A> as Drop>::drop(move _6) -> [return: bb2, unwind unreachable];
       }
 
       bb1: {
@@ -122,41 +40,25 @@
           StorageLive(_5);
           _5 = _2;
 -         _0 = std::ptr::drop_in_place::<Option<B>>(move _5) -> [return: bb2, unwind unreachable];
-+         StorageLive(_22);
-+         StorageLive(_23);
-+         _22 = discriminant((*_5));
-+         switchInt(move _22) -> [0: bb5, otherwise: bb6];
++         StorageLive(_8);
++         StorageLive(_9);
++         _8 = discriminant((*_5));
++         switchInt(move _8) -> [0: bb3, otherwise: bb4];
       }
 
       bb2: {
-+         StorageDead(_21);
-+         StorageDead(_20);
-+         StorageDead(_19);
-+         StorageDead(_18);
-+         StorageDead(_8);
 +         drop(((*_4).0: alloc::raw_vec::RawVec<A>)) -> [return: bb1, unwind unreachable];
 +     }
 + 
 +     bb3: {
-+         _20 = &raw mut (*_8)[_19];
-+         _19 = Add(move _19, const 1_usize);
-+         drop((*_20)) -> [return: bb4, unwind unreachable];
-+     }
-+ 
-+     bb4: {
-+         _21 = Eq(_19, _18);
-+         switchInt(move _21) -> [0: bb3, otherwise: bb2];
-+     }
-+ 
-+     bb5: {
-+         StorageDead(_23);
-+         StorageDead(_22);
++         StorageDead(_9);
++         StorageDead(_8);
           StorageDead(_5);
           return;
 +     }
 + 
-+     bb6: {
-+         drop((((*_5) as Some).0: B)) -> [return: bb5, unwind unreachable];
++     bb4: {
++         drop((((*_5) as Some).0: B)) -> [return: bb3, unwind unreachable];
       }
   }