| Index: src/x64/full-codegen-x64.cc
|
| diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc
|
| index 9b63de9c9baf8214f42ed5cd549a886a0d96e21b..4229f445b39b0fd283bb0a51264ca739a3d56cc8 100644
|
| --- a/src/x64/full-codegen-x64.cc
|
| +++ b/src/x64/full-codegen-x64.cc
|
| @@ -1086,6 +1086,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ Push(rax);
|
| __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
|
| __ bind(&done_convert);
|
| + PrepareForBailoutForId(stmt->ToObjectId(), TOS_REG);
|
| __ Push(rax);
|
|
|
| // Check for proxies.
|
| @@ -1110,6 +1111,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ bind(&call_runtime);
|
| __ Push(rax); // Duplicate the enumerable object on the stack.
|
| __ CallRuntime(Runtime::kGetPropertyNamesFast, 1);
|
| + PrepareForBailoutForId(stmt->EnumId(), TOS_REG);
|
|
|
| // If we got a map from the runtime call, we can do a fast
|
| // modification check. Otherwise, we got a fixed array, and we have
|
| @@ -1149,7 +1151,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
|
|
| // No need for a write barrier, we are storing a Smi in the feedback vector.
|
| __ Move(rbx, FeedbackVector());
|
| - __ Move(FieldOperand(rbx, FixedArray::OffsetOfElementAt(slot.ToInt())),
|
| + int vector_index = FeedbackVector()->GetIndex(slot);
|
| + __ Move(FieldOperand(rbx, FixedArray::OffsetOfElementAt(vector_index)),
|
| TypeFeedbackVector::MegamorphicSentinel(isolate()));
|
| __ Move(rbx, Smi::FromInt(1)); // Smi indicates slow check
|
| __ movp(rcx, Operand(rsp, 0 * kPointerSize)); // Get enumerated object
|
| @@ -1662,6 +1665,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| FastCloneShallowObjectStub stub(isolate(), properties_count);
|
| __ CallStub(&stub);
|
| }
|
| + PrepareForBailoutForId(expr->CreateLiteralId(), TOS_REG);
|
|
|
| // If result_saved is true the result is on top of the stack. If
|
| // result_saved is false the result is in rax.
|
| @@ -1690,6 +1694,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| DCHECK(!CompileTimeValue::IsCompileTimeValue(value));
|
| // Fall through.
|
| case ObjectLiteral::Property::COMPUTED:
|
| + // It is safe to use [[Put]] here because the boilerplate already
|
| + // contains computed properties with an uninitialized value.
|
| if (key->value()->IsInternalizedString()) {
|
| if (property->emit_store()) {
|
| VisitForAccumulatorValue(value);
|
| @@ -1717,7 +1723,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| __ Push(Operand(rsp, 0)); // Duplicate receiver.
|
| VisitForStackValue(value);
|
| if (property->emit_store()) {
|
| - __ CallRuntime(Runtime::kSetPrototype, 2);
|
| + __ CallRuntime(Runtime::kInternalSetPrototype, 2);
|
| } else {
|
| __ Drop(2);
|
| }
|
| @@ -2864,6 +2870,13 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
| }
|
|
|
|
|
| +void FullCodeGenerator::EmitLoadSuperConstructor(SuperReference* super_ref) {
|
| + DCHECK(super_ref != NULL);
|
| + __ Push(Operand(rbp, JavaScriptFrameConstants::kFunctionOffset));
|
| + __ CallRuntime(Runtime::kGetPrototype, 1);
|
| +}
|
| +
|
| +
|
| void FullCodeGenerator::VisitCall(Call* expr) {
|
| #ifdef DEBUG
|
| // We want to verify that RecordJSReturnSite gets called on all paths
|
| @@ -2973,9 +2986,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| }
|
| } else if (call_type == Call::SUPER_CALL) {
|
| SuperReference* super_ref = callee->AsSuperReference();
|
| - DCHECK(super_ref != NULL);
|
| - __ Push(Operand(rbp, JavaScriptFrameConstants::kFunctionOffset));
|
| - __ CallRuntime(Runtime::kGetPrototype, 1);
|
| + EmitLoadSuperConstructor(super_ref);
|
| __ Push(result_register());
|
| VisitForStackValue(super_ref->this_var());
|
| EmitCall(expr, CallICState::METHOD);
|
| @@ -3006,7 +3017,12 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) {
|
| // Push constructor on the stack. If it's not a function it's used as
|
| // receiver for CALL_NON_FUNCTION, otherwise the value on the stack is
|
| // ignored.
|
| - VisitForStackValue(expr->expression());
|
| + if (expr->expression()->IsSuperReference()) {
|
| + EmitLoadSuperConstructor(expr->expression()->AsSuperReference());
|
| + __ Push(result_register());
|
| + } else {
|
| + VisitForStackValue(expr->expression());
|
| + }
|
|
|
| // Push the arguments ("left-to-right") on the stack.
|
| ZoneList<Expression*>* args = expr->arguments();
|
|
|