From d3369e621022e23bfd65dfe48ae669af4a380ac5 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 22 Oct 2020 17:57:14 -0400
Subject: [PATCH] Bump LLVM for DeadArgElim fix

Fixes #76387

Pulls in https://github.com/rust-lang/llvm-project/pull/82
---
 src/llvm-project                           |  2 +-
 src/test/ui/auxiliary/issue-76387.rs       | 29 ++++++++++++++++++++++
 src/test/ui/issue-76387-llvm-miscompile.rs | 22 ++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/test/ui/auxiliary/issue-76387.rs
 create mode 100644 src/test/ui/issue-76387-llvm-miscompile.rs

diff --git a/src/llvm-project b/src/llvm-project
index 655a1467c9874..ee1617457899e 160000
--- a/src/llvm-project
+++ b/src/llvm-project
@@ -1 +1 @@
-Subproject commit 655a1467c98741e332b87661a9046877077ef4dc
+Subproject commit ee1617457899ef2eb55dcf7ee2758b4340b6533f
diff --git a/src/test/ui/auxiliary/issue-76387.rs b/src/test/ui/auxiliary/issue-76387.rs
new file mode 100644
index 0000000000000..873d2bedd4d30
--- /dev/null
+++ b/src/test/ui/auxiliary/issue-76387.rs
@@ -0,0 +1,29 @@
+// compile-flags: -C opt-level=3
+
+pub struct FatPtr {
+    ptr: *mut u8,
+    len: usize,
+}
+
+impl FatPtr {
+    pub fn new(len: usize) -> FatPtr {
+        let ptr = Box::into_raw(vec![42u8; len].into_boxed_slice()) as *mut u8;
+
+        FatPtr { ptr, len }
+    }
+}
+
+impl std::ops::Deref for FatPtr {
+    type Target = [u8];
+
+    #[inline]
+    fn deref(&self) -> &[u8] {
+        unsafe { std::slice::from_raw_parts(self.ptr, self.len) }
+    }
+}
+
+impl std::ops::Drop for FatPtr {
+    fn drop(&mut self) {
+        println!("Drop");
+    }
+}
diff --git a/src/test/ui/issue-76387-llvm-miscompile.rs b/src/test/ui/issue-76387-llvm-miscompile.rs
new file mode 100644
index 0000000000000..a9b4686c97021
--- /dev/null
+++ b/src/test/ui/issue-76387-llvm-miscompile.rs
@@ -0,0 +1,22 @@
+// no-system-llvm
+// compile-flags: -C opt-level=3
+// aux-build: issue-76387.rs
+// run-pass
+
+// Regression test for issue #76387
+// Tests that LLVM doesn't miscompile this
+
+extern crate issue_76387;
+
+use issue_76387::FatPtr;
+
+fn print(data: &[u8]) {
+    println!("{:#?}", data);
+}
+
+fn main() {
+    let ptr = FatPtr::new(20);
+    let data = unsafe { std::slice::from_raw_parts(ptr.as_ptr(), ptr.len()) };
+
+    print(data);
+}