Title: [163494] tags/Safari-538.16.2/Source/_javascript_Core
Diff
Modified: tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog (163493 => 163494)
--- tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 00:52:04 UTC (rev 163493)
+++ tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 00:54:30 UTC (rev 163494)
@@ -1,5 +1,15 @@
2014-02-05 Lucas Forschler <[email protected]>
+ Merge r163473
+
+ 2014-02-05 Mark Hahnenberg <[email protected]>
+
+ Fix 32-bit builds after r163471
+
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+
+2014-02-05 Lucas Forschler <[email protected]>
+
Merge r163471
2014-02-05 Mark Hahnenberg <[email protected]>
Modified: tags/Safari-538.16.2/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (163493 => 163494)
--- tags/Safari-538.16.2/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2014-02-06 00:52:04 UTC (rev 163493)
+++ tags/Safari-538.16.2/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2014-02-06 00:54:30 UTC (rev 163494)
@@ -160,6 +160,7 @@
jit.store32(AssemblyHelpers::TrustedImm32(locationBits), AssemblyHelpers::tagFor((VirtualRegister)(JSStack::ArgumentCount)));
}
+#if ENABLE(GGC)
static void osrWriteBarrier(CCallHelpers& jit, GPRReg owner, GPRReg scratch1, GPRReg scratch2)
{
AssemblyHelpers::Jump definitelyNotMarked = jit.genericWriteBarrier(owner, scratch1, scratch2);
@@ -179,6 +180,7 @@
definitelyNotMarked.link(&jit);
}
+#endif // ENABLE(GGC)
void adjustAndJumpToTarget(CCallHelpers& jit, const OSRExitBase& exit)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
