Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Unified Diff: runtime/vm/flow_graph_compiler.h

Issue 15563007: Remove an unnecessary setter. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler.h
diff --git a/runtime/vm/flow_graph_compiler.h b/runtime/vm/flow_graph_compiler.h
index f301879e2d7794946543a4e763afcbc005c64f48..0cb7843ab8550c9d1ad288cfaad1f205a306f5e5 100644
--- a/runtime/vm/flow_graph_compiler.h
+++ b/runtime/vm/flow_graph_compiler.h
@@ -107,11 +107,15 @@ class ParallelMoveResolver : public ValueObject {
// 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);
@@ -124,11 +128,8 @@ class CompilerDeoptInfo : public ZoneAllocated {
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);
@@ -139,7 +140,7 @@ class CompilerDeoptInfo : public ZoneAllocated {
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);
};
@@ -148,8 +149,9 @@ class CompilerDeoptInfo : public ZoneAllocated {
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);
}
« no previous file with comments | « no previous file | runtime/vm/flow_graph_compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698