From 4a2d8988d36c013aa80297f509c38e287c440882f1b8ad4fc928a27b20d3db9a Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 7 Jun 2018 11:56:20 +0000 Subject: [PATCH] Accepting request 614877 from home:Guillaume_G:branches:mozilla:Factory - Add upstream patch to fix boo#1093059 instead of '-ffixed-x28' workaround: * mozilla-bmo1375074.patch OBS-URL: https://build.opensuse.org/request/show/614877 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=670 --- MozillaFirefox.changes | 9 +++- MozillaFirefox.spec | 5 +-- mozilla-bmo1375074.patch | 95 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 mozilla-bmo1375074.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index e420e8a..395fb10 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,9 +1,16 @@ +------------------------------------------------------------------- +Wed Jun 6 18:57:52 UTC 2018 - guillaume.gardet@opensuse.org + +- Add upstream patch to fix boo#1093059 instead of '-ffixed-x28' + workaround: + * mozilla-bmo1375074.patch + ------------------------------------------------------------------- Sat May 26 15:53:25 UTC 2018 - wr@rosenauer.org - fixed "open with" option under KDE (boo#1094747) - workaround crash on startup on aarch64 (boo#1093059) - (contributed by guillaume@Arm.com) + (contributed by guillaume.gardet@arm.com) ------------------------------------------------------------------- Wed May 23 08:49:09 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index df95588..bdbd2b9 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -158,6 +158,7 @@ Patch9: mozilla-i586-DecoderDoctorLogger.patch Patch10: mozilla-i586-domPrefs.patch Patch11: mozilla-enable-csd.patch Patch12: mozilla-fix-skia-aarch64.patch +Patch13: mozilla-bmo1375074.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -273,6 +274,7 @@ cd $RPM_BUILD_DIR/%{source_prefix} %endif %patch11 -p1 %patch12 -p1 +%patch13 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -306,9 +308,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %if 0%{?suse_version} > 1320 export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" %endif -%ifarch aarch64 -export CFLAGS="$CFLAGS -ffixed-x28" -%endif %ifarch %arm export CFLAGS="${CFLAGS/-g / }" %endif diff --git a/mozilla-bmo1375074.patch b/mozilla-bmo1375074.patch new file mode 100644 index 0000000..26bb381 --- /dev/null +++ b/mozilla-bmo1375074.patch @@ -0,0 +1,95 @@ + +# HG changeset patch +# User Lars T Hansen +# Date 1519822672 -3600 +# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6 +# Parent 223c97459e96183eb616aed39147207bdb953ba8 +Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor. r=sstangl + +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 +@@ -90,17 +90,25 @@ UnboxedLayout::makeConstructorCode(JSCon + masm.loadPtr(Address(masm.getStackPointer(), sizeof(void*)), propertiesReg); + masm.loadPtr(Address(masm.getStackPointer(), 2 * sizeof(void*)), newKindReg); + #else + propertiesReg = IntArgReg0; + newKindReg = IntArgReg1; + #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 + + MOZ_ASSERT(propertiesReg.volatile_()); + MOZ_ASSERT(newKindReg.volatile_()); + + AllocatableGeneralRegisterSet regs(GeneralRegisterSet::All()); + regs.take(propertiesReg); +@@ -228,17 +236,32 @@ UnboxedLayout::makeConstructorCode(JSCon + if (object != ReturnReg) + masm.movePtr(object, ReturnReg); + + // Restore non-volatile registers which were saved on entry. + if (ScratchDoubleReg.volatile_()) + 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); + + // There was a failure while storing a value which cannot be stored at all + // in the unboxed object. Initialize the object so it is safe for GC and + // return null. + masm.initUnboxedObjectContents(object, templateObject); + +