Index: src/x64/codegen-x64.cc |
diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc |
index ad114c243108bbf89e2e336f873398a8ddfcfea5..8c2a4624fc1b04e07d24353817fccf03685a4f3c 100644 |
--- a/src/x64/codegen-x64.cc |
+++ b/src/x64/codegen-x64.cc |
@@ -611,11 +611,13 @@ void CodeGenerator::LoadTypeofExpression(Expression* expr) { |
ArgumentsAllocationMode CodeGenerator::ArgumentsMode() { |
if (scope()->arguments() == NULL) return NO_ARGUMENTS_ALLOCATION; |
- ASSERT(scope()->arguments_shadow() != NULL); |
+ |
+ // In strict mode there is no need for shadow arguments. |
+ ASSERT(scope()->arguments_shadow() != NULL || scope()->is_strict_mode()); |
// We don't want to do lazy arguments allocation for functions that |
// have heap-allocated contexts, because it interfers with the |
// uninitialized const tracking in the context objects. |
- return (scope()->num_heap_slots() > 0) |
+ return (scope()->num_heap_slots() > 0 || scope()->is_strict_mode()) |
? EAGER_ARGUMENTS_ALLOCATION |
: LAZY_ARGUMENTS_ALLOCATION; |
} |
@@ -643,7 +645,9 @@ Result CodeGenerator::StoreArgumentsObject(bool initial) { |
Variable* arguments = scope()->arguments(); |
Variable* shadow = scope()->arguments_shadow(); |
ASSERT(arguments != NULL && arguments->AsSlot() != NULL); |
- ASSERT(shadow != NULL && shadow->AsSlot() != NULL); |
+ ASSERT((shadow != NULL && shadow->AsSlot() != NULL) || |
+ scope()->is_strict_mode()); |
+ |
JumpTarget done; |
bool skip_arguments = false; |
if (mode == LAZY_ARGUMENTS_ALLOCATION && !initial) { |
@@ -666,7 +670,9 @@ Result CodeGenerator::StoreArgumentsObject(bool initial) { |
StoreToSlot(arguments->AsSlot(), NOT_CONST_INIT); |
if (mode == LAZY_ARGUMENTS_ALLOCATION) done.Bind(); |
} |
- StoreToSlot(shadow->AsSlot(), NOT_CONST_INIT); |
+ if (shadow != NULL) { |
+ StoreToSlot(shadow->AsSlot(), NOT_CONST_INIT); |
+ } |
return frame_->Pop(); |
} |