diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-07-27 14:53:44 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-07-29 09:03:06 -0700 |
| commit | 54b6b23fc0e464110d8f4c6a6ab12aaeb7e2a198 (patch) | |
| tree | 960610470bb55f4216d4eb2116dd2e59614f76b4 | |
| parent | 5cc1baa2900ab344e8e8386aa8314b59051868ca (diff) | |
| download | rust-54b6b23fc0e464110d8f4c6a6ab12aaeb7e2a198.tar.gz rust-54b6b23fc0e464110d8f4c6a6ab12aaeb7e2a198.zip | |
std: Mark `Layout::repeat` as `#[inline]`
This fixes an optimization regression by allowing LLVM to see through more functions. Closes #43272
| -rw-r--r-- | src/liballoc/allocator.rs | 1 | ||||
| -rw-r--r-- | src/test/codegen/vec-optimizes-away.rs | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/liballoc/allocator.rs b/src/liballoc/allocator.rs index efc59d2cbc8..2a1a8e73e9e 100644 --- a/src/liballoc/allocator.rs +++ b/src/liballoc/allocator.rs @@ -207,6 +207,7 @@ impl Layout { /// of each element in the array. /// /// On arithmetic overflow, returns `None`. + #[inline] pub fn repeat(&self, n: usize) -> Option<(Self, usize)> { let padded_size = match self.size.checked_add(self.padding_needed_for(self.align)) { None => return None, diff --git a/src/test/codegen/vec-optimizes-away.rs b/src/test/codegen/vec-optimizes-away.rs new file mode 100644 index 00000000000..261564ed51a --- /dev/null +++ b/src/test/codegen/vec-optimizes-away.rs @@ -0,0 +1,21 @@ +// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. +// +// no-system-llvm +// compile-flags: -O +#![crate_type="lib"] + +#[no_mangle] +pub fn sum_me() -> i32 { + // CHECK-LABEL: @sum_me + // CHECK-NEXT: {{^.*:$}} + // CHECK-NEXT: ret i32 6 + vec![1, 2, 3].iter().sum::<i32>() +} |
