| Index: src/arm/lithium-arm.cc
|
| diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
|
| index 5e126ec7a6ad35c2ba70fc0a8c6057805ce5ea20..2922d96cc523e699dd76b533bc761d635a7c738d 100644
|
| --- a/src/arm/lithium-arm.cc
|
| +++ b/src/arm/lithium-arm.cc
|
| @@ -1000,10 +1000,11 @@ LEnvironment* LChunkBuilder::CreateEnvironment(
|
| LEnvironment* outer =
|
| CreateEnvironment(hydrogen_env->outer(), argument_index_accumulator);
|
| int ast_id = hydrogen_env->ast_id();
|
| - ASSERT(ast_id != AstNode::kNoNumber || hydrogen_env->is_arguments_adaptor());
|
| + ASSERT(ast_id != AstNode::kNoNumber ||
|
| + hydrogen_env->frame_type() != JS_FUNCTION);
|
| int value_count = hydrogen_env->length();
|
| LEnvironment* result = new LEnvironment(hydrogen_env->closure(),
|
| - hydrogen_env->is_arguments_adaptor(),
|
| + hydrogen_env->frame_type(),
|
| ast_id,
|
| hydrogen_env->parameter_count(),
|
| argument_count_,
|
| @@ -1025,7 +1026,7 @@ LEnvironment* LChunkBuilder::CreateEnvironment(
|
| result->AddValue(op, value->representation());
|
| }
|
|
|
| - if (!hydrogen_env->is_arguments_adaptor()) {
|
| + if (hydrogen_env->frame_type() == JS_FUNCTION) {
|
| *argument_index_accumulator = argument_index;
|
| }
|
|
|
| @@ -2093,6 +2094,12 @@ LInstruction* LChunkBuilder::DoStringLength(HStringLength* instr) {
|
| }
|
|
|
|
|
| +LInstruction* LChunkBuilder::DoAllocateObject(HAllocateObject* instr) {
|
| + LAllocateObject* result = new LAllocateObject();
|
| + return AssignPointerMap(DefineAsRegister(result));
|
| +}
|
| +
|
| +
|
| LInstruction* LChunkBuilder::DoArrayLiteral(HArrayLiteral* instr) {
|
| return MarkAsCall(DefineFixed(new LArrayLiteral, r0), instr);
|
| }
|
| @@ -2246,7 +2253,8 @@ LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) {
|
| instr->arguments_count(),
|
| instr->function(),
|
| undefined,
|
| - instr->call_kind());
|
| + instr->call_kind(),
|
| + instr->is_construct());
|
| current_block_->UpdateEnvironment(inner);
|
| chunk_->AddInlinedClosure(instr->closure());
|
| return NULL;
|
|
|