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

runtime/vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 22 matching lines @@
 // | InstanceSetter <String> <Value> <Value>
 // | LoadInstanceField <LoadInstanceFieldNode> <Value>
 // | StoreInstanceField <StoreInstanceFieldNode> <Value> <Value>
 // | LoadStaticField <Field>
 // | StoreStaticField <Field> <Value>
 // | BooleanNegate <Value>
 // | InstanceOf <Value> <Type>
 // | CreateArray <ArrayNode> <Value> ...
 // | CreateClosure <ClosureNode>
 // | AllocateObject <ConstructorCallNode>
-// | Throw <Value>
-// | ReThrow <Value> <Value>
 // | NativeLoadField <Value> <intptr_t>
 // | ExtractFactoryTypeArgumentsComp <ConstructorCallNode> <Value>
 // | ExtractConstructorTypeArgumentsComp <ConstructorCallNode> <Value>
 // | ExtractConstructorInstantiatorComp <ConstructorCallNode> <Value> <Value>
 //
 // <Value> ::=
 //   Temp <int>
 // | Constant <Instance>
 
 // M is a two argument macro.  It is applied to each concrete value's
@@ skipping 20 matching lines @@
   M(InstanceSetter, InstanceSetterComp)                                        \
   M(LoadInstanceField, LoadInstanceFieldComp)                                  \
   M(StoreInstanceField, StoreInstanceFieldComp)                                \
   M(LoadStaticField, LoadStaticFieldComp)                                      \
   M(StoreStaticField, StoreStaticFieldComp)                                    \
   M(BooleanNegate, BooleanNegateComp)                                          \
   M(InstanceOf, InstanceOfComp)                                                \
   M(CreateArray, CreateArrayComp)                                              \
   M(CreateClosure, CreateClosureComp)                                          \
   M(AllocateObject, AllocateObjectComp)                                        \
-  M(Throw, ThrowComp)                                                          \
-  M(ReThrow, ReThrowComp)                                                      \
   M(NativeLoadField, NativeLoadFieldComp)                                      \
   M(ExtractFactoryTypeArguments, ExtractFactoryTypeArgumentsComp)              \
   M(ExtractConstructorTypeArguments, ExtractConstructorTypeArgumentsComp)      \
   M(ExtractConstructorInstantiator, ExtractConstructorInstantiatorComp)        \
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
@@ skipping 543 matching lines @@
   intptr_t token_index() const { return ast_node_.token_index(); }
   const Function& function() const { return ast_node_.function(); }
 
  private:
   const ClosureNode& ast_node_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateClosureComp);
 };
 
 
-class ThrowComp : public Computation {
- public:
-  explicit ThrowComp(intptr_t node_id,
-                     intptr_t token_index,
-                     Value* exception)
-      : node_id_(node_id), token_index_(token_index), exception_(exception) {
-    ASSERT(exception_ != NULL);
-  }
-
-  DECLARE_COMPUTATION(Throw)
-
-  intptr_t node_id() const { return node_id_; }
-  intptr_t token_index() const { return token_index_; }
-  Value* exception() const { return exception_; }
-
- private:
-  intptr_t node_id_;
-  intptr_t token_index_;
-  Value* exception_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThrowComp);
-};
-
-
-class ReThrowComp : public Computation {
- public:
-  ReThrowComp(intptr_t node_id,
-              intptr_t token_index,
-              Value* exception,
-              Value* stack_trace)
-      : node_id_(node_id),
-        token_index_(token_index),
-        exception_(exception),
-        stack_trace_(stack_trace) {
-    ASSERT(exception_ != NULL);
-    ASSERT(stack_trace_ != NULL);
-  }
-
-  DECLARE_COMPUTATION(ReThrow)
-
-  intptr_t node_id() const { return node_id_; }
-  intptr_t token_index() const { return token_index_; }
-  Value* exception() const { return exception_; }
-  Value* stack_trace() const { return stack_trace_; }
-
- private:
-  intptr_t node_id_;
-  intptr_t token_index_;
-  Value* exception_;
-  Value* stack_trace_;
-
-  DISALLOW_COPY_AND_ASSIGN(ReThrowComp);
-};
-
-
 class NativeLoadFieldComp : public Computation {
  public:
   NativeLoadFieldComp(Value* value, intptr_t offset_in_bytes)
       : value_(value), offset_in_bytes_(offset_in_bytes) {
     ASSERT(value != NULL);
   }
 
   DECLARE_COMPUTATION(NativeLoadField)
 
   Value* value() const { return value_; }
@@ skipping 108 matching lines @@
 // type name.  The concrete instruction classes are the name with Instr
 // concatenated.
 #define FOR_EACH_INSTRUCTION(M)                                                \
   M(JoinEntry)                                                                 \
   M(TargetEntry)                                                               \
   M(PickTemp)                                                                  \
   M(TuckTemp)                                                                  \
   M(Do)                                                                        \
   M(Bind)                                                                      \
   M(Return)                                                                    \
+  M(Throw)                                                                     \
+  M(ReThrow)                                                                   \
   M(Branch)                                                                    \
 
 
 // Forward declarations for Instruction classes.
 class BlockEntryInstr;
 #define FORWARD_DECLARATION(type) class type##Instr;
 FOR_EACH_INSTRUCTION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 
@@ skipping 220 matching lines @@
   Computation* computation_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(BindInstr);
 };
 
 
 class ReturnInstr : public Instruction {
  public:
   ReturnInstr(Value* value, intptr_t token_index)
-      : Instruction(), value_(value), token_index_(token_index) { }
+      : Instruction(), value_(value), token_index_(token_index) {
+    ASSERT(value_ != NULL);
+  }
 
   DECLARE_INSTRUCTION(Return)
 
   Value* value() const { return value_; }
   intptr_t token_index() const { return token_index_; }
 
   virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
 
   virtual void Postorder(GrowableArray<BlockEntryInstr*>* block_entries);
 
  private:
   Value* value_;
   intptr_t token_index_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnInstr);
 };
 
 
+class ThrowInstr : public Instruction {
+ public:
+  ThrowInstr(intptr_t node_id, intptr_t token_index, Value* exception)
+      : Instruction(),
+        node_id_(node_id),
+        token_index_(token_index),
+        exception_(exception) {
+    ASSERT(exception_ != NULL);
+  }
+
+  DECLARE_INSTRUCTION(Throw)
+
+  intptr_t node_id() const { return node_id_; }
+  intptr_t token_index() const { return token_index_; }
+  Value* exception() const { return exception_; }
+
+  virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
+
+  virtual void Postorder(GrowableArray<BlockEntryInstr*>* block_entries);
+
+ private:
+  intptr_t node_id_;
+  intptr_t token_index_;
+  Value* exception_;
+
+  DISALLOW_COPY_AND_ASSIGN(ThrowInstr);
+};
+
+
+class ReThrowInstr : public Instruction {
+ public:
+  ReThrowInstr(intptr_t node_id,
+              intptr_t token_index,
+              Value* exception,
+              Value* stack_trace)
+      : node_id_(node_id),
+        token_index_(token_index),
+        exception_(exception),
+        stack_trace_(stack_trace) {
+    ASSERT(exception_ != NULL);
+    ASSERT(stack_trace_ != NULL);
+  }
+
+  DECLARE_INSTRUCTION(ReThrow)
+
+  intptr_t node_id() const { return node_id_; }
+  intptr_t token_index() const { return token_index_; }
+  Value* exception() const { return exception_; }
+  Value* stack_trace() const { return stack_trace_; }
+
+  virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
+
+  virtual void Postorder(GrowableArray<BlockEntryInstr*>* block_entries);
+
+ private:
+  intptr_t node_id_;
+  intptr_t token_index_;
+  Value* exception_;
+  Value* stack_trace_;
+
+  DISALLOW_COPY_AND_ASSIGN(ReThrowInstr);
+};
+
+
 class BranchInstr : public Instruction {
  public:
   explicit BranchInstr(Value* value)
       : Instruction(),
         value_(value),
         true_successor_(NULL),
         false_successor_(NULL) { }
 
   DECLARE_INSTRUCTION(Branch)
 
@@ skipping 45 matching lines @@
 #undef DECLARE_VISIT_INSTRUCTION
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_