Optimize functions containing try-catch.

runtime/vm/flow_graph_compiler_x64.cc

 // Copyright (c) 2013, 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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "lib/error.h"
@@ skipping 624 matching lines @@
       GuardFieldInstr* guard = instr->AsGuardField();
       AddCurrentDescriptor(PcDescriptors::kDeopt,
                            guard->deopt_id(),
                            Scanner::kDummyTokenIndex);
     } else if (instr->CanBeDeoptimizationTarget()) {
       AddCurrentDescriptor(PcDescriptors::kDeopt,
                            instr->deopt_id(),
                            Scanner::kDummyTokenIndex);
     }
     AllocateRegistersLocally(instr);
+  } else if (instr->MayThrow()  &&
+             (CurrentTryIndex() != CatchClauseNode::kInvalidTryIndex)) {
+    // Optimized try-block: Sync locals to fixed stack locations.
+    EmitTrySync(instr, CurrentTryIndex());
+  }
+}
+
+
+void FlowGraphCompiler::EmitTrySync(Instruction* instr, intptr_t try_index) {

[Kevin Millikin (Google), 2013/05/08 11:42:00]

Same comments as IA32.

[Florian Schneider, 2013/05/08 17:10:55]

Done.

+  ASSERT(is_optimizing());
+  Environment* env = instr->env();
+  CatchBlockEntryInstr* catch_block =
+      flow_graph().graph_entry()->GetCatchEntry(try_index);
+  const GrowableArray<Definition*>* idefs = catch_block->initial_definitions();
+  // Parameters.
+  intptr_t i = 0;
+  bool push_emitted = false;
+  for (; i < flow_graph().num_non_copied_params(); ++i) {
+    if ((*idefs)[i]->IsConstant()) continue;  // common constants
+    Location loc = env->LocationAt(i);
+    const intptr_t index = flow_graph().num_non_copied_params() - i;
+    Address dest(RBP, (kLastParamSlotIndex + index - 1) * kWordSize);
+    if (loc.IsConstant()) {
+      if (!push_emitted) {
+        __ pushq(RAX);
+        push_emitted = true;
+      }
+      __ LoadObject(RAX, loc.constant());
+      __ movq(dest, RAX);
+    } else if (loc.IsRegister()) {
+      __ movq(dest, loc.reg());
+    } else {
+      Address src = loc.ToStackSlotAddress();
+      if (!src.Equals(dest)) {
+        if (!push_emitted) {
+          __ pushq(RAX);
+          push_emitted = true;
+        }
+        __ movq(RAX, src);
+        __ movq(dest, RAX);
+      }
+    }
+  }
+  // Process locals. Skip exception_var and stacktrace_var.
+  CatchEntryInstr* catch_entry = catch_block->next()->AsCatchEntry();
+  intptr_t nncp = flow_graph_.num_non_copied_params();
+  intptr_t ex_idx =
+      kFirstLocalSlotIndex - catch_entry->exception_var().index() + nncp;
+  intptr_t st_idx =
+      kFirstLocalSlotIndex - catch_entry->stacktrace_var().index() + nncp;
+  for (; i < flow_graph().variable_count(); ++i) {
+    if (i == ex_idx || i == st_idx) continue;
+    if ((*idefs)[i]->IsConstant()) continue;
+    Location loc = env->LocationAt(i);
+    const intptr_t index =  i - flow_graph().num_non_copied_params();
+    Address dest(RBP, (kFirstLocalSlotIndex - index) * kWordSize);
+    if (loc.IsConstant()) {
+      if (!push_emitted) {
+        __ pushq(RAX);
+        push_emitted = true;
+      }
+      __ LoadObject(RAX, loc.constant());
+      __ movq(dest, RAX);
+    } else if (loc.IsRegister()) {
+        __ movq(dest, loc.reg());
+    } else {
+      Address src = loc.ToStackSlotAddress();
+      if (!src.Equals(dest)) {
+        if (!push_emitted) {
+          __ pushq(RAX);
+          push_emitted = true;
+        }
+        __ movq(RAX, src);
+        __ movq(dest, RAX);
+      }
+    }
+    // Update safepoint bitmap to indicate that the target location
+    // now contains a pointer.
+    instr->locs()->stack_bitmap()->Set(index, true);
+  }
+  if (push_emitted) {
+    __ popq(RAX);
   }
 }
 
 
 void FlowGraphCompiler::EmitInstructionEpilogue(Instruction* instr) {
   if (is_optimizing()) return;
   Definition* defn = instr->AsDefinition();
   if ((defn != NULL) && defn->is_used()) {
     __ pushq(defn->locs()->out().reg());
   }
@@ skipping 274 matching lines @@
           Immediate(FLAG_optimization_counter_threshold));
       ASSERT(function_reg == RDI);
       __ j(GREATER_EQUAL, &StubCode::OptimizeFunctionLabel());
     }
   } else {
     AddCurrentDescriptor(PcDescriptors::kEntryPatch,
                      Isolate::kNoDeoptId,
                      0);  // No token position.
   }
   __ Comment("Enter frame");
-  __ EnterDartFrame((StackSize() * kWordSize));
+  __ EnterDartFrame(StackSize() * kWordSize);
 }
 
 
 void FlowGraphCompiler::CompileGraph() {
   InitCompiler();
   if (TryIntrinsify()) {
     // Although this intrinsified code will never be patched, it must satisfy
     // CodePatcher::CodeIsPatchable, which verifies that this code has a minimum
     // code size, and nop(2) increases the minimum code size appropriately.
     __ nop(2);
@@ skipping 815 matching lines @@
   __ movups(reg, Address(RSP, 0));
   __ addq(RSP, Immediate(kFpuRegisterSize));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64