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

runtime/vm/flow_graph_builder.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/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/flags.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 1256 matching lines @@
                                                  for_index.value(),
                                                  for_value.value());
   ReturnComputation(store);
 }
 
 
 // <Statement> ::= Sequence { scope: LocalScope
 //                            nodes: <Statement>*
 //                            label: SourceLabel }
 void EffectGraphVisitor::VisitSequenceNode(SequenceNode* node) {
+  if (FLAG_enable_type_checks &&
+      (node == owner()->parsed_function().node_sequence())) {
+    Bailout("VisitSequenceNode GenerateArgumentTypeChecks()");
+  }
   if ((node->scope() != NULL) &&
       (node->scope()->num_context_variables() != 0)) {
     Bailout("Sequence needs a context.  Gotta have a context.");
   }
   intptr_t i = 0;
   while (is_open() && (i < node->length())) {
     EffectGraphVisitor for_effect(owner(), temp_index());
     node->NodeAt(i++)->Visit(&for_effect);
     Append(for_effect);
   }
 }
 
 
 void EffectGraphVisitor::VisitCatchClauseNode(CatchClauseNode* node) {
   Bailout("EffectGraphVisitor::VisitCatchClauseNode");
 }
 
 
 void EffectGraphVisitor::VisitTryCatchNode(TryCatchNode* node) {
   Bailout("EffectGraphVisitor::VisitTryCatchNode");
 }
 
 
 void EffectGraphVisitor::VisitThrowNode(ThrowNode* node) {
   ValueGraphVisitor for_exception(owner(), temp_index());
   node->exception()->Visit(&for_exception);
   Append(for_exception);
+  Instruction* instr = NULL;
   if (node->stacktrace() == NULL) {
-    ThrowComp* comp =
-        new ThrowComp(node->id(), node->token_index(), for_exception.value());
-    AddInstruction(new DoInstr(comp));
+    instr = new ThrowInstr(
+        node->id(), node->token_index(), for_exception.value());
   } else {
     ValueGraphVisitor for_stack_trace(owner(), temp_index() + 1);
     node->stacktrace()->Visit(&for_stack_trace);
     Append(for_stack_trace);
-    ReThrowComp* comp = new ReThrowComp(node->id(),
-                                        node->token_index(),
-                                        for_exception.value(),
-                                        for_stack_trace.value());
-    AddInstruction(new DoInstr(comp));
+    instr = new ReThrowInstr(node->id(),
+                             node->token_index(),
+                             for_exception.value(),
+                             for_stack_trace.value());
   }
+  AddInstruction(instr);
+  CloseFragment();
 }
 
 
 void EffectGraphVisitor::VisitInlinedFinallyNode(InlinedFinallyNode* node) {
   Bailout("EffectGraphVisitor::VisitInlinedFinallyNode");
 }
 
 
 // Graph printing.
 class FlowGraphPrinter : public FlowGraphVisitor {
@@ skipping 218 matching lines @@
   }
   OS::Print(")");
 }
 
 
 void FlowGraphPrinter::VisitCreateClosure(CreateClosureComp* comp) {
   OS::Print("CreateClosure(%s)", comp->function().ToCString());
 }
 
 
-void FlowGraphPrinter::VisitThrow(ThrowComp* comp) {
-  OS::Print("Throw(");
-  comp->exception()->Accept(this);
-  OS::Print(")");
-}
-
-
-void FlowGraphPrinter::VisitReThrow(ReThrowComp* comp) {
-  OS::Print("ReThrow(");
-  comp->exception()->Accept(this);
-  OS::Print(", ");
-  comp->stack_trace()->Accept(this);
-  OS::Print(")");
-}
-
-
 void FlowGraphPrinter::VisitNativeLoadField(NativeLoadFieldComp* comp) {
   OS::Print("NativeLoadField(");
   comp->value()->Accept(this);
   OS::Print(", %d)", comp->offset_in_bytes());
 }
 
 
 void FlowGraphPrinter::VisitExtractFactoryTypeArguments(
     ExtractFactoryTypeArgumentsComp* comp) {
   OS::Print("ExtractFactoryTypeArguments(");
@@ skipping 51 matching lines @@
   instr->computation()->Accept(this);
 }
 
 
 void FlowGraphPrinter::VisitReturn(ReturnInstr* instr) {
   OS::Print("    return ");
   instr->value()->Accept(this);
 }
 
 
+void FlowGraphPrinter::VisitThrow(ThrowInstr* instr) {
+  OS::Print("Throw(");
+  instr->exception()->Accept(this);
+  OS::Print(")");
+}
+
+
+void FlowGraphPrinter::VisitReThrow(ReThrowInstr* instr) {
+  OS::Print("ReThrow(");
+  instr->exception()->Accept(this);
+  OS::Print(", ");
+  instr->stack_trace()->Accept(this);
+  OS::Print(")");
+}
+
+
 void FlowGraphPrinter::VisitBranch(BranchInstr* instr) {
   OS::Print("    if ");
   instr->value()->Accept(this);
   OS::Print(" goto(%d, %d)", instr->true_successor()->block_number(),
             instr->false_successor()->block_number());
 }
 
 
 void FlowGraphBuilder::BuildGraph() {
   if (FLAG_print_ast) {
@@ skipping 29 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart