| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index 3679a6f7310d01e029eb6ef43a158c1ce475e6cf..002f7d5f3c8acf35382190ef733fea4fe8eab56c 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -242,7 +242,7 @@ void FullCodeGenerator::Generate() {
|
| __ Push(info->scope()->GetScopeInfo());
|
| __ CallRuntime(Runtime::kHiddenNewGlobalContext, 2);
|
| } else if (heap_slots <= FastNewContextStub::kMaximumSlots) {
|
| - FastNewContextStub stub(heap_slots);
|
| + FastNewContextStub stub(isolate(), heap_slots);
|
| __ CallStub(&stub);
|
| } else {
|
| __ push(r1);
|
| @@ -303,7 +303,7 @@ void FullCodeGenerator::Generate() {
|
| } else {
|
| type = ArgumentsAccessStub::NEW_SLOPPY_FAST;
|
| }
|
| - ArgumentsAccessStub stub(type);
|
| + ArgumentsAccessStub stub(isolate(), type);
|
| __ CallStub(&stub);
|
|
|
| SetVar(arguments, r0, r1, r2);
|
| @@ -1357,7 +1357,9 @@ void FullCodeGenerator::EmitNewClosure(Handle<SharedFunctionInfo> info,
|
| !pretenure &&
|
| scope()->is_function_scope() &&
|
| info->num_literals() == 0) {
|
| - FastNewClosureStub stub(info->strict_mode(), info->is_generator());
|
| + FastNewClosureStub stub(isolate(),
|
| + info->strict_mode(),
|
| + info->is_generator());
|
| __ mov(r2, Operand(info));
|
| __ CallStub(&stub);
|
| } else {
|
| @@ -1683,7 +1685,7 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
|
| __ Push(r3, r2, r1, r0);
|
| __ CallRuntime(Runtime::kHiddenCreateObjectLiteral, 4);
|
| } else {
|
| - FastCloneShallowObjectStub stub(properties_count);
|
| + FastCloneShallowObjectStub stub(isolate(), properties_count);
|
| __ CallStub(&stub);
|
| }
|
|
|
| @@ -1822,6 +1824,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
|
| if (has_fast_elements && constant_elements_values->map() ==
|
| isolate()->heap()->fixed_cow_array_map()) {
|
| FastCloneShallowArrayStub stub(
|
| + isolate(),
|
| FastCloneShallowArrayStub::COPY_ON_WRITE_ELEMENTS,
|
| allocation_site_mode,
|
| length);
|
| @@ -1843,7 +1846,8 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
|
| mode = FastCloneShallowArrayStub::CLONE_ELEMENTS;
|
| }
|
|
|
| - FastCloneShallowArrayStub stub(mode, allocation_site_mode, length);
|
| + FastCloneShallowArrayStub stub(isolate(), mode, allocation_site_mode,
|
| + length);
|
| __ CallStub(&stub);
|
| }
|
|
|
| @@ -1875,7 +1879,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
|
| EMIT_REMEMBERED_SET, INLINE_SMI_CHECK);
|
| } else {
|
| __ mov(r3, Operand(Smi::FromInt(i)));
|
| - StoreArrayLiteralElementStub stub;
|
| + StoreArrayLiteralElementStub stub(isolate());
|
| __ CallStub(&stub);
|
| }
|
|
|
| @@ -2120,7 +2124,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| CallIC(ic, TypeFeedbackId::None());
|
| __ mov(r1, r0);
|
| __ str(r1, MemOperand(sp, 2 * kPointerSize));
|
| - CallFunctionStub stub(1, CALL_AS_METHOD);
|
| + CallFunctionStub stub(isolate(), 1, CALL_AS_METHOD);
|
| __ CallStub(&stub);
|
|
|
| __ ldr(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
|
| @@ -2349,7 +2353,7 @@ void FullCodeGenerator::EmitInlineSmiBinaryOp(BinaryOperation* expr,
|
| patch_site.EmitJumpIfSmi(scratch1, &smi_case);
|
|
|
| __ bind(&stub_call);
|
| - BinaryOpICStub stub(op, mode);
|
| + BinaryOpICStub stub(isolate(), op, mode);
|
| CallIC(stub.GetCode(isolate()), expr->BinaryOperationFeedbackId());
|
| patch_site.EmitPatchInfo();
|
| __ jmp(&done);
|
| @@ -2425,7 +2429,7 @@ void FullCodeGenerator::EmitBinaryOp(BinaryOperation* expr,
|
| Token::Value op,
|
| OverwriteMode mode) {
|
| __ pop(r1);
|
| - BinaryOpICStub stub(op, mode);
|
| + BinaryOpICStub stub(isolate(), op, mode);
|
| JumpPatchSite patch_site(masm_); // unbound, signals no inlined smi code.
|
| CallIC(stub.GetCode(isolate()), expr->BinaryOperationFeedbackId());
|
| patch_site.EmitPatchInfo();
|
| @@ -2672,7 +2676,7 @@ void FullCodeGenerator::EmitCallWithIC(Call* expr) {
|
|
|
| // Record source position for debugger.
|
| SetSourcePosition(expr->position());
|
| - CallFunctionStub stub(arg_count, flags);
|
| + CallFunctionStub stub(isolate(), arg_count, flags);
|
| __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize));
|
| __ CallStub(&stub);
|
|
|
| @@ -2714,7 +2718,7 @@ void FullCodeGenerator::EmitKeyedCallWithIC(Call* expr,
|
|
|
| // Record source position for debugger.
|
| SetSourcePosition(expr->position());
|
| - CallFunctionStub stub(arg_count, CALL_AS_METHOD);
|
| + CallFunctionStub stub(isolate(), arg_count, CALL_AS_METHOD);
|
| __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize));
|
| __ CallStub(&stub);
|
|
|
| @@ -2745,7 +2749,7 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr) {
|
| __ mov(r3, Operand(Smi::FromInt(expr->CallFeedbackSlot())));
|
|
|
| // Record call targets in unoptimized code.
|
| - CallFunctionStub stub(arg_count, RECORD_CALL_TARGET);
|
| + CallFunctionStub stub(isolate(), arg_count, RECORD_CALL_TARGET);
|
| __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize));
|
| __ CallStub(&stub);
|
| RecordJSReturnSite(expr);
|
| @@ -2822,7 +2826,7 @@ void FullCodeGenerator::VisitCall(Call* expr) {
|
|
|
| // Record source position for debugger.
|
| SetSourcePosition(expr->position());
|
| - CallFunctionStub stub(arg_count, NO_CALL_FUNCTION_FLAGS);
|
| + CallFunctionStub stub(isolate(), arg_count, NO_CALL_FUNCTION_FLAGS);
|
| __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize));
|
| __ CallStub(&stub);
|
| RecordJSReturnSite(expr);
|
| @@ -2940,7 +2944,7 @@ void FullCodeGenerator::VisitCallNew(CallNew* expr) {
|
| __ Move(r2, FeedbackVector());
|
| __ mov(r3, Operand(Smi::FromInt(expr->CallNewFeedbackSlot())));
|
|
|
| - CallConstructStub stub(RECORD_CALL_TARGET);
|
| + CallConstructStub stub(isolate(), RECORD_CALL_TARGET);
|
| __ Call(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL);
|
| PrepareForBailoutForId(expr->ReturnId(), TOS_REG);
|
| context()->Plug(r0);
|
| @@ -3311,7 +3315,7 @@ void FullCodeGenerator::EmitArguments(CallRuntime* expr) {
|
| VisitForAccumulatorValue(args->at(0));
|
| __ mov(r1, r0);
|
| __ mov(r0, Operand(Smi::FromInt(info_->scope()->num_parameters())));
|
| - ArgumentsAccessStub stub(ArgumentsAccessStub::READ_ELEMENT);
|
| + ArgumentsAccessStub stub(isolate(), ArgumentsAccessStub::READ_ELEMENT);
|
| __ CallStub(&stub);
|
| context()->Plug(r0);
|
| }
|
| @@ -3421,7 +3425,7 @@ void FullCodeGenerator::EmitLog(CallRuntime* expr) {
|
|
|
| void FullCodeGenerator::EmitSubString(CallRuntime* expr) {
|
| // Load the arguments on the stack and call the stub.
|
| - SubStringStub stub;
|
| + SubStringStub stub(isolate());
|
| ZoneList<Expression*>* args = expr->arguments();
|
| ASSERT(args->length() == 3);
|
| VisitForStackValue(args->at(0));
|
| @@ -3434,7 +3438,7 @@ void FullCodeGenerator::EmitSubString(CallRuntime* expr) {
|
|
|
| void FullCodeGenerator::EmitRegExpExec(CallRuntime* expr) {
|
| // Load the arguments on the stack and call the stub.
|
| - RegExpExecStub stub;
|
| + RegExpExecStub stub(isolate());
|
| ZoneList<Expression*>* args = expr->arguments();
|
| ASSERT(args->length() == 4);
|
| VisitForStackValue(args->at(0));
|
| @@ -3584,7 +3588,7 @@ void FullCodeGenerator::EmitMathPow(CallRuntime* expr) {
|
| ASSERT(args->length() == 2);
|
| VisitForStackValue(args->at(0));
|
| VisitForStackValue(args->at(1));
|
| - MathPowStub stub(MathPowStub::ON_STACK);
|
| + MathPowStub stub(isolate(), MathPowStub::ON_STACK);
|
| __ CallStub(&stub);
|
| context()->Plug(r0);
|
| }
|
| @@ -3624,7 +3628,7 @@ void FullCodeGenerator::EmitNumberToString(CallRuntime* expr) {
|
| // Load the argument into r0 and call the stub.
|
| VisitForAccumulatorValue(args->at(0));
|
|
|
| - NumberToStringStub stub;
|
| + NumberToStringStub stub(isolate());
|
| __ CallStub(&stub);
|
| context()->Plug(r0);
|
| }
|
| @@ -3747,7 +3751,7 @@ void FullCodeGenerator::EmitStringAdd(CallRuntime* expr) {
|
| VisitForAccumulatorValue(args->at(1));
|
|
|
| __ pop(r1);
|
| - StringAddStub stub(STRING_ADD_CHECK_BOTH, NOT_TENURED);
|
| + StringAddStub stub(isolate(), STRING_ADD_CHECK_BOTH, NOT_TENURED);
|
| __ CallStub(&stub);
|
| context()->Plug(r0);
|
| }
|
| @@ -3759,7 +3763,7 @@ void FullCodeGenerator::EmitStringCompare(CallRuntime* expr) {
|
| VisitForStackValue(args->at(0));
|
| VisitForStackValue(args->at(1));
|
|
|
| - StringCompareStub stub;
|
| + StringCompareStub stub(isolate());
|
| __ CallStub(&stub);
|
| context()->Plug(r0);
|
| }
|
| @@ -3798,7 +3802,7 @@ void FullCodeGenerator::EmitCallFunction(CallRuntime* expr) {
|
|
|
|
|
| void FullCodeGenerator::EmitRegExpConstructResult(CallRuntime* expr) {
|
| - RegExpConstructResultStub stub;
|
| + RegExpConstructResultStub stub(isolate());
|
| ZoneList<Expression*>* args = expr->arguments();
|
| ASSERT(args->length() == 3);
|
| VisitForStackValue(args->at(0));
|
| @@ -4164,7 +4168,7 @@ void FullCodeGenerator::VisitCallRuntime(CallRuntime* expr) {
|
|
|
| // Record source position of the IC call.
|
| SetSourcePosition(expr->position());
|
| - CallFunctionStub stub(arg_count, NO_CALL_FUNCTION_FLAGS);
|
| + CallFunctionStub stub(isolate(), arg_count, NO_CALL_FUNCTION_FLAGS);
|
| __ ldr(r1, MemOperand(sp, (arg_count + 1) * kPointerSize));
|
| __ CallStub(&stub);
|
|
|
| @@ -4382,7 +4386,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| __ jmp(&stub_call);
|
| __ bind(&slow);
|
| }
|
| - ToNumberStub convert_stub;
|
| + ToNumberStub convert_stub(isolate());
|
| __ CallStub(&convert_stub);
|
|
|
| // Save result for postfix expressions.
|
| @@ -4413,7 +4417,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) {
|
| // Record position before stub call.
|
| SetSourcePosition(expr->position());
|
|
|
| - BinaryOpICStub stub(Token::ADD, NO_OVERWRITE);
|
| + BinaryOpICStub stub(isolate(), Token::ADD, NO_OVERWRITE);
|
| CallIC(stub.GetCode(isolate()), expr->CountBinOpFeedbackId());
|
| patch_site.EmitPatchInfo();
|
| __ bind(&done);
|
| @@ -4623,7 +4627,7 @@ void FullCodeGenerator::VisitCompareOperation(CompareOperation* expr) {
|
|
|
| case Token::INSTANCEOF: {
|
| VisitForStackValue(expr->right());
|
| - InstanceofStub stub(InstanceofStub::kNoFlags);
|
| + InstanceofStub stub(isolate(), InstanceofStub::kNoFlags);
|
| __ CallStub(&stub);
|
| PrepareForBailoutBeforeSplit(expr, true, if_true, if_false);
|
| // The stub returns 0 for true.
|
|
|