Index: runtime/vm/intermediate_language.h |
=================================================================== |
--- runtime/vm/intermediate_language.h (revision 36573) |
+++ runtime/vm/intermediate_language.h (working copy) |
@@ -556,7 +556,7 @@ |
inline void BindTo(Definition* definition); |
inline void BindToEnvironment(Definition* definition); |
- Value* Copy() { return new Value(definition_); } |
+ Value* Copy(Isolate* isolate) { return new(isolate) Value(definition_); } |
// This function must only be used when the new Value is dominated by |
// the original Value. |
@@ -1026,7 +1026,7 @@ |
return false; |
} |
- virtual void InheritDeoptTarget(Instruction* other); |
+ virtual void InheritDeoptTarget(Isolate* isolate, Instruction* other); |
bool NeedsEnvironment() const { |
return CanDeoptimize() || CanBecomeDeoptimizationTarget(); |
@@ -1036,7 +1036,7 @@ |
return false; |
} |
- void InheritDeoptTargetAfter(Instruction* other); |
+ void InheritDeoptTargetAfter(Isolate* isolate, Instruction* other); |
virtual bool MayThrow() const = 0; |
@@ -2416,7 +2416,7 @@ |
return constant_target_; |
} |
- virtual void InheritDeoptTarget(Instruction* other); |
+ virtual void InheritDeoptTarget(Isolate* isolate, Instruction* other); |
virtual bool MayThrow() const { |
return comparison()->MayThrow(); |
@@ -7848,7 +7848,8 @@ |
}; |
// Construct an environment by constructing uses from an array of definitions. |
- static Environment* From(const GrowableArray<Definition*>& definitions, |
+ static Environment* From(Isolate* isolate, |
+ const GrowableArray<Definition*>& definitions, |
intptr_t fixed_parameter_count, |
const Code& code); |
@@ -7892,10 +7893,12 @@ |
const Code& code() const { return code_; } |
- Environment* DeepCopy() const { return DeepCopy(Length()); } |
+ Environment* DeepCopy(Isolate* isolate) const { |
+ return DeepCopy(isolate, Length()); |
+ } |
- void DeepCopyTo(Instruction* instr) const; |
- void DeepCopyToOuter(Instruction* instr) const; |
+ void DeepCopyTo(Isolate* isolate, Instruction* instr) const; |
+ void DeepCopyToOuter(Isolate* isolate, Instruction* instr) const; |
void PrintTo(BufferFormatter* f) const; |
const char* ToCString() const; |
@@ -7903,7 +7906,7 @@ |
// Deep copy an environment. The 'length' parameter may be less than the |
// environment's length in order to drop values (e.g., passed arguments) |
// from the copy. |
- Environment* DeepCopy(intptr_t length) const; |
+ Environment* DeepCopy(Isolate* isolate, intptr_t length) const; |
private: |
friend class ShallowIterator; |