Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: runtime/vm/flow_graph_compiler_x64.cc

Issue 10832411: Remove support for non-ssa optimizing code generation. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/flow_graph_compiler_x64.cc
diff --git a/runtime/vm/flow_graph_compiler_x64.cc b/runtime/vm/flow_graph_compiler_x64.cc
index 9beadbf05a82a6eea56d9d550d06bd0c1712ee0f..3f75a324454d93344205c5a165318ab7b5e8a9ba 100644
--- a/runtime/vm/flow_graph_compiler_x64.cc
+++ b/runtime/vm/flow_graph_compiler_x64.cc
@@ -31,14 +31,7 @@ void DeoptimizationStub::GenerateCode(FlowGraphCompiler* compiler,
__ Comment("Deopt stub for id %d", deopt_id_);
__ Bind(entry_label());
- if (deoptimization_env_ == NULL) {
- // TODO(srdjan): Deprecate once non-SSA optimizing compiler is removed.
- for (intptr_t i = 0; i < registers_.length(); i++) {
- if (registers_[i] != kNoRegister) {
- __ pushq(registers_[i]);
- }
- }
- }
+ ASSERT(deoptimization_env_ != NULL);
if (compiler->IsLeaf()) {
__ Comment("Leaf method, lazy PC marker setup");
@@ -618,15 +611,9 @@ void FlowGraphCompiler::GenerateAssertAssignable(intptr_t deopt_id,
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);
+ }
}
@@ -956,7 +943,7 @@ void FlowGraphCompiler::CompileGraph() {
// 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;
@@ -1008,9 +995,8 @@ void FlowGraphCompiler::GenerateCall(intptr_t token_pos,
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);
@@ -1023,9 +1009,8 @@ void FlowGraphCompiler::GenerateCallRuntime(intptr_t deopt_id,
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);

Powered by Google App Engine
This is Rietveld 408576698