Index: src/x64/lithium-x64.cc |
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
index cb0659d24df3c055d43dde3525bb04f385c46dc8..57a8b2e2974396d006c985f03b227d10ff0cd5b5 100644 |
--- a/src/x64/lithium-x64.cc |
+++ b/src/x64/lithium-x64.cc |
@@ -937,7 +937,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(); |
+ int value_count = hydrogen_env->length() - hydrogen_env->specials_count(); |
LEnvironment* result = new(zone()) LEnvironment( |
hydrogen_env->closure(), |
hydrogen_env->frame_type(), |
@@ -948,13 +948,15 @@ 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 < value_count; ++i) { |
+ for (int i = 0; i < hydrogen_env->length(); ++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++); |
@@ -966,6 +968,22 @@ 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()); |
+ ASSERT(HInstruction::cast(value)->IsLinked()); |
+ 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; |
} |