Make Throw and ReThrow instructions instead of computations. That way they can terminate a basic bl…

runtime/vm/flow_graph_compiler_x64.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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
@@ skipping 571 matching lines @@
   const Class& cls = Class::Handle(function.signature_class());
   if (cls.HasTypeArguments()) {
     __ popq(RCX);  // Discard type arguments.
   }
   if (function.IsImplicitInstanceClosureFunction()) {
     __ popq(RCX);  // Discard receiver.
   }
 }
 
 
-void FlowGraphCompiler::VisitThrow(ThrowComp* comp) {
-  LoadValue(RAX, comp->exception());
-  __ pushq(RAX);
-  GenerateCallRuntime(comp->node_id(), comp->token_index(), kThrowRuntimeEntry);
-  __ int3();
-}
-
-
-void FlowGraphCompiler::VisitReThrow(ReThrowComp* comp) {
-  LoadValue(RBX, comp->stack_trace());
-  LoadValue(RAX, comp->exception());
-  __ pushq(RAX);
-  __ pushq(RBX);
-  GenerateCallRuntime(
-      comp->node_id(), comp->token_index(), kReThrowRuntimeEntry);
-  Bailout("ReThrow Untested");
-}
-
-
 void FlowGraphCompiler::VisitNativeLoadField(NativeLoadFieldComp* comp) {
   __ popq(RAX);
   __ movq(RAX, FieldAddress(RAX, comp->offset_in_bytes()));
 }
 
 
 void FlowGraphCompiler::VisitExtractFactoryTypeArguments(
     ExtractFactoryTypeArgumentsComp* comp) {
   __ popq(RAX);  // Instantiator.
 
@@ skipping 233 matching lines @@
   __ nop(1);
   __ nop(1);
   __ nop(1);
   __ nop(1);
   AddCurrentDescriptor(PcDescriptors::kReturn,
                        AstNode::kNoId,
                        instr->token_index());
 }
 
 
+void FlowGraphCompiler::VisitThrow(ThrowInstr* instr) {
+  LoadValue(RAX, instr->exception());
+  __ pushq(RAX);
+  GenerateCallRuntime(instr->node_id(),
+                      instr->token_index(),
+                      kThrowRuntimeEntry);
+  __ int3();
+}
+
+
+void FlowGraphCompiler::VisitReThrow(ReThrowInstr* instr) {
+  LoadValue(RBX, instr->stack_trace());
+  LoadValue(RAX, instr->exception());
+  __ pushq(RAX);
+  __ pushq(RBX);
+  GenerateCallRuntime(
+      instr->node_id(), instr->token_index(), kReThrowRuntimeEntry);
+  Bailout("ReThrow Untested");
+}
+
+
+
 void FlowGraphCompiler::VisitBranch(BranchInstr* instr) {
   // Determine if the true branch is fall through (!negated) or the false
   // branch is.  They cannot both be backwards branches.
   intptr_t index = blocks_->length() - current_block()->block_number() - 1;
   ASSERT(index > 0);
 
   bool negated = ((*blocks_)[index - 1] == instr->false_successor());
   ASSERT(!negated == ((*blocks_)[index - 1] == instr->true_successor()));
 
   LoadValue(RAX, instr->value());
@@ skipping 321 matching lines @@
 void FlowGraphCompiler::FinalizeExceptionHandlers(const Code& code) {
   // We don't compile exception handlers yet.
   code.set_exception_handlers(
       ExceptionHandlers::Handle(ExceptionHandlers::New(0)));
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64