From 8d2542f6a98993c2ba2b9af95a843f17dd821b5d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 30 Jan 2019 09:22:20 +0100
Subject: [PATCH] * experimental New snapshot release * Remove
 pr39427-misscompile.diff as it has been applied upstream

---
 debian/changelog                        |  7 ++++++
 debian/patches/pr39427-misscompile.diff | 29 -------------------------
 debian/patches/series                   |  1 -
 3 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 debian/patches/pr39427-misscompile.diff

diff --git a/debian/changelog b/debian/changelog
index bb76327d..4b46fe27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-7 (1:7.0.1~svn352582-1~exp1) UNRELEASED; urgency=medium
+
+  * experimental New snapshot release
+  * Remove pr39427-misscompile.diff as it has been applied upstream
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 30 Jan 2019 08:53:14 +0100
+
 llvm-toolchain-7 (1:7.0.1-5) unstable; urgency=medium
 
   * Add 'Rules-Requires-Root: no' in debian/control
diff --git a/debian/patches/pr39427-misscompile.diff b/debian/patches/pr39427-misscompile.diff
deleted file mode 100644
index 797e02b1..00000000
--- a/debian/patches/pr39427-misscompile.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: llvm-toolchain-7-7/include/llvm/ADT/Optional.h
-===================================================================
---- llvm-toolchain-7-7.orig/include/llvm/ADT/Optional.h
-+++ llvm-toolchain-7-7/include/llvm/ADT/Optional.h
-@@ -108,24 +108,6 @@ template <typename T, bool IsPodLike> st
-   }
- };
- 
--#if !defined(__GNUC__) || defined(__clang__) // GCC up to GCC7 miscompiles this.
--/// Storage for trivially copyable types only.
--template <typename T> struct OptionalStorage<T, true> {
--  AlignedCharArrayUnion<T> storage;
--  bool hasVal = false;
--
--  OptionalStorage() = default;
--
--  OptionalStorage(const T &y) : hasVal(true) { new (storage.buffer) T(y); }
--  OptionalStorage &operator=(const T &y) {
--    *reinterpret_cast<T *>(storage.buffer) = y;
--    hasVal = true;
--    return *this;
--  }
--
--  void reset() { hasVal = false; }
--};
--#endif
- } // namespace optional_detail
- 
- template <typename T> class Optional {
diff --git a/debian/patches/series b/debian/patches/series
index f189a676..be214d4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -99,7 +99,6 @@ clang-arm-default-vfp3-on-armv7a.patch
 # For the bootstrap
 bootstrap-fix-include-next.diff
 clangd-atomic-cmake.patch
-pr39427-misscompile.diff
 
 # Rustc
 rustc-aarch64-test-failure.diff