| Index: runtime/vm/intermediate_language.h
 | 
| ===================================================================
 | 
| --- runtime/vm/intermediate_language.h	(revision 41393)
 | 
| +++ runtime/vm/intermediate_language.h	(working copy)
 | 
| @@ -437,7 +437,6 @@
 | 
|    M(AssertAssignable)                                                          \
 | 
|    M(AssertBoolean)                                                             \
 | 
|    M(CurrentContext)                                                            \
 | 
| -  M(StoreContext)                                                              \
 | 
|    M(ClosureCall)                                                               \
 | 
|    M(InstanceCall)                                                              \
 | 
|    M(PolymorphicInstanceCall)                                                   \
 | 
| @@ -726,7 +725,7 @@
 | 
|      locs_ = MakeLocationSummary(isolate, optimizing);
 | 
|    }
 | 
|  
 | 
| -  static LocationSummary* MakeCallSummary();
 | 
| +  static LocationSummary* MakeCallSummary(Isolate* isolate);
 | 
|  
 | 
|    virtual void EmitNativeCode(FlowGraphCompiler* compiler) {
 | 
|      UNIMPLEMENTED();
 | 
| @@ -1358,7 +1357,7 @@
 | 
|  
 | 
|    ZoneGrowableArray<PhiInstr*>* phis() const { return phis_; }
 | 
|  
 | 
| -  void InsertPhi(intptr_t var_index, intptr_t var_count);
 | 
| +  PhiInstr* InsertPhi(intptr_t var_index, intptr_t var_count);
 | 
|    void RemoveDeadPhis(Definition* replacement);
 | 
|  
 | 
|    void InsertPhi(PhiInstr* phi);
 | 
| @@ -2330,31 +2329,6 @@
 | 
|  };
 | 
|  
 | 
|  
 | 
| -class StoreContextInstr : public TemplateInstruction<1, NoThrow> {
 | 
| - public:
 | 
| -  explicit StoreContextInstr(Value* value) {
 | 
| -    SetInputAt(kValuePos, value);
 | 
| -  }
 | 
| -
 | 
| -  enum {
 | 
| -    kValuePos = 0
 | 
| -  };
 | 
| -
 | 
| -  DECLARE_INSTRUCTION(StoreContext)
 | 
| -
 | 
| -  virtual intptr_t ArgumentCount() const { return 0; }
 | 
| -
 | 
| -  Value* value() const { return inputs_[kValuePos]; }
 | 
| -
 | 
| -  virtual bool CanDeoptimize() const { return false; }
 | 
| -
 | 
| -  virtual EffectSet Effects() const { return EffectSet::None(); }
 | 
| -
 | 
| - private:
 | 
| -  DISALLOW_COPY_AND_ASSIGN(StoreContextInstr);
 | 
| -};
 | 
| -
 | 
| -
 | 
|  class DeoptimizeInstr : public TemplateInstruction<0, NoThrow, Pure> {
 | 
|   public:
 | 
|    DeoptimizeInstr(ICData::DeoptReasonId deopt_reason, intptr_t deopt_id)
 | 
| 
 |