| Index: src/arm64/full-codegen-arm64.cc
|
| diff --git a/src/arm64/full-codegen-arm64.cc b/src/arm64/full-codegen-arm64.cc
|
| index c0eca3c401b5af80dbfc4c8831e5bc5075b67953..0a8e1ca3b2fe63fa088cd8cb2177e4dca9cc2fd3 100644
|
| --- a/src/arm64/full-codegen-arm64.cc
|
| +++ b/src/arm64/full-codegen-arm64.cc
|
| @@ -299,24 +299,24 @@ void FullCodeGenerator::Generate() {
|
| }
|
| VisitDeclarations(scope()->declarations());
|
| }
|
| - }
|
|
|
| - { Comment cmnt(masm_, "[ Stack check");
|
| - PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS);
|
| - Label ok;
|
| - DCHECK(jssp.Is(__ StackPointer()));
|
| - __ CompareRoot(jssp, Heap::kStackLimitRootIndex);
|
| - __ B(hs, &ok);
|
| - PredictableCodeSizeScope predictable(masm_,
|
| - Assembler::kCallSizeWithRelocation);
|
| - __ Call(isolate()->builtins()->StackCheck(), RelocInfo::CODE_TARGET);
|
| - __ Bind(&ok);
|
| - }
|
| + { Comment cmnt(masm_, "[ Stack check");
|
| + PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS);
|
| + Label ok;
|
| + DCHECK(jssp.Is(__ StackPointer()));
|
| + __ CompareRoot(jssp, Heap::kStackLimitRootIndex);
|
| + __ B(hs, &ok);
|
| + PredictableCodeSizeScope predictable(masm_,
|
| + Assembler::kCallSizeWithRelocation);
|
| + __ Call(isolate()->builtins()->StackCheck(), RelocInfo::CODE_TARGET);
|
| + __ Bind(&ok);
|
| + }
|
|
|
| - { Comment cmnt(masm_, "[ Body");
|
| - DCHECK(loop_depth() == 0);
|
| - VisitStatements(function()->body());
|
| - DCHECK(loop_depth() == 0);
|
| + { Comment cmnt(masm_, "[ Body");
|
| + DCHECK(loop_depth() == 0);
|
| + VisitStatements(function()->body());
|
| + DCHECK(loop_depth() == 0);
|
| + }
|
| }
|
|
|
| // Always emit a 'return undefined' in case control fell off the end of
|
| @@ -1124,6 +1124,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ Push(x0);
|
| __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
|
| __ Bind(&done_convert);
|
| + PrepareForBailoutForId(stmt->ToObjectId(), TOS_REG);
|
| __ Push(x0);
|
|
|
| // Check for proxies.
|
| @@ -1147,6 +1148,7 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
| __ Bind(&call_runtime);
|
| __ Push(x0); // 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
|
| @@ -1181,7 +1183,8 @@ void FullCodeGenerator::VisitForInStatement(ForInStatement* stmt) {
|
|
|
| __ LoadObject(x1, FeedbackVector());
|
| __ Mov(x10, Operand(TypeFeedbackVector::MegamorphicSentinel(isolate())));
|
| - __ Str(x10, FieldMemOperand(x1, FixedArray::OffsetOfElementAt(slot.ToInt())));
|
| + int vector_index = FeedbackVector()->GetIndex(slot);
|
| + __ Str(x10, FieldMemOperand(x1, FixedArray::OffsetOfElementAt(vector_index)));
|
|
|
| __ Mov(x1, Smi::FromInt(1)); // Smi indicates slow check.
|
| __ Peek(x10, 0); // Get enumerated object.
|
| @@ -1677,6 +1680,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 x0.
|
| @@ -1705,6 +1709,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| DCHECK(!CompileTimeValue::IsCompileTimeValue(property->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);
|
| @@ -1738,7 +1744,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| __ Peek(x0, 0);
|
| __ Push(x0);
|
| VisitForStackValue(value);
|
| - __ CallRuntime(Runtime::kSetPrototype, 2);
|
| + __ CallRuntime(Runtime::kInternalSetPrototype, 2);
|
| } else {
|
| VisitForEffect(value);
|
| }
|
| @@ -2625,6 +2631,14 @@ void FullCodeGenerator::EmitResolvePossiblyDirectEval(int arg_count) {
|
| }
|
|
|
|
|
| +void FullCodeGenerator::EmitLoadSuperConstructor(SuperReference* super_ref) {
|
| + DCHECK(super_ref != NULL);
|
| + __ ldr(x0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| + __ Push(x0);
|
| + __ CallRuntime(Runtime::kGetPrototype, 1);
|
| +}
|
| +
|
| +
|
| void FullCodeGenerator::VisitCall(Call* expr) {
|
| #ifdef DEBUG
|
| // We want to verify that RecordJSReturnSite gets called on all paths
|
| @@ -2743,10 +2757,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
| }
|
| } else if (call_type == Call::SUPER_CALL) {
|
| SuperReference* super_ref = callee->AsSuperReference();
|
| - DCHECK(super_ref != NULL);
|
| - __ Ldr(x0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| - __ Push(x0);
|
| - __ CallRuntime(Runtime::kGetPrototype, 1);
|
| + EmitLoadSuperConstructor(super_ref);
|
| __ Push(result_register());
|
| VisitForStackValue(super_ref->this_var());
|
| EmitCall(expr, CallICState::METHOD);
|
| @@ -2778,7 +2789,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();
|
|
|