From 32ea33253afbbdefd2680aa95ab5f57455272ae7 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 30 Nov 2012 16:58:06 +0100 Subject: Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 (http://svn.webkit.org/repository/webkit/trunk@136242) Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split Extra fixes will be cherry-picked. Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681 Reviewed-by: Simon Hausmann --- Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp') diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp b/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp index c65443e29..5d2155cba 100644 --- a/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp +++ b/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp @@ -32,6 +32,7 @@ #include "DFGCommon.h" #include "LinkBuffer.h" #include "RepatchBuffer.h" +#include namespace JSC { namespace DFG { @@ -81,7 +82,10 @@ void compileOSRExit(ExecState* exec) recovery = &codeBlock->speculationRecovery(exit.m_recoveryIndex - 1); #if DFG_ENABLE(DEBUG_VERBOSE) - dataLogF("Generating OSR exit #%u (seq#%u, bc#%u, @%u, %s) for code block %p.\n", exitIndex, exit.m_streamIndex, exit.m_codeOrigin.bytecodeIndex, exit.m_nodeIndex, exitKindToString(exit.m_kind), codeBlock); + dataLog( + "Generating OSR exit #", exitIndex, " (seq#", exit.m_streamIndex, + ", bc#", exit.m_codeOrigin.bytecodeIndex, ", @", exit.m_nodeIndex, ", ", + exitKindToString(exit.m_kind), ") for ", *codeBlock, ".\n"); #endif { @@ -95,9 +99,9 @@ void compileOSRExit(ExecState* exec) exit.m_code = FINALIZE_CODE_IF( shouldShowDisassembly(), patchBuffer, - ("DFG OSR exit #%u (bc#%u, @%u, %s) from CodeBlock %p", - exitIndex, exit.m_codeOrigin.bytecodeIndex, exit.m_nodeIndex, - exitKindToString(exit.m_kind), codeBlock)); + ("DFG OSR exit #%u (bc#%u, @%u, %s) from %s", + exitIndex, exit.m_codeOrigin.bytecodeIndex, exit.m_nodeIndex, + exitKindToString(exit.m_kind), toCString(*codeBlock).data())); } { -- cgit v1.2.1