Break Crankshaft into phases.

src/compiler.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 29 matching lines @@
 #include "lithium.h"
 #include "liveedit.h"
 #include "parser.h"
 #include "rewriter.h"
 #include "runtime-profiler.h"
 #include "scanner-character-streams.h"
 #include "scopeinfo.h"
 #include "scopes.h"
 #include "vm-state-inl.h"
 
+#if V8_TARGET_ARCH_IA32
+#include "ia32/lithium-ia32.h"

[danno, 2012/07/12 11:14:54]

Why do you need these? At this point, all of the calls that you make to LChunk
and co. shouldn't require the platform specific headers, right?

[sanjoy, 2012/07/12 11:34:18]

The register allocator needed an LChunk to operate on.  Fixed this by getting to
work with an LChunkBase instead.

+#elif V8_TARGET_ARCH_X64
+#include "x64/lithium-x64.h"
+#elif V8_TARGET_ARCH_ARM
+#include "arm/lithium-arm.h"
+#elif V8_TARGET_ARCH_MIPS
+#include "mips/lithium-mips.h"
+#else
+#error "Unknown architecture."
+#endif
+
 namespace v8 {
 namespace internal {
 
 
 CompilationInfo::CompilationInfo(Handle<Script> script, Zone* zone)
     : isolate_(script->GetIsolate()),
       flags_(LanguageModeField::encode(CLASSIC_MODE)),
       function_(NULL),
       scope_(NULL),
       global_scope_(NULL),
@@ skipping 241 matching lines @@
                             info->zone());
   HGraphBuilder builder(info, &oracle);
   HPhase phase(HPhase::kTotal);
   HGraph* graph = builder.CreateGraph();
   if (info->isolate()->has_pending_exception()) {
     info->SetCode(Handle<Code>::null());
     return false;
   }
 
   if (graph != NULL) {
-    Handle<Code> optimized_code = graph->Compile();
-    if (!optimized_code.is_null()) {
-      info->SetCode(optimized_code);
-      FinishOptimization(info->closure(), start);
-      return true;
+    SmartArrayPointer<char> bailout_reason;
+    if (!graph->Optimize(&bailout_reason)) {
+      if (!bailout_reason.is_empty()) builder.Bailout(*bailout_reason);
+    } else {
+      LChunk* chunk = LChunkBase::NewChunk(graph);
+      if (chunk != NULL) {
+        Handle<Code> optimized_code = chunk->Codegen();
+        if (!optimized_code.is_null()) {
+          info->SetCode(optimized_code);
+          FinishOptimization(info->closure(), start);
+          return true;
+        }
+      }
     }
   }
 
   // Keep using the shared code.
   info->AbortOptimization();
   if (!builder.inline_bailout()) {
     // Mark the shared code as unoptimizable unless it was an inlined
     // function that bailed out.
     info->shared_info()->DisableOptimization();
   }
@@ skipping 544 matching lines @@
     }
   }
 
   GDBJIT(AddCode(Handle<String>(shared->DebugName()),
                  Handle<Script>(info->script()),
                  Handle<Code>(info->code()),
                  info));
 }
 
 } }  // namespace v8::internal