Remove an unnecessary setter.

runtime/vm/flow_graph_compiler.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_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 89 matching lines @@
 
   // List of moves not yet resolved.
   GrowableArray<MoveOperands*> moves_;
 };
 
 
 // Used for describing a deoptimization point after call (lazy deoptimization).
 // For deoptimization before instruction use class CompilerDeoptInfoWithStub.
 class CompilerDeoptInfo : public ZoneAllocated {
  public:
-  CompilerDeoptInfo(intptr_t deopt_id, DeoptReasonId reason)
+  CompilerDeoptInfo(intptr_t deopt_id,
+                    DeoptReasonId reason,
+                    Environment* deopt_env)
       : pc_offset_(-1),
         deopt_id_(deopt_id),
         reason_(reason),
-        deoptimization_env_(NULL) {}
+        deopt_env_(deopt_env) {
+    ASSERT(deopt_env != NULL);
+  }
 
   RawDeoptInfo* CreateDeoptInfo(FlowGraphCompiler* compiler,
                                 DeoptInfoBuilder* builder);
 
 
   // No code needs to be generated.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix) {}
 
   intptr_t pc_offset() const { return pc_offset_; }
   void set_pc_offset(intptr_t offset) { pc_offset_ = offset; }
 
   intptr_t deopt_id() const { return deopt_id_; }
-
   DeoptReasonId reason() const { return reason_; }
-
-  const Environment* deoptimization_env() const { return deoptimization_env_; }
-  void set_deoptimization_env(Environment* env) { deoptimization_env_ = env; }
+  const Environment* deopt_env() const { return deopt_env_; }
 
  private:
   void EmitMaterializations(Environment* env, DeoptInfoBuilder* builder);
 
   void AllocateIncomingParametersRecursive(Environment* env,
                                            intptr_t* stack_height);
 
   intptr_t pc_offset_;
   const intptr_t deopt_id_;
   const DeoptReasonId reason_;
-  Environment* deoptimization_env_;
+  Environment* deopt_env_;

[Florian Schneider, 2013/05/21 13:47:11]

Can you make this const as well?

 
   DISALLOW_COPY_AND_ASSIGN(CompilerDeoptInfo);
 };
 
 
 class CompilerDeoptInfoWithStub : public CompilerDeoptInfo {
  public:
   CompilerDeoptInfoWithStub(intptr_t deopt_id,
-                            DeoptReasonId reason)
-      : CompilerDeoptInfo(deopt_id, reason), entry_label_() {
+                            DeoptReasonId reason,
+                            Environment* deopt_env)
+      : CompilerDeoptInfo(deopt_id, reason, deopt_env), entry_label_() {
     ASSERT(reason != kDeoptAtCall);
   }
 
   Label* entry_label() { return &entry_label_; }
 
   // Implementation is in architecture specific file.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix);
 
  private:
   Label entry_label_;
@@ skipping 427 matching lines @@
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_