Skip to content

Commit 279d25b

Browse files
authored
Rollup merge of #43513 - alexcrichton:inline-repeat, r=BurntSushi
std: Mark `Layout::repeat` as `#[inline]` This fixes an optimization regression by allowing LLVM to see through more functions. Closes #43272
2 parents fb13d57 + 289142d commit 279d25b

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

src/liballoc/allocator.rs

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ impl Layout {
215215
/// of each element in the array.
216216
///
217217
/// On arithmetic overflow, returns `None`.
218+
#[inline]
218219
pub fn repeat(&self, n: usize) -> Option<(Self, usize)> {
219220
let padded_size = match self.size.checked_add(self.padding_needed_for(self.align)) {
220221
None => return None,
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
//
11+
// no-system-llvm
12+
// compile-flags: -O
13+
#![crate_type="lib"]
14+
15+
#[no_mangle]
16+
pub fn sum_me() -> i32 {
17+
// CHECK-LABEL: @sum_me
18+
// CHECK-NEXT: bb{{.*}}:
19+
// CHECK-NEXT: ret i32 6
20+
vec![1, 2, 3].iter().sum::<i32>()
21+
}

0 commit comments

Comments
 (0)