Revision: 7501
Author: [email protected]
Date: Tue Apr 5 02:55:18 2011
Log: 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
http://code.google.com/p/v8/source/detail?r=7501
Modified:
/branches/bleeding_edge/src/arm/lithium-arm.cc
/branches/bleeding_edge/src/hydrogen-instructions.h
/branches/bleeding_edge/src/hydrogen.cc
/branches/bleeding_edge/src/ia32/lithium-ia32.cc
/branches/bleeding_edge/src/x64/lithium-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/lithium-arm.cc Mon Apr 4 08:03:34 2011
+++ /branches/bleeding_edge/src/arm/lithium-arm.cc Tue Apr 5 02:55:18 2011
@@ -2076,8 +2076,6 @@
env->Push(value);
}
}
-
- ASSERT(env->length() == instr->environment_length());
// If there is an instruction pending deoptimization environment create a
// lazy bailout instruction to capture the environment.
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.h Mon Apr 4 08:03:34
2011
+++ /branches/bleeding_edge/src/hydrogen-instructions.h Tue Apr 5 02:55:18
2011
@@ -975,10 +975,9 @@
class HSimulate: public HInstruction {
public:
- HSimulate(int ast_id, int pop_count, int environment_length)
+ HSimulate(int ast_id, int pop_count)
: ast_id_(ast_id),
pop_count_(pop_count),
- environment_length_(environment_length),
values_(2),
assigned_indexes_(2) {}
virtual ~HSimulate() {}
@@ -992,7 +991,6 @@
ast_id_ = id;
}
- int environment_length() const { return environment_length_; }
int pop_count() const { return pop_count_; }
const ZoneList<HValue*>* values() const { return &values_; }
int GetAssignedIndexAt(int index) const {
@@ -1038,7 +1036,6 @@
}
int ast_id_;
int pop_count_;
- int environment_length_;
ZoneList<HValue*> values_;
ZoneList<int> assigned_indexes_;
};
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc Tue Apr 5 02:21:02 2011
+++ /branches/bleeding_edge/src/hydrogen.cc Tue Apr 5 02:55:18 2011
@@ -140,8 +140,7 @@
int push_count = environment->push_count();
int pop_count = environment->pop_count();
- int length = environment->length();
- HSimulate* instr = new HSimulate(id, pop_count, length);
+ HSimulate* instr = new HSimulate(id, pop_count);
for (int i = push_count - 1; i >= 0; --i) {
instr->AddPushedValue(environment->ExpressionStackAt(i));
}
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.cc Tue Apr 5 02:21:02
2011
+++ /branches/bleeding_edge/src/ia32/lithium-ia32.cc Tue Apr 5 02:55:18
2011
@@ -2134,7 +2134,6 @@
env->Push(value);
}
}
- ASSERT(env->length() == instr->environment_length());
// If there is an instruction pending deoptimization environment create a
// lazy bailout instruction to capture the environment.
=======================================
--- /branches/bleeding_edge/src/x64/lithium-x64.cc Tue Apr 5 00:57:35 2011
+++ /branches/bleeding_edge/src/x64/lithium-x64.cc Tue Apr 5 02:55:18 2011
@@ -2072,7 +2072,6 @@
env->Push(value);
}
}
- ASSERT(env->length() == instr->environment_length());
// If there is an instruction pending deoptimization environment create a
// lazy bailout instruction to capture the environment.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev