Remove environment length from HSimulate instructions.

It was only used in an ASSERT when reconstructing environments
at lithium translation time.
Review URL: http://codereview.chromium.org/6693062

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7501 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 3dd575ec
...@@ -2077,8 +2077,6 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) { ...@@ -2077,8 +2077,6 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) {
} }
} }
ASSERT(env->length() == instr->environment_length());
// If there is an instruction pending deoptimization environment create a // If there is an instruction pending deoptimization environment create a
// lazy bailout instruction to capture the environment. // lazy bailout instruction to capture the environment.
if (pending_deoptimization_ast_id_ == instr->ast_id()) { if (pending_deoptimization_ast_id_ == instr->ast_id()) {
......
...@@ -975,10 +975,9 @@ class HChange: public HUnaryOperation { ...@@ -975,10 +975,9 @@ class HChange: public HUnaryOperation {
class HSimulate: public HInstruction { class HSimulate: public HInstruction {
public: public:
HSimulate(int ast_id, int pop_count, int environment_length) HSimulate(int ast_id, int pop_count)
: ast_id_(ast_id), : ast_id_(ast_id),
pop_count_(pop_count), pop_count_(pop_count),
environment_length_(environment_length),
values_(2), values_(2),
assigned_indexes_(2) {} assigned_indexes_(2) {}
virtual ~HSimulate() {} virtual ~HSimulate() {}
...@@ -992,7 +991,6 @@ class HSimulate: public HInstruction { ...@@ -992,7 +991,6 @@ class HSimulate: public HInstruction {
ast_id_ = id; ast_id_ = id;
} }
int environment_length() const { return environment_length_; }
int pop_count() const { return pop_count_; } int pop_count() const { return pop_count_; }
const ZoneList<HValue*>* values() const { return &values_; } const ZoneList<HValue*>* values() const { return &values_; }
int GetAssignedIndexAt(int index) const { int GetAssignedIndexAt(int index) const {
...@@ -1038,7 +1036,6 @@ class HSimulate: public HInstruction { ...@@ -1038,7 +1036,6 @@ class HSimulate: public HInstruction {
} }
int ast_id_; int ast_id_;
int pop_count_; int pop_count_;
int environment_length_;
ZoneList<HValue*> values_; ZoneList<HValue*> values_;
ZoneList<int> assigned_indexes_; ZoneList<int> assigned_indexes_;
}; };
......
...@@ -140,8 +140,7 @@ HSimulate* HBasicBlock::CreateSimulate(int id) { ...@@ -140,8 +140,7 @@ HSimulate* HBasicBlock::CreateSimulate(int id) {
int push_count = environment->push_count(); int push_count = environment->push_count();
int pop_count = environment->pop_count(); int pop_count = environment->pop_count();
int length = environment->length(); HSimulate* instr = new HSimulate(id, pop_count);
HSimulate* instr = new HSimulate(id, pop_count, length);
for (int i = push_count - 1; i >= 0; --i) { for (int i = push_count - 1; i >= 0; --i) {
instr->AddPushedValue(environment->ExpressionStackAt(i)); instr->AddPushedValue(environment->ExpressionStackAt(i));
} }
......
...@@ -2134,7 +2134,6 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) { ...@@ -2134,7 +2134,6 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) {
env->Push(value); env->Push(value);
} }
} }
ASSERT(env->length() == instr->environment_length());
// If there is an instruction pending deoptimization environment create a // If there is an instruction pending deoptimization environment create a
// lazy bailout instruction to capture the environment. // lazy bailout instruction to capture the environment.
......
...@@ -2072,7 +2072,6 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) { ...@@ -2072,7 +2072,6 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) {
env->Push(value); env->Push(value);
} }
} }
ASSERT(env->length() == instr->environment_length());
// If there is an instruction pending deoptimization environment create a // If there is an instruction pending deoptimization environment create a
// lazy bailout instruction to capture the environment. // lazy bailout instruction to capture the environment.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment