Merge branch '7' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into 7

debian/changelog

@@ -5,6 +5,9 @@ llvm-toolchain-7 (1:7.0.1~+rc2-3) unstable; urgency=medium
   * Try to integrate a pach to make pch reproducible
     Thanks to Rebecca Palmer for the patch
     (Closes: #877359)
+  * Fix the misscompilation issue causing rustc to crash (Closes: #913271)
+    Might cause some ABI issues but no real good solution.
+    See https://bugs.llvm.org/show_bug.cgi?id=39427
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 08 Nov 2018 20:50:39 +0100
 

debian/patches/pr39427-misscompile.diff

@@ -0,0 +1,29 @@
+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 {

debian/patches/series

@@ -88,3 +88,4 @@ remove-apple-clang-manpage.diff
 mips-rdhwr.diff
 clang-arm-default-vfp3-on-armv7a.patch
 reproducible-pch.diff
+pr39427-misscompile.diff