Skip to content

Commit

Permalink
Auto merge of #43026 - arielb1:llvm-next, r=alexcrichton
Browse files Browse the repository at this point in the history
[LLVM] Avoid losing the !nonnull attribute in SROA

Fixes #37945.

r? @alexcrichton
  • Loading branch information
bors committed Jul 14, 2017
2 parents ab91c70 + ecf62e4 commit 20f77c6
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 6 deletions.
6 changes: 1 addition & 5 deletions src/rustllvm/llvm-rebuild-trigger
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# If this file is modified, then llvm will be (optionally) cleaned and then rebuilt.
# The actual contents of this file do not matter, but to trigger a change on the
# build bots then the contents should be changed so git updates the mtime.
<<<<<<< 37849a002ed91ac2b80aeb2172364b4e19250e05
2017-06-27
=======
2017-06-26
>>>>>>> rustc: Implement the #[global_allocator] attribute
2017-07-12
36 changes: 36 additions & 0 deletions src/test/codegen/issue-37945.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// 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.

// min-llvm-version 4.0
// compile-flags: -O
// ignore-x86
// ignore-arm
// ignore-emscripten
// ignore 32-bit platforms (LLVM has a bug with them)

// See issue #37945.

#![crate_type = "lib"]

use std::slice::Iter;

// CHECK-LABEL: @is_empty_1
#[no_mangle]
pub fn is_empty_1(xs: Iter<f32>) -> bool {
// CHECK-NOT: icmp eq float* {{.*}}, null
{xs}.next().is_none()
}

// CHECK-LABEL: @is_empty_2
#[no_mangle]
pub fn is_empty_2(xs: Iter<f32>) -> bool {
// CHECK-NOT: icmp eq float* {{.*}}, null
xs.map(|&x| x).next().is_none()
}

0 comments on commit 20f77c6

Please sign in to comment.