Remove support for non-ssa optimizing code generation.

runtime/vm/flow_graph_compiler_ia32.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 13 matching lines @@
 DECLARE_FLAG(bool, trace_functions);
 
 
 void DeoptimizationStub::GenerateCode(FlowGraphCompiler* compiler,
                                       intptr_t stub_ix) {
   Assembler* assem = compiler->assembler();
 #define __ assem->
   __ Comment("Deopt stub for id %d", deopt_id_);
   __ Bind(entry_label());
 
-  if (deoptimization_env_ == NULL) {
-    for (intptr_t i = 0; i < registers_.length(); i++) {
-      if (registers_[i] != kNoRegister) {
-        __ pushl(registers_[i]);
-      }
-    }
-  }
+  ASSERT(deoptimization_env_ != NULL);
 
   if (compiler->IsLeaf()) {
     Label L;
     __ pushl(EAX);  // Preserve EAX.
     __ call(&L);
     const intptr_t offset = assem->CodeSize();
     __ Bind(&L);
     __ popl(EAX);
     __ subl(EAX,
         Immediate(offset - AssemblerMacros::kOffsetOfSavedPCfromEntrypoint));
@@ skipping 555 matching lines @@
   __ Drop(6);
   __ popl(EAX);
 
   __ Bind(&is_assignable);
   __ popl(EDX);  // Remove pushed instantiator type arguments.
   __ popl(ECX);  // Remove pushed instantiator.
 }
 
 
 void FlowGraphCompiler::EmitInstructionPrologue(Instruction* instr) {
-  LocationSummary* locs = instr->locs();
-  ASSERT(locs != NULL);
-
-  frame_register_allocator()->AllocateRegisters(instr);
-
-  // TODO(vegorov): adjust assertion when we start removing comparison from the
-  // graph when it is merged with a branch.
-  ASSERT(locs->always_calls() ||
-         (locs->input_count() == instr->InputCount()));
+  if (!is_optimizing()) {
+    AllocateRegistersLocally(instr);
+  }
 }
 
 
 void FlowGraphCompiler::CopyParameters() {
   __ Comment("Copy parameters");
   const Function& function = parsed_function().function();
   const bool is_native_instance_closure =
       function.is_native() && function.IsImplicitInstanceClosureFunction();
   LocalScope* scope = parsed_function().node_sequence()->scope();
   const int num_fixed_params = function.num_fixed_parameters();
@@ skipping 306 matching lines @@
     }
   } else {
     CopyParameters();
   }
 
   // Initialize (non-argument) stack allocated slots to null.
   //
   // TODO(vegorov): introduce stack maps and stop initializing all spill slots
   // with null.
   intptr_t uninitialized_slot_count;
-  if (is_ssa_) {
+  if (is_optimizing()) {
     GraphEntryInstr* entry = block_order_[0]->AsGraphEntry();
     uninitialized_slot_count =
         entry->spill_slot_count() - copied_parameter_count;
   } else {
     uninitialized_slot_count = local_count;
   }
   const intptr_t slot_base = parsed_function().first_stack_local_index();
 
   if (uninitialized_slot_count > 0) {
     __ Comment("Initialize spill slots");
@@ skipping 30 matching lines @@
   __ jmp(&StubCode::FixCallersTargetLabel());
 }
 
 
 void FlowGraphCompiler::GenerateCall(intptr_t token_pos,
                                      intptr_t try_index,
                                      const ExternalLabel* label,
                                      PcDescriptors::Kind kind,
                                      BitmapBuilder* stack_bitmap) {
   ASSERT(!IsLeaf());
-  ASSERT(frame_register_allocator()->IsSpilled());
   __ call(label);
-  if (is_ssa() && (stack_bitmap != NULL)) {
+  if (is_optimizing() && (stack_bitmap != NULL)) {
     stackmap_table_builder_->AddEntry(assembler()->CodeSize(), stack_bitmap);
   }
   AddCurrentDescriptor(kind, Isolate::kNoDeoptId, token_pos, try_index);
 }
 
 
 void FlowGraphCompiler::GenerateCallRuntime(intptr_t deopt_id,
                                             intptr_t token_pos,
                                             intptr_t try_index,
                                             const RuntimeEntry& entry,
                                             BitmapBuilder* stack_bitmap) {
   ASSERT(!IsLeaf());
-  ASSERT(frame_register_allocator()->IsSpilled());
   __ CallRuntime(entry);
-  if (is_ssa() && (stack_bitmap != NULL)) {
+  if (is_optimizing() && (stack_bitmap != NULL)) {
     stackmap_table_builder_->AddEntry(assembler()->CodeSize(), stack_bitmap);
   }
   AddCurrentDescriptor(PcDescriptors::kOther, deopt_id, token_pos, try_index);
 }
 
 
 intptr_t FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label,
                                              const ICData& ic_data,
                                              const Array& arguments_descriptor,
                                              intptr_t argument_count) {
@@ skipping 198 matching lines @@
   __ popl(ECX);
   __ popl(EAX);
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32