Merge branch 'master' into f27

2018-05-03 13:44:08 +02:00 · 2018-05-03 13:44:08 +02:00 · e91c961fbf
commit e91c961fbf
parent a5739c25ae 343041014c
2 changed files with 80 additions and 1 deletions
--- a/bug1375074-save-restore-x28.patch
+++ b/bug1375074-save-restore-x28.patch
@ -0,0 +1,74 @@
+# HG changeset patch
+# User Lars T Hansen <lhansen@mozilla.com>
+# Date 1519822672 -3600
+#      Wed Feb 28 13:57:52 2018 +0100
+# Node ID 672f0415217b202ae59a930769dffd9d6ba6b87c
+# Parent  825fd04dacc6297d3a980ec4184079405950b35d
+Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor.
+
+diff --git a/js/src/jit-test/tests/bug1375074.js b/js/src/jit-test/tests/bug1375074.js
+new file mode 100644
+--- /dev/null
+++ b/js/src/jit-test/tests/bug1375074.js
+@@ -0,0 +1,18 @@
+// This forces the VM to start creating unboxed objects and thus stresses a
+// particular path into generated code for a specialized unboxed object
+// constructor.
+
+var K = 2000;			// 2000 should be plenty
+var s = "[";
+var i;
+for ( i=0; i < K-1; i++ )
+    s = s + `{"i":${i}},`;
+s += `{"i":${i}}]`;
+var v = JSON.parse(s);
+
+assertEq(v.length == K, true);
+
+for ( i=0; i < K; i++) {
+    assertEq(v[i] instanceof Object, true);
+    assertEq(v[i].i, i);
+}
+diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp
+--- a/js/src/vm/UnboxedObject.cpp
+++ b/js/src/vm/UnboxedObject.cpp
+@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSCon
+ #endif
+ 
+ #ifdef JS_CODEGEN_ARM64
+-    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
+    // addressing.  The register we use for PSP may however also be used by
+    // calling code, and it is nonvolatile, so save it.  Do this as a special
+    // case first because the generic save/restore code needs the PSP to be
+    // initialized already.
+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
+
+    // Initialize the PSP from the SP.
+     masm.initStackPtr();
+ #endif
+ 
+@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSCon
+         masm.pop(ScratchDoubleReg);
+     masm.PopRegsInMask(savedNonVolatileRegisters);
+ 
+#ifdef JS_CODEGEN_ARM64
+    // Now restore the value that was in the PSP register on entry, and return.
+
+    // Obtain the correct SP from the PSP.
+    masm.Mov(sp, PseudoStackPointer64);
+
+    // Restore the saved value of the PSP register, this value is whatever the
+    // caller had saved in it, not any actual SP value, and it must not be
+    // overwritten subsequently.
+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
+
+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
+    masm.Ret(vixl::lr);
+#else
+     masm.abiret();
+#endif
+ 
+     masm.bind(&failureStoreOther);
+ 
--- a/firefox.spec
+++ b/firefox.spec
@ -102,7 +102,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        60.0
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
@ -158,6 +158,7 @@ Patch413:        mozilla-1353817.patch
 Patch414:        mozilla-1435212-ffmpeg-4.0.patch
 Patch415:        Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch416:        mozilla-1424422.patch
+Patch417:        bug1375074-save-restore-x28.patch

 Patch421:        complete-csd-window-offset-mozilla-1457691.patch

@ -329,6 +330,7 @@ This package contains results of tests executed during build.
 %patch415 -p1 -b .mozilla-1238661
 %endif
 %patch416 -p1 -b .1424422
+%patch417 -p1 -b .bug1375074-save-restore-x28

 %patch421 -p1 -b .mozilla-1457691

@ -871,6 +873,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------

 %changelog
+* Thu May 3 2018 Martin Stransky <stransky@redhat.com> - 60.0-3
+- Added patch from mozbz#1375074 - fixes aarch64 baseline JIT crashes
+
 * Thu May 3 2018 Martin Stransky <stransky@redhat.com> - 60.0-2
 - Make Wayland backend optional and disable it by default due to WebGL issues.