From ecf62e4cdcbe9fe59e2e1280739d15953cc0e500 Mon Sep 17 00:00:00 2001
From: Ariel Ben-Yehuda <ariel.byd@gmail.com>
Date: Sat, 1 Jul 2017 22:00:20 +0300
Subject: [PATCH] [LLVM] Avoid losing the !nonnull attribute in SROA

This still does not work on 32-bit archs because of an LLVM limitation,
but this is only an optimization, so let's push it on 64-bit only for now.

Fixes #37945
---
 src/llvm                          |  2 +-
 src/rustllvm/llvm-rebuild-trigger |  6 +-----
 src/test/codegen/issue-37945.rs   | 36 +++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 src/test/codegen/issue-37945.rs

diff --git a/src/llvm b/src/llvm
index f0a23af57a176..a5ef0696d7c10 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit f0a23af57a17658e75d6dc50568397590a0e6664
+Subproject commit a5ef0696d7c103006d3cb1f4263bad0ca13adca8
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger
index b2d4c11329512..6b410502e491c 100644
--- a/src/rustllvm/llvm-rebuild-trigger
+++ b/src/rustllvm/llvm-rebuild-trigger
@@ -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
diff --git a/src/test/codegen/issue-37945.rs b/src/test/codegen/issue-37945.rs
new file mode 100644
index 0000000000000..e7c91f309181a
--- /dev/null
+++ b/src/test/codegen/issue-37945.rs
@@ -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()
+}