Reapply "Deoptimization support in inlined code."

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 3476 matching lines @@
       ASSERT(environment_->values_[index_] != NULL);
       return environment_->values_[index_];
     }
 
     void SetCurrentValue(Value* value) {
       ASSERT(!Done());
       ASSERT(value != NULL);
       environment_->values_[index_] = value;
     }
 
+    Location CurrentLocation() const {
+      ASSERT(!Done());
+      return environment_->locations_[index_];
+    }
+
+    void SetCurrentLocation(Location loc) {
+      ASSERT(!Done());
+      environment_->locations_[index_] = loc;
+    }
+
    private:
     Environment* environment_;
     intptr_t index_;
   };
 
   // Iterate all non-NULL values in an environment, including outer
   // environments.  Note that the iterator skips empty environments.
   class DeepIterator : public ValueObject {
    public:
     explicit DeepIterator(Environment* environment) : iterator_(environment) {
@@ skipping 11 matching lines @@
     Value* CurrentValue() const {
       ASSERT(!Done());
       return iterator_.CurrentValue();
     }
 
     void SetCurrentValue(Value* value) {
       ASSERT(!Done());
       iterator_.SetCurrentValue(value);
     }
 
+    Location CurrentLocation() const {
+      ASSERT(!Done());
+      return iterator_.CurrentLocation();
+    }
+
+    void SetCurrentLocation(Location loc) {
+      ASSERT(!Done());
+      iterator_.SetCurrentLocation(loc);
+    }
+
    private:
     void SkipDone() {
       while (!Done() && iterator_.Done()) {
         iterator_ = ShallowIterator(iterator_.environment()->outer());
       }
     }
 
     ShallowIterator iterator_;
   };
 
   // Construct an environment by constructing uses from an array of definitions.
   static Environment* From(const GrowableArray<Definition*>& definitions,
                            intptr_t fixed_parameter_count,
-                           const Environment* outer);
+                           const Function& function);
 
   void set_locations(Location* locations) {
     ASSERT(locations_ == NULL);
     locations_ = locations;
   }
 
   void set_deopt_id(intptr_t deopt_id) { deopt_id_ = deopt_id; }
   intptr_t deopt_id() const { return deopt_id_; }
 
   Environment* outer() const { return outer_; }
@@ skipping 24 matching lines @@
       index -= env->Length();
       env = env->outer_;
     }
     return env->ValueAt(index);
   }
 
   intptr_t fixed_parameter_count() const {
     return fixed_parameter_count_;
   }
 
+  const Function& function() const { return function_; }
+
   void DeepCopyTo(Instruction* instr) const;
+  void DeepCopyToOuter(Instruction* instr) const;
 
   void PrintTo(BufferFormatter* f) const;
 
  private:
   friend class ShallowIterator;
 
   Environment(intptr_t length,
               intptr_t fixed_parameter_count,
               intptr_t deopt_id,
+              const Function& function,
               Environment* outer)
       : values_(length),
         locations_(NULL),
         fixed_parameter_count_(fixed_parameter_count),
         deopt_id_(deopt_id),
+        function_(function),
         outer_(outer) { }
 
   Environment* DeepCopy() const;
 
   GrowableArray<Value*> values_;
   Location* locations_;
   const intptr_t fixed_parameter_count_;
   intptr_t deopt_id_;
+  const Function& function_;
   Environment* outer_;
 
   DISALLOW_COPY_AND_ASSIGN(Environment);
 };
 
 
 // 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:
@@ skipping 23 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_