From d7ccea6c1caf63e5245e357899a67d9f2e7db0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= <bsteinbr@gmail.com>
Date: Wed, 2 Dec 2015 18:09:33 +0100
Subject: [PATCH] Disable the null check elimination pass

This pass causes mis-optimizations in some cases and is probably no
longer really important for us, so let's disable it for now.

Fixes #30081
---
 src/llvm                             |  2 +-
 src/rustllvm/llvm-auto-clean-trigger |  2 +-
 src/test/run-pass/issue-30081.rs     | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 src/test/run-pass/issue-30081.rs

diff --git a/src/llvm b/src/llvm
index cde1ed3196ba9..3564439515985 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit cde1ed3196ba9b39bcf028e06e08a8722113a5cb
+Subproject commit 3564439515985dc1cc0d77057ed00901635a80ad
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index 3b99aa3520b73..4ef1fbb506bbb 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly 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.
-2015-10-18
+2015-12-02
diff --git a/src/test/run-pass/issue-30081.rs b/src/test/run-pass/issue-30081.rs
new file mode 100644
index 0000000000000..13e9daa7883cf
--- /dev/null
+++ b/src/test/run-pass/issue-30081.rs
@@ -0,0 +1,24 @@
+// Copyright 2012-2015 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.
+
+// This used to segfault #30081
+
+pub enum Instruction {
+    Increment(i8),
+    Loop(Box<Box<()>>),
+}
+
+fn main() {
+    let instrs: Option<(u8, Box<Instruction>)> = None;
+    instrs.into_iter()
+        .map(|(_, instr)| instr)
+        .map(|instr| match *instr { _other => {} })
+        .last();
+}