[arch-commits] Commit in hhvm/trunk (PKGBUILD gcc51.patch)

[Massimiliano Torromeo]

    Date: Monday, June 22, 2015 @ 12:07:51
  Author: mtorromeo
Revision: 135697

upgpkg: hhvm 3.7.2-2

Applied patch for segfaulting JIT when built with gcc 5.1

Added:
  hhvm/trunk/gcc51.patch
Modified:
  hhvm/trunk/PKGBUILD

-------------+
 PKGBUILD    |    5 ++++-
 gcc51.patch |   14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-22 09:58:12 UTC (rev 135696)
+++ PKGBUILD	2015-06-22 10:07:51 UTC (rev 135697)
@@ -4,7 +4,7 @@
 
 pkgname=hhvm
 pkgver=3.7.2
-pkgrel=1
+pkgrel=2
 
 _thirdparty_commit=a7d0e6834ac6280b15ba2777f7d9c621bc8446cb
 _folly_commit=7c9f26357a1a2852ea11b051e1e0402dcfbce861
@@ -37,6 +37,7 @@
         'hhvm at .service'
         'php.ini'
         'server.ini'
+        'gcc51.patch'
         'libvpx14.patch::https://patch-diff.githubusercontent.com/raw/facebook/hhvm/pull/5191.diff')
 install=hhvm.install
 backup=(etc/hhvm/{php,server}.ini)
@@ -49,6 +50,7 @@
         -i hphp/tools/oss-repo-mode
 
     patch -p1 -i "$srcdir"/libvpx14.patch
+    patch -p1 -i "$srcdir"/gcc51.patch
 
     # Fix sendmail path
     sed -r 's#/usr/lib/sendmail#/usr/bin/sendmail#g' -i \
@@ -142,4 +144,5 @@
             '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
             '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
             '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
+            '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0'
             '975885203cef50997a227f5355d49cb9135f0668981059df213f7f0b44597cf8')

Added: gcc51.patch
===================================================================
--- gcc51.patch	                        (rev 0)
+++ gcc51.patch	2015-06-22 10:07:51 UTC (rev 135697)
@@ -0,0 +1,14 @@
+diff --git a/hphp/runtime/vm/jit/vasm-xls.cpp b/hphp/runtime/vm/jit/vasm-xls.cpp
+index b07f3f3..48bfd5b 100644
+--- a/hphp/runtime/vm/jit/vasm-xls.cpp
++++ b/hphp/runtime/vm/jit/vasm-xls.cpp
+@@ -2047,6 +2047,9 @@ void Vxls::insertCopiesAt(jit::vector<Vinstr>& code, unsigned& j,
+     return sf_ivl && !sf_ivl->ranges.empty() && sf_ivl->covers(pos);
+   };
+   MovePlan moves;
++  for (auto reg : moves) {
++    moves[reg] = InvalidReg;
++  }
+   jit::vector<Vinstr> loads;
+   for (auto dst : copies) {
+     auto ivl = copies[dst];