Added workaround for bug 957504

sailfishos · Jan 14, 2014 · 7bacd4a · 7bacd4a
1 parent 49ce2f3
commit 7bacd4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/embedding/embedlite/embedding.js b/embedding/embedlite/embedding.js
@@ -303,3 +303,8 @@ pref("extensions.minCompatibleAppVersion", "11.0");
 
 // Enable sub layers for apzc
 pref("layout.want.subapzc", true);
+
+// Temporary, until bug 957504 fixed
+pref("javascript.options.baselinejit.content", false);
+pref("javascript.options.baselinejit.chrome",  false);
+
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp
@@ -3533,7 +3533,7 @@ MacroAssemblerARMCompat::passABIArg(const MoveOperand &from, MoveOp::Type type)
         } else {
             // If (and only if) the integer registers have started spilling, do we
             // need to take the register's alignment into account
-            uint32_t disp = GetFloatArgStackDisp(usedIntSlots_, usedFloatSlots_, &padding_);
+            uint32_t disp = GetDoubleArgStackDisp(usedIntSlots_, usedFloatSlots_, &padding_);
             to = MoveOperand(sp, disp);
         }
         usedFloatSlots_++;