Skip to content

Commit b24b382

Browse files
committed
DO NOT MERGE: Try some inline things with a skipped test
1 parent 1fe3846 commit b24b382

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

library/alloc/src/sync.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ struct ArcInner<T: ?Sized> {
359359
}
360360

361361
/// Calculate layout for `ArcInner<T>` using the inner value's layout
362+
#[inline]
362363
fn arcinner_layout_for_value_layout(layout: Layout) -> Layout {
363364
// Calculate layout using the given value layout.
364365
// Previously, layout was calculated on the expression

tests/codegen/issues/issue-111603.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// compile-flags: -O
22

3+
// FIXME: DO NOT MERGE until these tests are re-enabled
4+
35
#![crate_type = "lib"]
46
#![feature(get_mut_unchecked, new_uninit)]
57

@@ -20,8 +22,6 @@ pub fn new_from_array(x: u64) -> Arc<[u64]> {
2022
// CHECK-LABEL: @new_uninit
2123
#[no_mangle]
2224
pub fn new_uninit(x: u64) -> Arc<[u64; 1000]> {
23-
// CHECK: call alloc::sync::arcinner_layout_for_value_layout
24-
// CHECK-NOT: call alloc::sync::arcinner_layout_for_value_layout
2525
let mut arc = Arc::new_uninit();
2626
unsafe { Arc::get_mut_unchecked(&mut arc) }.write([x; 1000]);
2727
unsafe { arc.assume_init() }
@@ -30,8 +30,6 @@ pub fn new_uninit(x: u64) -> Arc<[u64; 1000]> {
3030
// CHECK-LABEL: @new_uninit_slice
3131
#[no_mangle]
3232
pub fn new_uninit_slice(x: u64) -> Arc<[u64]> {
33-
// CHECK: call alloc::sync::arcinner_layout_for_value_layout
34-
// CHECK-NOT: call alloc::sync::arcinner_layout_for_value_layout
3533
let mut arc = Arc::new_uninit_slice(1000);
3634
for elem in unsafe { Arc::get_mut_unchecked(&mut arc) } {
3735
elem.write(x);

0 commit comments

Comments
 (0)