CodeBlock::jettison() shouldn't call baselineVersion()
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Nov 2013 00:32:23 +0000 (00:32 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 3 Nov 2013 00:32:23 +0000 (00:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=123675

Reviewed by Geoffrey Garen.

Fix more uses of baselineVersion().

* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::jettison):
* bytecode/CodeBlock.h:
* bytecode/ProfiledCodeBlockJettisoningWatchpoint.cpp:
(JSC::ProfiledCodeBlockJettisoningWatchpoint::fireInternal):

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/bytecode/CodeBlock.cpp
Source/JavaScriptCore/bytecode/CodeBlock.h
Source/JavaScriptCore/bytecode/ProfiledCodeBlockJettisoningWatchpoint.cpp

index 2856af5..1d2983b 100644 (file)
@@ -1,5 +1,20 @@
 2013-11-02  Filip Pizlo  <fpizlo@apple.com>
 
+        CodeBlock::jettison() shouldn't call baselineVersion()
+        https://bugs.webkit.org/show_bug.cgi?id=123675
+
+        Reviewed by Geoffrey Garen.
+        
+        Fix more uses of baselineVersion().
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::jettison):
+        * bytecode/CodeBlock.h:
+        * bytecode/ProfiledCodeBlockJettisoningWatchpoint.cpp:
+        (JSC::ProfiledCodeBlockJettisoningWatchpoint::fireInternal):
+
+2013-11-02  Filip Pizlo  <fpizlo@apple.com>
+
         LLVM asserts in internal-js-tests.yaml/Octane/stress-tests/mandreel.js
         https://bugs.webkit.org/show_bug.cgi?id=123535
 
index 1e5f9ed..e309993 100644 (file)
@@ -2851,7 +2851,9 @@ void CodeBlock::jettison(ReoptimizationMode mode)
     
     // Count the reoptimization if that's what the user wanted.
     if (mode == CountReoptimization) {
-        baselineVersion()->countReoptimization();
+        // FIXME: Maybe this should call alternative().
+        // https://bugs.webkit.org/show_bug.cgi?id=123677
+        baselineAlternative()->countReoptimization();
         if (DFG::shouldShowDisassembly())
             dataLog("    Did count reoptimization for ", *this, "\n");
     }
index c21bbba..f5ebe0d 100644 (file)
@@ -137,6 +137,9 @@ public:
     }
     
     CodeBlock* baselineAlternative();
+    
+    // FIXME: Get rid of this.
+    // https://bugs.webkit.org/show_bug.cgi?id=123677
     CodeBlock* baselineVersion();
 
     void visitAggregate(SlotVisitor&);
index 4bb2ba8..edf8e22 100644 (file)
@@ -40,6 +40,8 @@ void ProfiledCodeBlockJettisoningWatchpoint::fireInternal()
             m_exitKind, " at ", m_codeOrigin, "\n");
     }
     
+    // FIXME: Maybe this should call alternative().
+    // https://bugs.webkit.org/show_bug.cgi?id=123677
     CodeBlock* machineBaselineCodeBlock = m_codeBlock->baselineAlternative();
     CodeBlock* sourceBaselineCodeBlock =
         baselineCodeBlockForOriginAndBaselineCodeBlock(