Changeset 155564 in webkit for trunk/Source/JavaScriptCore/dfg/DFGValueSource.h

Timestamp:

Sep 11, 2013, 2:24:34 PM (12 years ago)

Author:

[email protected]

Message:

VariableAccessData::flushFormat() should be the universal way of deciding how to speculate on stores to locals and how locals are formatted
​https://bugs.webkit.org/show_bug.cgi?id=121142

Reviewed by Geoffrey Garen.

Make everyone rely on VariableAccessData::flushFormat() instead of trying to
compute that information from scratch. The FTL already used flushFormat(), now
the DFG does, too.

• dfg/DFGArgumentPosition.h:

(JSC::DFG::ArgumentPosition::someVariable):
(JSC::DFG::ArgumentPosition::flushFormat):

• dfg/DFGCSEPhase.cpp:

(JSC::DFG::CSEPhase::performNodeCSE):

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupSetLocalsInBlock):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::dump):

• dfg/DFGInPlaceAbstractState.cpp:

(JSC::DFG::InPlaceAbstractState::mergeStateAtTail):

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::noticeOSREntry):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileInlineStart):
(JSC::DFG::SpeculativeJIT::compileCurrentBlock):
(JSC::DFG::SpeculativeJIT::checkArgumentTypes):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGValueSource.h:

(JSC::DFG::ValueSource::forFlushFormat):

• dfg/DFGVariableAccessDataDump.cpp:

(JSC::DFG::VariableAccessDataDump::dump):

• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::LowerDFGToLLVM::compileSetLocal):

File:

• trunk/Source/JavaScriptCore/dfg/DFGValueSource.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGValueSource.h

@@ -32 +32 @@
 
 #include "DFGCommon.h"
+#include "DFGFlushFormat.h"
 #include "DFGMinifiedID.h"
 #include "DataFormat.h"
@@ -128 +129 @@
     }
     
-    static ValueSource forSpeculation(SpeculatedType prediction)
-    {
-        if (isInt32Speculation(prediction))
+    static ValueSource forFlushFormat(FlushFormat format)
+    {
+        switch (format) {
+        case DeadFlush:
+            return ValueSource(SourceIsDead);
+        case FlushedJSValue:
+            return ValueSource(ValueInJSStack);
+        case FlushedDouble:
+            return ValueSource(DoubleInJSStack);
+        case FlushedInt32:
             return ValueSource(Int32InJSStack);
-        if (isCellSpeculation(prediction))
+        case FlushedCell:
             return ValueSource(CellInJSStack);
-        if (isBooleanSpeculation(prediction))
+        case FlushedBoolean:
             return ValueSource(BooleanInJSStack);
-        return ValueSource(ValueInJSStack);
+        }
+        RELEASE_ASSERT_NOT_REACHED();
+        return ValueSource();
     }