Revert r9253 because of dartium test failures

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 1689 matching lines @@
   M(GraphEntry)                                                                \
   M(JoinEntry)                                                                 \
   M(TargetEntry)                                                               \
   M(Do)                                                                        \
   M(Bind)                                                                      \
   M(Phi)                                                                       \
   M(Return)                                                                    \
   M(Throw)                                                                     \
   M(ReThrow)                                                                   \
   M(Branch)                                                                    \
-  M(Goto)                                                                      \
   M(ParallelMove)
 
 
 // Forward declarations for Instruction classes.
 class BlockEntryInstr;
 class FlowGraphBuilder;
 
 #define FORWARD_DECLARATION(type) class type##Instr;
 FOR_EACH_INSTRUCTION(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
@@ skipping 91 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()  = 0;
+  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);
 };
@@ skipping 46 matching lines @@
   void set_dominator(BlockEntryInstr* instr) { dominator_ = instr; }
 
   const GrowableArray<BlockEntryInstr*>& dominated_blocks() {
     return dominated_blocks_;
   }
 
   void AddDominatedBlock(BlockEntryInstr* block) {
     dominated_blocks_.Add(block);
   }
 
-  inline Instruction* last_instruction() const;
+  Instruction* last_instruction() const { return last_instruction_; }
   void set_last_instruction(Instruction* instr) { last_instruction_ = instr; }
 
   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* locs()  { return NULL; }
-
  protected:
   BlockEntryInstr()
       : preorder_number_(-1),
         postorder_number_(-1),
         block_id_(-1),
         dominator_(NULL),
         dominated_blocks_(1),
         last_instruction_(NULL) { }
 
  private:
@@ skipping 72 matching lines @@
     return predecessors_[index];
   }
   virtual void AddPredecessor(BlockEntryInstr* predecessor) {
     predecessors_.Add(predecessor);
   }
 
   virtual Instruction* StraightLineSuccessor() const {
     return successor_;
   }
   virtual void SetSuccessor(Instruction* instr) {
-    ASSERT(instr == NULL || !instr->IsBlockEntry());
     successor_ = instr;
   }
 
   ZoneGrowableArray<PhiInstr*>* phis() const { return phis_; }
 
   virtual void PrepareEntry(FlowGraphCompiler* compiler);
 
   void InsertPhi(intptr_t var_index, intptr_t var_count);
 
   intptr_t phi_count() const { return phi_count_; }
@@ skipping 34 matching lines @@
   }
   virtual void AddPredecessor(BlockEntryInstr* predecessor) {
     ASSERT(predecessor_ == NULL);
     predecessor_ = predecessor;
   }
 
   virtual Instruction* StraightLineSuccessor() const {
     return successor_;
   }
   virtual void SetSuccessor(Instruction* instr) {
-    ASSERT(instr == NULL || !instr->IsBlockEntry());
     successor_ = instr;
   }
 
   bool HasTryIndex() const {
     return try_index_ != CatchClauseNode::kInvalidTryIndex;
   }
 
   intptr_t try_index() const {
     ASSERT(HasTryIndex());
     return try_index_;
@@ skipping 21 matching lines @@
   DECLARE_INSTRUCTION(Do)
 
   Computation* computation() const { return computation_; }
   virtual void replace_computation(Computation* value) { computation_ = value; }
 
   virtual Instruction* StraightLineSuccessor() const {
     return successor_;
   }
 
   virtual void SetSuccessor(Instruction* instr) {
-    ASSERT(instr == NULL || !instr->IsBlockEntry());
     successor_ = instr;
   }
 
   virtual void RecordAssignedVars(BitVector* assigned_vars);
 
   virtual LocationSummary* locs() {
     return computation()->locs();
   }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
@@ skipping 41 matching lines @@
   DECLARE_INSTRUCTION(Bind)
 
   Computation* computation() const { return computation_; }
   virtual void replace_computation(Computation* value) { computation_ = value; }
 
   virtual Instruction* StraightLineSuccessor() const {
     return successor_;
   }
 
   virtual void SetSuccessor(Instruction* instr) {
-    ASSERT(instr == NULL || !instr->IsBlockEntry());
     successor_ = instr;
   }
 
   // Static type of the underlying computation.
   virtual RawAbstractType* StaticType() const {
     return computation()->StaticType();
   }
 
   virtual void RecordAssignedVars(BitVector* assigned_vars);
 
@@ skipping 17 matching lines @@
     for (intptr_t i = 0; i < num_inputs; ++i) {
       inputs_.Add(NULL);
     }
   }
 
   DECLARE_INSTRUCTION(Phi)
 
   virtual Instruction* StraightLineSuccessor() const { return NULL; }
   virtual void SetSuccessor(Instruction* instr) { UNREACHABLE(); }
 
-  virtual LocationSummary* locs()  { return NULL; }
-
  private:
   GrowableArray<Value*> inputs_;
 
   DISALLOW_COPY_AND_ASSIGN(PhiInstr);
 };
 
 
 class ReturnInstr : public InstructionWithInputs {
  public:
   ReturnInstr(intptr_t token_pos, Value* value)
@@ skipping 160 matching lines @@
   Value* value_;
   TargetEntryInstr* true_successor_;
   TargetEntryInstr* false_successor_;
   bool is_fused_with_comparison_;
   bool is_negated_;
 
   DISALLOW_COPY_AND_ASSIGN(BranchInstr);
 };
 
 
-class GotoInstr : public Instruction {
- public:
-  explicit GotoInstr(BlockEntryInstr* successor)
-      : successor_(successor) {
-        ASSERT(successor != NULL);
-      }
-
-  DECLARE_INSTRUCTION(Goto)
-
-  virtual Instruction* StraightLineSuccessor() const { return successor_; }
-  virtual void SetSuccessor(Instruction* instr) {
-    successor_ = instr->AsBlockEntry();
-  }
-
-  virtual LocationSummary* locs() { return NULL; }
-
- private:
-  BlockEntryInstr* successor_;
-};
-
-
 class MoveOperands : public ValueObject {
  public:
   MoveOperands(Location dest, Location src) : dest_(dest), src_(src) { }
 
   Location src() const { return src_; }
   Location dest() const { return dest_; }
 
  private:
   Location dest_;
   Location src_;
@@ skipping 14 matching lines @@
 
  private:
   GrowableArray<MoveOperands> moves_;
 
   DISALLOW_COPY_AND_ASSIGN(ParallelMoveInstr);
 };
 
 #undef DECLARE_INSTRUCTION
 
 
-// Definition of inline functions.
-Instruction* BlockEntryInstr::last_instruction() const {
-  ASSERT(last_instruction_->IsGraphEntry() ||
-         last_instruction_->IsGoto() ||
-         last_instruction_->IsReturn() ||
-         last_instruction_->IsBranch() ||
-         last_instruction_->IsThrow() ||
-         last_instruction_->IsReThrow());
-  return last_instruction_;
-}
-
 // Visitor base class to visit each instruction and computation in a flow
 // graph as defined by a reversed list of basic blocks.
 class FlowGraphVisitor : public ValueObject {
  public:
   explicit FlowGraphVisitor(const GrowableArray<BlockEntryInstr*>& block_order)
       : block_order_(block_order) { }
   virtual ~FlowGraphVisitor() { }
 
   // Visit each block in the block order, and for each block its
   // instructions in order from the block entry to exit.
@@ skipping 17 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_