Index: src/x64/lithium-x64.cc |
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
index 965a2bb6bc60faae7a9a7bf749c01439fbcb05ec..62da8aa3cda341a588d95cd071e8c3d5b8efc1c2 100644 |
--- a/src/x64/lithium-x64.cc |
+++ b/src/x64/lithium-x64.cc |
@@ -995,10 +995,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_, |
@@ -1020,7 +1021,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; |
} |
@@ -2094,6 +2095,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, rax), instr); |
} |
@@ -2247,7 +2254,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; |