Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index e468b11b5fef784d629cba77c5c0907bd043fcd3..fbb9c6ef8bb232f80238735b60a7665260115c17 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -929,7 +929,7 @@ LEnvironment* LChunkBuilder::CreateEnvironment( |
BailoutId ast_id = hydrogen_env->ast_id(); |
ASSERT(!ast_id.IsNone() || |
hydrogen_env->frame_type() != JS_FUNCTION); |
- int value_count = hydrogen_env->length() - hydrogen_env->specials_count(); |
+ int value_count = hydrogen_env->length(); |
LEnvironment* result = new(zone()) LEnvironment( |
hydrogen_env->closure(), |
hydrogen_env->frame_type(), |
@@ -940,15 +940,13 @@ LEnvironment* LChunkBuilder::CreateEnvironment( |
outer, |
hydrogen_env->entry(), |
zone()); |
- bool needs_arguments_object_materialization = false; |
int argument_index = *argument_index_accumulator; |
- for (int i = 0; i < hydrogen_env->length(); ++i) { |
+ for (int i = 0; i < value_count; ++i) { |
if (hydrogen_env->is_special_index(i)) continue; |
HValue* value = hydrogen_env->values()->at(i); |
LOperand* op = NULL; |
if (value->IsArgumentsObject()) { |
- needs_arguments_object_materialization = true; |
op = NULL; |
} else if (value->IsPushArgument()) { |
op = new(zone()) LArgument(argument_index++); |
@@ -960,21 +958,6 @@ LEnvironment* LChunkBuilder::CreateEnvironment( |
value->CheckFlag(HInstruction::kUint32)); |
} |
- if (needs_arguments_object_materialization) { |
- HArgumentsObject* arguments = hydrogen_env->entry() == NULL |
- ? graph()->GetArgumentsObject() |
- : hydrogen_env->entry()->arguments_object(); |
- ASSERT(arguments->IsLinked()); |
- for (int i = 1; i < arguments->arguments_count(); ++i) { |
- HValue* value = arguments->arguments_values()->at(i); |
- ASSERT(!value->IsArgumentsObject() && !value->IsPushArgument()); |
- LOperand* op = UseAny(value); |
- result->AddValue(op, |
- value->representation(), |
- value->CheckFlag(HInstruction::kUint32)); |
- } |
- } |
- |
if (hydrogen_env->frame_type() == JS_FUNCTION) { |
*argument_index_accumulator = argument_index; |
} |