commit 2385e39784935db621b8a1e62da7a4caa5d03b47
author mhahnenberg@apple.com <mhahnenberg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Feb 27 01:09:39 2014 +0000
committer mhahnenberg@apple.com <mhahnenberg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Feb 27 01:09:39 2014 +0000
tree 81cde0687afe264d5325865eee2160c98452db54
parent f6aa791d2046547b6f9ecb5338f2e187232e2489

Unconditional logging in compileFTLOSRExit
https://bugs.webkit.org/show_bug.cgi?id=129407

Reviewed by Michael Saboff.

This was causing tests to fail with the FTL enabled.

* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileFTLOSRExit):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@164761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index ec1e17d..8412025 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-02-26  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Unconditional logging in compileFTLOSRExit
+        https://bugs.webkit.org/show_bug.cgi?id=129407
+
+        Reviewed by Michael Saboff.
+
+        This was causing tests to fail with the FTL enabled.
+
+        * ftl/FTLOSRExitCompiler.cpp:
+        (JSC::FTL::compileFTLOSRExit):
+
 2014-02-26  Oliver Hunt  <oliver@apple.com>
 
         Remove unused access types

Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp

diff --git a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
index 37c149e..86a2dcb 100644
--- a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
+++ b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
@@ -353,8 +353,9 @@
 extern "C" void* compileFTLOSRExit(ExecState* exec, unsigned exitID)
 {
     SamplingRegion samplingRegion("FTL OSR Exit Compilation");
-    
-    dataLog("Compiling OSR exit with exitID = ", exitID, "\n");
+
+    if (shouldShowDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit())
+        dataLog("Compiling OSR exit with exitID = ", exitID, "\n");
     
     CodeBlock* codeBlock = exec->codeBlock();