| Index: src/x87/full-codegen-x87.cc
|
| diff --git a/src/x87/full-codegen-x87.cc b/src/x87/full-codegen-x87.cc
|
| index 0c4ddb82154d279813c5ac26b8eab954d7d9f5e3..9240fc8a5d92f6445c5beca15cd0f5f355596ac3 100644
|
| --- a/src/x87/full-codegen-x87.cc
|
| +++ b/src/x87/full-codegen-x87.cc
|
| @@ -1051,6 +1051,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ push(eax);
|
| __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
|
| __ bind(&done_convert);
|
| + PrepareForBailoutForId(stmt->ToObjectId(), TOS_REG);
|
| __ push(eax);
|
|
|
| // Check for proxies.
|
| @@ -1072,6 +1073,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ bind(&call_runtime);
|
| __ push(eax);
|
| __ CallRuntime(Runtime::kGetPropertyNamesFast, 1);
|
| + PrepareForBailoutForId(stmt->EnumId(), TOS_REG);
|
| __ cmp(FieldOperand(eax, HeapObject::kMapOffset),
|
| isolate()->factory()->meta_map());
|
| __ j(not_equal, &fixed_array);
|
| @@ -1106,7 +1108,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
|
|
| // No need for a write barrier, we are storing a Smi in the feedback vector.
|
| __ LoadHeapObject(ebx, FeedbackVector());
|
| - __ mov(FieldOperand(ebx, FixedArray::OffsetOfElementAt(slot.ToInt())),
|
| + int vector_index = FeedbackVector()->GetIndex(slot);
|
| + __ mov(FieldOperand(ebx, FixedArray::OffsetOfElementAt(vector_index)),
|
| Immediate(TypeFeedbackVector::MegamorphicSentinel(isolate())));
|
|
|
| __ mov(ebx, Immediate(Smi::FromInt(1))); // Smi indicates slow check
|
| @@ -1617,6 +1620,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 eax.
|
| @@ -1645,6 +1649,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);
|
| @@ -1672,7 +1678,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| __ push(Operand(esp, 0)); // Duplicate receiver.
|
| VisitForStackValue(value);
|
| if (property->emit_store()) {
|
| - __ CallRuntime(Runtime::kSetPrototype, 2);
|
| + __ CallRuntime(Runtime::kInternalSetPrototype, 2);
|
| } else {
|
| __ Drop(2);
|
| }
|
| @@ -2851,6 +2857,13 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
| }
|
|
|
|
|
| +void FullCodeGenerator::EmitLoadSuperConstructor(SuperReference* super_ref) {
|
| + DCHECK(super_ref != NULL);
|
| + __ push(Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
|
| + __ CallRuntime(Runtime::kGetPrototype, 1);
|
| +}
|
| +
|
| +
|
| void FullCodeGenerator::VisitCall(Call* expr) {
|
| #ifdef DEBUG
|
| // We want to verify that RecordJSReturnSite gets called on all paths
|
| @@ -2959,6 +2972,12 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| EmitKeyedCallWithLoadIC(expr, property->key());
|
| }
|
| }
|
| + } else if (call_type == Call::SUPER_CALL) {
|
| + SuperReference* super_ref = callee->AsSuperReference();
|
| + EmitLoadSuperConstructor(super_ref);
|
| + __ push(result_register());
|
| + VisitForStackValue(super_ref->this_var());
|
| + EmitCall(expr, CallICState::METHOD);
|
| } else {
|
| DCHECK(call_type == Call::OTHER_CALL);
|
| // Call to an arbitrary expression not handled specially above.
|
| @@ -2986,7 +3005,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();
|
|
|