Remove old x64 code generator.

runtime/vm/compiler.cc

Index: runtime/vm/compiler.cc
===================================================================
--- runtime/vm/compiler.cc	(revision 7349)
+++ runtime/vm/compiler.cc	(working copy)
@@ -131,6 +131,115 @@
 }
 
 
+static void CompileParsedFunctionHelper(
+    const ParsedFunction& parsed_function, bool optimized) {
+  Isolate* isolate = Isolate::Current();
+  TimerScope timer(FLAG_compiler_stats, &CompilerStats::codegen_timer);
+  const Function& function = parsed_function.function();
+  const char* function_fullname = function.ToFullyQualifiedCString();
+  bool is_compiled = false;
+  if (FLAG_use_new_compiler) {
+    ASSERT(!optimized);
+    LongJump* old_base = isolate->long_jump_base();
+    LongJump bailout_jump;
+    isolate->set_long_jump_base(&bailout_jump);
+    if (setjmp(*bailout_jump.Set()) == 0) {
+      FlowGraphBuilder graph_builder(parsed_function);
+      graph_builder.BuildGraph();
+
+      // The non-optimizing compiler compiles blocks in reverse postorder,
+      // because it is a 'natural' order for the human reader of the
+      // generated code.
+      intptr_t length = graph_builder.postorder_block_entries().length();
+      GrowableArray<BlockEntryInstr*> block_order(length);
+      for (intptr_t i = length - 1; i >= 0; --i) {
+        block_order.Add(graph_builder.postorder_block_entries()[i]);
+      }
+
+      Assembler assembler;
+      FlowGraphCompiler graph_compiler(&assembler, parsed_function,
+                                       block_order);
+      graph_compiler.CompileGraph();
+
+      TimerScope timer(FLAG_compiler_stats,
+                       &CompilerStats::codefinalizer_timer);
+      const Code& code =
+          Code::Handle(Code::FinalizeCode(function_fullname, &assembler));
+      code.set_is_optimized(false);
+      graph_compiler.FinalizePcDescriptors(code);
+      graph_compiler.FinalizeStackmaps(code);
+      graph_compiler.FinalizeVarDescriptors(code);
+      graph_compiler.FinalizeExceptionHandlers(code);
+      function.set_unoptimized_code(code);
+      function.SetCode(code);
+      ASSERT(CodePatcher::CodeIsPatchable(code));
+      is_compiled = true;
+    } else {
+      // We bailed out.
+      Error& bailout_error = Error::Handle(
+          isolate->object_store()->sticky_error());
+      isolate->object_store()->clear_sticky_error();
+      if (FLAG_trace_bailout) {
+        OS::Print("%s\n", bailout_error.ToErrorCString());
+      }
+    }
+    isolate->set_long_jump_base(old_base);
+  }
+
+  if (!is_compiled) {
+    Assembler assembler;
+    if (optimized) {
+      // Transition to optimized code only from unoptimized code ...
+      // for now.
+      ASSERT(function.HasCode());
+      ASSERT(!function.HasOptimizedCode());
+      // Do not use type feedback to optimize a function that was
+      // deoptimized too often.
+      if (parsed_function.function().deoptimization_counter() <
+          FLAG_deoptimization_counter_threshold) {
+        ExtractTypeFeedback(
+            Code::Handle(parsed_function.function().unoptimized_code()),
+            parsed_function.node_sequence());
+      }
+      OptimizingCodeGenerator code_gen(&assembler, parsed_function);
+      code_gen.GenerateCode();
+      TimerScope timer(FLAG_compiler_stats,
+                       &CompilerStats::codefinalizer_timer);
+      Code& code = Code::Handle(
+          Code::FinalizeCode(function_fullname, &assembler));
+      code.set_is_optimized(true);
+      code_gen.FinalizePcDescriptors(code);
+      code_gen.FinalizeStackmaps(code);
+      code_gen.FinalizeExceptionHandlers(code);
+      function.SetCode(code);
+      CodePatcher::PatchEntry(Code::Handle(function.unoptimized_code()));
+      if (FLAG_trace_compiler) {
+        OS::Print("--> patching entry 0x%x\n",
+                  Code::Handle(function.unoptimized_code()).EntryPoint());
+      }
+    } else {
+      // Compile unoptimized code.
+      ASSERT(!function.HasCode());
+      // Compiling first time.
+      CodeGenerator code_gen(&assembler, parsed_function);
+      code_gen.GenerateCode();
+      TimerScope timer(FLAG_compiler_stats,
+                       &CompilerStats::codefinalizer_timer);
+      const Code& code =
+          Code::Handle(Code::FinalizeCode(function_fullname, &assembler));
+      code.set_is_optimized(false);
+      code_gen.FinalizePcDescriptors(code);
+      code_gen.FinalizeStackmaps(code);
+      code_gen.FinalizeVarDescriptors(code);
+      code_gen.FinalizeExceptionHandlers(code);
+      function.set_unoptimized_code(code);
+      function.SetCode(code);
+      ASSERT(CodePatcher::CodeIsPatchable(code));
+    }
+  }
+}
+
+
 static RawError* CompileFunctionHelper(const Function& function,
                                        bool optimized) {
   Isolate* isolate = Isolate::Current();
@@ -147,128 +256,30 @@
   if (setjmp(*jump.Set()) == 0) {
     TIMERSCOPE(time_compilation);
     ParsedFunction parsed_function(function);
-    const char* function_fullname = function.ToFullyQualifiedCString();
     if (FLAG_trace_compiler) {
       OS::Print("Compiling %sfunction: '%s' @ token %d\n",
                 (optimized ? "optimized " : ""),
-                function_fullname,
+                function.ToFullyQualifiedCString(),
                 function.token_index());
     }
     Parser::ParseFunction(&parsed_function);
     parsed_function.AllocateVariables();
 
-    TimerScope timer(FLAG_compiler_stats, &CompilerStats::codegen_timer);
-    bool is_compiled = false;
-    if (FLAG_use_new_compiler) {
-      ASSERT(!optimized);
-      LongJump* old_base = isolate->long_jump_base();
-      LongJump bailout_jump;
-      isolate->set_long_jump_base(&bailout_jump);
-      if (setjmp(*bailout_jump.Set()) == 0) {
-        FlowGraphBuilder graph_builder(parsed_function);
-        graph_builder.BuildGraph();
+    CompileParsedFunctionHelper(parsed_function, optimized);
 
-        // The non-optimizing compiler compiles blocks in reverse postorder,
-        // because it is a 'natural' order for the human reader of the
-        // generated code.
-        intptr_t length = graph_builder.postorder_block_entries().length();
-        GrowableArray<BlockEntryInstr*> block_order(length);
-        for (intptr_t i = length - 1; i >= 0; --i) {
-          block_order.Add(graph_builder.postorder_block_entries()[i]);
-        }
-
-        Assembler assembler;
-        FlowGraphCompiler graph_compiler(&assembler, parsed_function,
-                                         block_order);
-        graph_compiler.CompileGraph();
-
-        TimerScope timer(FLAG_compiler_stats,
-                         &CompilerStats::codefinalizer_timer);
-        const Code& code =
-            Code::Handle(Code::FinalizeCode(function_fullname, &assembler));
-        code.set_is_optimized(false);
-        graph_compiler.FinalizePcDescriptors(code);
-        graph_compiler.FinalizeStackmaps(code);
-        graph_compiler.FinalizeVarDescriptors(code);
-        graph_compiler.FinalizeExceptionHandlers(code);
-        function.set_unoptimized_code(code);
-        function.SetCode(code);
-        ASSERT(CodePatcher::CodeIsPatchable(code));
-        is_compiled = true;
-      } else {
-        // We bailed out.
-        Error& bailout_error = Error::Handle(
-            isolate->object_store()->sticky_error());
-        isolate->object_store()->clear_sticky_error();
-        if (FLAG_trace_bailout) {
-          OS::Print("%s\n", bailout_error.ToErrorCString());
-        }
-      }
-      isolate->set_long_jump_base(old_base);
-    }
-
-    if (!is_compiled) {
-      Assembler assembler;
-      if (optimized) {
-        // Transition to optimized code only from unoptimized code ...
-        // for now.
-        ASSERT(function.HasCode());
-        ASSERT(!function.HasOptimizedCode());
-        // Do not use type feedback to optimize a function that was
-        // deoptimized too often.
-        if (parsed_function.function().deoptimization_counter() <
-            FLAG_deoptimization_counter_threshold) {
-          ExtractTypeFeedback(
-              Code::Handle(parsed_function.function().unoptimized_code()),
-              parsed_function.node_sequence());
-        }
-        OptimizingCodeGenerator code_gen(&assembler, parsed_function);
-        code_gen.GenerateCode();
-        TimerScope timer(FLAG_compiler_stats,
-                         &CompilerStats::codefinalizer_timer);
-        Code& code = Code::Handle(
-            Code::FinalizeCode(function_fullname, &assembler));
-        code.set_is_optimized(true);
-        code_gen.FinalizePcDescriptors(code);
-        code_gen.FinalizeStackmaps(code);
-        code_gen.FinalizeExceptionHandlers(code);
-        function.SetCode(code);
-        CodePatcher::PatchEntry(Code::Handle(function.unoptimized_code()));
-        if (FLAG_trace_compiler) {
-          OS::Print("--> patching entry 0x%x\n",
-                    Code::Handle(function.unoptimized_code()).EntryPoint());
-        }
-      } else {
-        // Compile unnoptimized code.
-        ASSERT(!function.HasCode());
-        // Compiling first time.
-        CodeGenerator code_gen(&assembler, parsed_function);
-        code_gen.GenerateCode();
-        TimerScope timer(FLAG_compiler_stats,
-                         &CompilerStats::codefinalizer_timer);
-        const Code& code =
-            Code::Handle(Code::FinalizeCode(function_fullname, &assembler));
-        code.set_is_optimized(false);
-        code_gen.FinalizePcDescriptors(code);
-        code_gen.FinalizeStackmaps(code);
-        code_gen.FinalizeVarDescriptors(code);
-        code_gen.FinalizeExceptionHandlers(code);
-        function.set_unoptimized_code(code);
-        function.SetCode(code);
-        ASSERT(CodePatcher::CodeIsPatchable(code));
-      }
-    }
     if (FLAG_trace_compiler) {
       OS::Print("--> '%s' entry: 0x%x\n",
-                function_fullname,
+                function.ToFullyQualifiedCString(),
                 Code::Handle(function.CurrentCode()).EntryPoint());
     }
     if (Isolate::Current()->debugger()->IsActive()) {
       Isolate::Current()->debugger()->NotifyCompilation(function);
     }
     if (FLAG_disassemble) {
+      const char* function_fullname = function.ToFullyQualifiedCString();
       OS::Print("Code for %sfunction '%s' {\n",
-                optimized ? "optimized " : "", function_fullname);
+                optimized ? "optimized " : "",
+                function_fullname);
       const Code& code = Code::Handle(function.CurrentCode());
       const Instructions& instructions =
           Instructions::Handle(code.instructions());
@@ -332,6 +343,25 @@
 }
 
 
+RawError* Compiler::CompileParsedFunction(
+    const ParsedFunction& parsed_function) {
+  Isolate* isolate = Isolate::Current();
+  Error& error = Error::Handle();
+  LongJump* base = isolate->long_jump_base();
+  LongJump jump;
+  isolate->set_long_jump_base(&jump);
+  if (setjmp(*jump.Set()) == 0) {
+    CompileParsedFunctionHelper(parsed_function, false);  // Non-optimized.
+  } else {
+    // We got an error during compilation.
+    error = isolate->object_store()->sticky_error();
+    isolate->object_store()->clear_sticky_error();
+  }
+  isolate->set_long_jump_base(base);
+  return error.raw();
+}
+
+
 RawError* Compiler::CompileAllFunctions(const Class& cls) {
   Error& error = Error::Handle();
   Array& functions = Array::Handle(cls.functions());
@@ -387,16 +417,8 @@
     parsed_function.SetNodeSequence(fragment);
     parsed_function.set_default_parameter_values(Array::Handle());
 
-    Assembler assembler;
-    CodeGenerator code_gen(&assembler, parsed_function);
-    code_gen.GenerateCode();
-    const Code& code = Code::Handle(Code::FinalizeCode(kEvalConst, &assembler));
+    CompileParsedFunctionHelper(parsed_function, false);  // Non-optimized.
 
-    func.SetCode(code);
-    code_gen.FinalizePcDescriptors(code);
-    code_gen.FinalizeStackmaps(code);
-    code_gen.FinalizeExceptionHandlers(code);
-
     GrowableArray<const Object*> arguments;  // no arguments.
     const Array& kNoArgumentNames = Array::Handle();
     result = DartEntry::InvokeStatic(func,