Move Throw and ReThrow to the location based code generation.

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 1413 matching lines @@
 #undef INSTRUCTION_TYPE_CHECK
 
   // Static type of the instruction.
   virtual RawAbstractType* StaticType() const {
     UNREACHABLE();
     return AbstractType::null();
   }
 
   // Returns structure describing location constraints required
   // to emit native code for this instruction.
-  virtual LocationSummary* locs() const {
+  virtual LocationSummary* locs() {
     // TODO(vegorov): This should be pure virtual method.
     // However we are temporary using NULL for instructions that
     // were not converted to the location based code generation yet.
     return NULL;
   }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
     UNIMPLEMENTED();
   }
 
  private:
   intptr_t cid_;
   ICData* ic_data_;
   DISALLOW_COPY_AND_ASSIGN(Instruction);
 };
 
 
+class InstructionWithInputs : public Instruction {
+ public:
+  InstructionWithInputs() : locs_(NULL) {
+  }
+
+  virtual LocationSummary* locs() {
+    if (locs_ == NULL) {
+      locs_ = MakeLocationSummary();
+    }
+    return locs_;
+  }
+
+  virtual LocationSummary* MakeLocationSummary() const = 0;
+
+ private:
+  LocationSummary* locs_;

[srdjan, 2012/05/31 16:00:53]

Add DISALLOW_COPY_AND_ASSIGN.

Generally I am not in favor of adding class hierarchies for code reuse only, but
only if we are going to use its type (i.e., InstructionWithInputs). I am OK with
it here & now, but I think we need to rethink the idea of instructions with
inputs once Kevin is back.

+};
+
+
 // Basic block entries are administrative nodes.  There is a distinguished
 // graph entry with no predecessor.  Joins are the only nodes with multiple
 // predecessors.  Targets are all other basic block entries.  The types
 // enforce edge-split form---joins are forbidden as the successors of
 // branches.
 class BlockEntryInstr : public Instruction {
  public:
   virtual bool IsBlockEntry() const { return true; }
 
   virtual intptr_t PredecessorCount() const = 0;
@@ skipping 182 matching lines @@
     return successor_;
   }
 
   virtual void SetSuccessor(Instruction* instr) {
     ASSERT(successor_ == NULL);
     successor_ = instr;
   }
 
   virtual void RecordAssignedVars(BitVector* assigned_vars);
 
-  virtual LocationSummary* locs() const {
+  virtual LocationSummary* locs() {
     return computation()->locs();
   }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
     computation()->EmitNativeCode(compiler);
   }
 
  private:
   Computation* computation_;
   Instruction* successor_;
@@ skipping 30 matching lines @@
     successor_ = instr;
   }
 
   // Static type of the underlying computation.
   virtual RawAbstractType* StaticType() const {
     return computation()->StaticType();
   }
 
   virtual void RecordAssignedVars(BitVector* assigned_vars);
 
-  virtual LocationSummary* locs() const {
+  virtual LocationSummary* locs() {
     return computation()->locs();
   }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);
 
  private:
   intptr_t temp_index_;
   Computation* computation_;
   Instruction* successor_;
 
@@ skipping 17 matching lines @@
   virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
 
  private:
   const intptr_t token_index_;
   Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(ReturnInstr);
 };
 
 
-class ThrowInstr : public Instruction {
+class ThrowInstr : public InstructionWithInputs {
  public:
   ThrowInstr(intptr_t token_index,
              intptr_t try_index,
              Value* exception)
       : token_index_(token_index),
         try_index_(try_index),
         exception_(exception),
         successor_(NULL) {
     ASSERT(exception_ != NULL);
   }
 
   DECLARE_INSTRUCTION(Throw)
 
   intptr_t token_index() const { return token_index_; }
   intptr_t try_index() const { return try_index_; }
   Value* exception() const { return exception_; }
 
   // Parser can generate a throw within an expression tree.  We never
   // add successor instructions to the graph.
   virtual Instruction* StraightLineSuccessor() const { return NULL; }
   virtual void SetSuccessor(Instruction* instr) {
     ASSERT(successor_ == NULL);
   }
 
+  virtual LocationSummary* MakeLocationSummary() const;
+
+  virtual void EmitNativeCode(FlowGraphCompiler* compiler);
+
  private:
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* exception_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(ThrowInstr);
 };
 
 
-class ReThrowInstr : public Instruction {
+class ReThrowInstr : public InstructionWithInputs {
  public:
   ReThrowInstr(intptr_t token_index,
                intptr_t try_index,
                Value* exception,
                Value* stack_trace)
       : token_index_(token_index),
         try_index_(try_index),
         exception_(exception),
         stack_trace_(stack_trace),
         successor_(NULL) {
@@ skipping 10 matching lines @@
 
   // Parser can generate a rethrow within an expression tree.  We
   // never add successor instructions to the graph.
   virtual Instruction* StraightLineSuccessor() const {
     return NULL;
   }
   virtual void SetSuccessor(Instruction* instr) {
     ASSERT(successor_ == NULL);
   }
 
+  virtual LocationSummary* MakeLocationSummary() const;
+
+  virtual void EmitNativeCode(FlowGraphCompiler* compiler);
+
  private:
   const intptr_t token_index_;
   const intptr_t try_index_;
   Value* exception_;
   Value* stack_trace_;
   Instruction* successor_;
 
   DISALLOW_COPY_AND_ASSIGN(ReThrowInstr);
 };
 
 
-class BranchInstr : public Instruction {
+class BranchInstr : public InstructionWithInputs {
  public:
   explicit BranchInstr(Value* value)
       : value_(value),
         true_successor_(NULL),
         false_successor_(NULL) { }
 
   DECLARE_INSTRUCTION(Branch)
 
   Value* value() const { return value_; }
   TargetEntryInstr* true_successor() const { return true_successor_; }
   TargetEntryInstr* false_successor() const { return false_successor_; }
 
   TargetEntryInstr** true_successor_address() { return &true_successor_; }
   TargetEntryInstr** false_successor_address() { return &false_successor_; }
 
   virtual Instruction* StraightLineSuccessor() const { return NULL; }
   virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
 
   virtual void DiscoverBlocks(
       BlockEntryInstr* current_block,
       GrowableArray<BlockEntryInstr*>* preorder,
       GrowableArray<BlockEntryInstr*>* postorder,
       GrowableArray<intptr_t>* parent,
       GrowableArray<BitVector*>* assigned_vars,
       intptr_t variable_count);
 
+  virtual LocationSummary* MakeLocationSummary() const;
+
+  virtual void EmitNativeCode(FlowGraphCompiler* compiler);
+
  private:
   Value* value_;
   TargetEntryInstr* true_successor_;
   TargetEntryInstr* false_successor_;
 
   DISALLOW_COPY_AND_ASSIGN(BranchInstr);
 };
 
 #undef DECLARE_INSTRUCTION
 
@@ skipping 21 matching lines @@
   FOR_EACH_COMPUTATION(DECLARE_VISIT_COMPUTATION)
   FOR_EACH_INSTRUCTION(DECLARE_VISIT_INSTRUCTION)
 
 #undef DECLARE_VISIT_COMPUTATION
 #undef DECLARE_VISIT_INSTRUCTION
 
  protected:
   // Map a block number in a forward iteration into the block number in the
   // corresponding reverse iteration.  Used to obtain an index into
   // block_order for reverse iterations.
-  intptr_t reverse_index(intptr_t index) {
+  intptr_t reverse_index(intptr_t index) const {
     return block_order_.length() - index - 1;
   }
 
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_