Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index cfda00a78d1083baa18a3987cf1e778e6890c763..5df6d81ae987e6d98fc765939935cb8c1470f68f 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -614,15 +614,27 @@ Operand LCodeGen::HighOperand(LOperand* op) { |
void LCodeGen::WriteTranslation(LEnvironment* environment, |
- Translation* translation) { |
+ Translation* translation, |
+ int* pushed_arguments_index, |
+ int* pushed_arguments_count) { |
if (environment == NULL) return; |
// The translation includes one command per value in the environment. |
- int translation_size = environment->translation_size(); |
+ int translation_size = environment->values()->length(); |
// The output frame height does not include the parameters. |
int height = translation_size - environment->parameter_count(); |
- WriteTranslation(environment->outer(), translation); |
+ // Function parameters are arguments to the outermost environment. The |
+ // arguments index points to the first element of a sequence of tagged |
+ // values on the stack that represent the arguments. This needs to be |
+ // kept in sync with the LArgumentsElements implementation. |
+ *pushed_arguments_index = -environment->parameter_count(); |
+ *pushed_arguments_count = environment->parameter_count(); |
+ |
+ WriteTranslation(environment->outer(), |
+ translation, |
+ pushed_arguments_index, |
+ pushed_arguments_count); |
bool has_closure_id = !info()->closure().is_null() && |
!info()->closure().is_identical_to(environment->closure()); |
int closure_id = has_closure_id |
@@ -655,6 +667,23 @@ void LCodeGen::WriteTranslation(LEnvironment* environment, |
UNREACHABLE(); |
} |
+ // Inlined frames which push their arguments cause the index to be |
+ // bumped and another stack area to be used for materialization, |
+ // otherwise actual argument values are unknown for inlined frames. |
+ bool arguments_known = true; |
+ int arguments_index = *pushed_arguments_index; |
+ int arguments_count = *pushed_arguments_count; |
+ if (environment->entry() != NULL) { |
+ arguments_known = environment->entry()->arguments_pushed(); |
+ arguments_index = arguments_index < 0 |
+ ? GetStackSlotCount() : arguments_index + arguments_count; |
+ arguments_count = environment->entry()->arguments_count() + 1; |
+ if (environment->entry()->arguments_pushed()) { |
+ *pushed_arguments_index = arguments_index; |
+ *pushed_arguments_count = arguments_count; |
+ } |
+ } |
+ |
for (int i = 0; i < translation_size; ++i) { |
LOperand* value = environment->values()->at(i); |
// spilled_registers_ and spilled_double_registers_ are either |
@@ -666,7 +695,10 @@ void LCodeGen::WriteTranslation(LEnvironment* environment, |
AddToTranslation(translation, |
environment->spilled_registers()[value->index()], |
environment->HasTaggedValueAt(i), |
- environment->HasUint32ValueAt(i)); |
+ environment->HasUint32ValueAt(i), |
+ arguments_known, |
+ arguments_index, |
+ arguments_count); |
} else if ( |
value->IsDoubleRegister() && |
environment->spilled_double_registers()[value->index()] != NULL) { |
@@ -675,36 +707,20 @@ void LCodeGen::WriteTranslation(LEnvironment* environment, |
translation, |
environment->spilled_double_registers()[value->index()], |
false, |
- false); |
- } |
- } |
- |
- // TODO(mstarzinger): Introduce marker operands to indicate that this value |
- // is not present and must be reconstructed from the deoptimizer. Currently |
- // this is only used for the arguments object. |
- if (value == NULL) { |
- int arguments_count = environment->values()->length() - translation_size; |
- translation->BeginArgumentsObject(arguments_count); |
- for (int i = 0; i < arguments_count; ++i) { |
- LOperand* value = environment->values()->at(translation_size + i); |
- ASSERT(environment->spilled_registers() == NULL || |
- !value->IsRegister() || |
- environment->spilled_registers()[value->index()] == NULL); |
- ASSERT(environment->spilled_registers() == NULL || |
- !value->IsDoubleRegister() || |
- environment->spilled_double_registers()[value->index()] == NULL); |
- AddToTranslation(translation, |
- value, |
- environment->HasTaggedValueAt(translation_size + i), |
- environment->HasUint32ValueAt(translation_size + i)); |
+ false, |
+ arguments_known, |
+ arguments_index, |
+ arguments_count); |
} |
- continue; |
} |
AddToTranslation(translation, |
value, |
environment->HasTaggedValueAt(i), |
- environment->HasUint32ValueAt(i)); |
+ environment->HasUint32ValueAt(i), |
+ arguments_known, |
+ arguments_index, |
+ arguments_count); |
} |
} |
@@ -712,8 +728,17 @@ void LCodeGen::WriteTranslation(LEnvironment* environment, |
void LCodeGen::AddToTranslation(Translation* translation, |
LOperand* op, |
bool is_tagged, |
- bool is_uint32) { |
- if (op->IsStackSlot()) { |
+ bool is_uint32, |
+ bool arguments_known, |
+ int arguments_index, |
+ int arguments_count) { |
+ if (op == NULL) { |
+ // TODO(twuerthinger): Introduce marker operands to indicate that this value |
+ // is not present and must be reconstructed from the deoptimizer. Currently |
+ // this is only used for the arguments object. |
+ translation->StoreArgumentsObject( |
+ arguments_known, arguments_index, arguments_count); |
+ } else if (op->IsStackSlot()) { |
if (is_tagged) { |
translation->StoreStackSlot(op->index()); |
} else if (is_uint32) { |
@@ -839,6 +864,8 @@ void LCodeGen::RegisterEnvironmentForDeoptimization( |
int frame_count = 0; |
int jsframe_count = 0; |
+ int args_index = 0; |
+ int args_count = 0; |
for (LEnvironment* e = environment; e != NULL; e = e->outer()) { |
++frame_count; |
if (e->frame_type() == JS_FUNCTION) { |
@@ -846,7 +873,7 @@ void LCodeGen::RegisterEnvironmentForDeoptimization( |
} |
} |
Translation translation(&translations_, frame_count, jsframe_count, zone()); |
- WriteTranslation(environment, &translation); |
+ WriteTranslation(environment, &translation, &args_index, &args_count); |
int deoptimization_index = deoptimizations_.length(); |
int pc_offset = masm()->pc_offset(); |
environment->Register(deoptimization_index, |