Changeset 156050 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Sep 18, 2013, 10:27:08 AM (12 years ago)

Author:

[email protected]

Message:

Rename OperationInProgress to HeapOperation and move it out of Heap.h into its own header
​https://bugs.webkit.org/show_bug.cgi?id=121534

Reviewed by Geoffrey Garen.

OperationInProgress is a silly name.

Many parts of the Heap would like to know what HeapOperation is currently underway, but
since they are included in Heap.h they can't directly reference HeapOperation if it also
lives in Heap.h. The simplest thing to do is to give HeapOperation its own header. While
a bit overkill, it simplifies including it wherever its needed.

• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::updateAllPredictionsAndCountLiveness):
(JSC::CodeBlock::updateAllValueProfilePredictions):
(JSC::CodeBlock::updateAllPredictions):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::updateAllValueProfilePredictions):
(JSC::CodeBlock::updateAllPredictions):

• bytecode/LazyOperandValueProfile.cpp:

(JSC::CompressedLazyOperandValueProfileHolder::computeUpdatedPredictions):

• bytecode/LazyOperandValueProfile.h:
• bytecode/ValueProfile.h:

(JSC::ValueProfileBase::computeUpdatedPrediction):

• heap/Heap.h:
• heap/HeapOperation.h: Added.

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -913 +913 @@
 #if ENABLE(VALUE_PROFILER)
     bool shouldOptimizeNow();
-    void updateAllValueProfilePredictions(OperationInProgress = NoOperation);
+    void updateAllValueProfilePredictions(HeapOperation = NoOperation);
     void updateAllArrayPredictions();
-    void updateAllPredictions(OperationInProgress = NoOperation);
+    void updateAllPredictions(HeapOperation = NoOperation);
 #else
     bool updateAllPredictionsAndCheckIfShouldOptimizeNow() { return false; }
-    void updateAllValueProfilePredictions(OperationInProgress = NoOperation) { }
+    void updateAllValueProfilePredictions(HeapOperation = NoOperation) { }
     void updateAllArrayPredictions() { }
-    void updateAllPredictions(OperationInProgress = NoOperation) { }
+    void updateAllPredictions(HeapOperation = NoOperation) { }
 #endif
 
@@ -984 +984 @@
         
 #if ENABLE(VALUE_PROFILER)
-    void updateAllPredictionsAndCountLiveness(OperationInProgress, unsigned& numberOfLiveNonArgumentValueProfiles, unsigned& numberOfSamplesInProfiles);
+    void updateAllPredictionsAndCountLiveness(HeapOperation, unsigned& numberOfLiveNonArgumentValueProfiles, unsigned& numberOfSamplesInProfiles);
 #endif