Title: [161483] branches/jsCStack/Source/_javascript_Core
- Revision
- 161483
- Author
- fpi...@apple.com
- Date
- 2014-01-07 23:02:54 -0800 (Tue, 07 Jan 2014)
Log Message
CStack: Call linking should log call linking for DFG and FTL code blocks if --showDFGDisassembly=true
https://bugs.webkit.org/show_bug.cgi?id=126617
Not yet reviewed.
* jit/Repatch.cpp:
(JSC::linkFor):
Modified Paths
Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (161482 => 161483)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-08 06:42:50 UTC (rev 161482)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-08 07:02:54 UTC (rev 161483)
@@ -1,5 +1,15 @@
2014-01-07 Filip Pizlo <fpi...@apple.com>
+ CStack: Call linking should log call linking for DFG and FTL code blocks if --showDFGDisassembly=true
+ https://bugs.webkit.org/show_bug.cgi?id=126617
+
+ Not yet reviewed.
+
+ * jit/Repatch.cpp:
+ (JSC::linkFor):
+
+2014-01-07 Filip Pizlo <fpi...@apple.com>
+
Merge trunk r161465.
2014-01-07 Filip Pizlo <fpi...@apple.com>
Modified: branches/jsCStack/Source/_javascript_Core/jit/Repatch.cpp (161482 => 161483)
--- branches/jsCStack/Source/_javascript_Core/jit/Repatch.cpp 2014-01-08 06:42:50 UTC (rev 161482)
+++ branches/jsCStack/Source/_javascript_Core/jit/Repatch.cpp 2014-01-08 07:02:54 UTC (rev 161483)
@@ -1298,7 +1298,7 @@
ASSERT(!callLinkInfo.isLinked());
callLinkInfo.callee.set(exec->callerFrame()->vm(), callLinkInfo.hotPathBegin, callerCodeBlock->ownerExecutable(), callee);
callLinkInfo.lastSeenCallee.set(exec->callerFrame()->vm(), callerCodeBlock->ownerExecutable(), callee);
- if (Options::showDisassembly())
+ if (shouldShowDisassemblyFor(callerCodeBlock))
dataLog("Linking call in ", *callerCodeBlock, " at ", callLinkInfo.codeOrigin, " to ", pointerDump(calleeCodeBlock), ", entrypoint at ", codePtr, "\n");
repatchBuffer.relink(callLinkInfo.hotPathOther, codePtr);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
