Modified: trunk/Source/_javascript_Core/ChangeLog (210137 => 210138)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-23 19:08:43 UTC (rev 210137)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-23 19:26:21 UTC (rev 210138)
@@ -1,3 +1,14 @@
+2016-12-23 Mark Lam <[email protected]>
+
+ Enhance LLInt tracing to dump the codeBlock signature instead of just a pointer where appropriate.
+ https://bugs.webkit.org/show_bug.cgi?id=166465
+
+ Reviewed by Keith Miller.
+
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ (JSC::LLInt::traceFunctionPrologue):
+
2016-12-23 Keith Miller <[email protected]>
WebAssembly: trap on bad division.
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (210137 => 210138)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-12-23 19:08:43 UTC (rev 210137)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-12-23 19:26:21 UTC (rev 210138)
@@ -228,7 +228,8 @@
LLINT_SLOW_PATH_DECL(trace_prologue)
{
- dataLogF("%p / %p: in prologue.\n", exec->codeBlock(), exec);
+ dataLogF("%p / %p: in prologue of ", exec->codeBlock(), exec);
+ dataLog(*exec->codeBlock(), "\n");
LLINT_END_IMPL();
}
@@ -237,10 +238,10 @@
JSFunction* callee = jsCast<JSFunction*>(exec->jsCallee());
FunctionExecutable* executable = callee->jsExecutable();
CodeBlock* codeBlock = executable->codeBlockFor(kind);
- dataLogF("%p / %p: in %s of function %p, executable %p; numVars = %u, numParameters = %u, numCalleeLocals = %u, caller = %p.\n",
- codeBlock, exec, comment, callee, executable,
- codeBlock->m_numVars, codeBlock->numParameters(), codeBlock->m_numCalleeLocals,
- exec->callerFrame());
+ dataLogF("%p / %p: in %s of ", codeBlock, exec, comment);
+ dataLog(*codeBlock);
+ dataLogF(" function %p, executable %p; numVars = %u, numParameters = %u, numCalleeLocals = %u, caller = %p.\n",
+ callee, executable, codeBlock->m_numVars, codeBlock->numParameters(), codeBlock->m_numCalleeLocals, exec->callerFrame());
}
LLINT_SLOW_PATH_DECL(trace_prologue_function_for_call)
@@ -489,7 +490,7 @@
#if LLINT_SLOW_PATH_TRACING
dataLogF("Checking stack height with exec = %p.\n", exec);
- dataLogF("CodeBlock = %p.\n", exec->codeBlock());
+ dataLog("CodeBlock = ", *exec->codeBlock(), "\n");
dataLogF("Num callee registers = %u.\n", exec->codeBlock()->m_numCalleeLocals);
dataLogF("Num vars = %u.\n", exec->codeBlock()->m_numVars);
