Attachment 339921 Details for Bug 185461 – Patch for first option

[patch] Patch for first option

patch (text/plain), 1.56 KB, created by Carlos Bentzen on 2018-05-08 19:43:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Bentzen

Created: 2018-05-08 19:43:58 PDT

Size: 1.56 KB

patch

obsolete

>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index 134c64c4a3c..d90dae8b5ed 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -398,7 +398,9 @@
>              autogenargs="--enable-optimized --disable-terminfo --disable-zlib --enable-targets=host --disable-backtraces --disable-crash-overrides --disable-expensive-checks --disable-debug-runtime --disable-assertions --enable-shared --enable-bindings=none">
>     <branch repo="llvm.org"
>             module="/releases/3.7.0/llvm-3.7.0.src.tar.xz" version="3.7.0" checkoutdir="llvm-3.7.0"
>-            hash="sha256:ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153"/>
>+            hash="sha256:ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153">
>+      <patch file="llvm-fix-cast.patch" strip="1"/>
>+    </branch>
>   </autotools>
> 
>   <autotools id="gsettings-desktop-schemas"
>diff --git a/Tools/gtk/patches/llvm-fix-cast.patch b/Tools/gtk/patches/llvm-fix-cast.patch
>new file mode 100644
>index 00000000000..96183d9d410
>--- /dev/null
>+++ b/Tools/gtk/patches/llvm-fix-cast.patch
>@@ -0,0 +1,13 @@
>+diff --git a/include/llvm/IR/ValueMap.h b/include/llvm/IR/ValueMap.h
>+index 4d00b637..7fddef45 100644
>+--- a/include/llvm/IR/ValueMap.h
>++++ b/include/llvm/IR/ValueMap.h
>+@@ -99,7 +99,7 @@ public:
>+   explicit ValueMap(const ExtraData &Data, unsigned NumInitBuckets = 64)
>+       : Map(NumInitBuckets), Data(Data) {}
>+ 
>+-  bool hasMD() const { return MDMap; }
>++  bool hasMD() const { return bool(MDMap); }
>+   MDMapT &MD() {
>+     if (!MDMap)
>+       MDMap.reset(new MDMapT);

Actions: View | Formatted Diff | Diff

Attachments on bug 185461: 339918 | 339921 | 339931 | 339935