Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)

1 files changed, 21 insertions, 8 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGDriver.cpp b/Source/JavaScriptCore/dfg/DFGDriver.cpp
index 27a0dab75..124d7e637 100644
--- a/Source/JavaScriptCore/dfg/DFGDriver.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDriver.cpp
@@ -28,9 +28,13 @@
 
 #if ENABLE(DFG_JIT)
 
+#include "DFGArithNodeFlagsInferencePhase.h"
 #include "DFGByteCodeParser.h"
+#include "DFGCFAPhase.h"
+#include "DFGCSEPhase.h"
 #include "DFGJITCompiler.h"
-#include "DFGPropagator.h"
+#include "DFGPredictionPropagationPhase.h"
+#include "DFGVirtualRegisterAllocationPhase.h"
 
 namespace JSC { namespace DFG {
 
@@ -44,19 +48,28 @@ inline bool compile(CompileMode compileMode, JSGlobalData& globalData, CodeBlock
     ASSERT(codeBlock->alternative()->getJITType() == JITCode::BaselineJIT);
 
 #if DFG_ENABLE(DEBUG_VERBOSE)
-    fprintf(stderr, "DFG compiling code block %p(%p), number of instructions = %u.\n", codeBlock, codeBlock->alternative(), codeBlock->instructionCount());
+    dataLog("DFG compiling code block %p(%p), number of instructions = %u.\n", codeBlock, codeBlock->alternative(), codeBlock->instructionCount());
 #endif
     
-    Graph dfg;
-    if (!parse(dfg, &globalData, codeBlock))
+    Graph dfg(globalData, codeBlock);
+    if (!parse(dfg))
         return false;
     
     if (compileMode == CompileFunction)
-        dfg.predictArgumentTypes(codeBlock);
-    
-    propagate(dfg, &globalData, codeBlock);
+        dfg.predictArgumentTypes();
+
+    performArithNodeFlagsInference(dfg);
+    performPredictionPropagation(dfg);
+    performCSE(dfg);
+    performVirtualRegisterAllocation(dfg);
+    performCFA(dfg);
+
+#if DFG_ENABLE(DEBUG_VERBOSE)
+    dataLog("Graph after optimization:\n");
+    dfg.dump();
+#endif
     
-    JITCompiler dataFlowJIT(&globalData, dfg, codeBlock);
+    JITCompiler dataFlowJIT(dfg);
     if (compileMode == CompileFunction) {
         ASSERT(jitCodeWithArityCheck);