| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index ee695e4f6d47893f9a677533ad137ba8a01b9784..11013e74ff65b9eb7b153163bb61b71415cecfe3 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -207,7 +207,7 @@ bool LCodeGen::GeneratePrologue() {
|
| Comment(";;; Allocate local context");
|
| // Argument to NewContext is the function, which is in r1.
|
| if (heap_slots <= FastNewContextStub::kMaximumSlots) {
|
| - FastNewContextStub stub(heap_slots);
|
| + FastNewContextStub stub(isolate(), heap_slots);
|
| __ CallStub(&stub);
|
| } else {
|
| __ push(r1);
|
| @@ -1106,17 +1106,17 @@ void LCodeGen::DoCallStub(LCallStub* instr) {
|
| ASSERT(ToRegister(instr->result()).is(r0));
|
| switch (instr->hydrogen()->major_key()) {
|
| case CodeStub::RegExpExec: {
|
| - RegExpExecStub stub;
|
| + RegExpExecStub stub(isolate());
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| break;
|
| }
|
| case CodeStub::SubString: {
|
| - SubStringStub stub;
|
| + SubStringStub stub(isolate());
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| break;
|
| }
|
| case CodeStub::StringCompare: {
|
| - StringCompareStub stub;
|
| + StringCompareStub stub(isolate());
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| break;
|
| }
|
| @@ -2159,7 +2159,7 @@ void LCodeGen::DoArithmeticT(LArithmeticT* instr) {
|
| ASSERT(ToRegister(instr->right()).is(r0));
|
| ASSERT(ToRegister(instr->result()).is(r0));
|
|
|
| - BinaryOpICStub stub(instr->op(), NO_OVERWRITE);
|
| + BinaryOpICStub stub(isolate(), instr->op(), NO_OVERWRITE);
|
| // Block literal pool emission to ensure nop indicating no inlined smi code
|
| // is in the correct position.
|
| Assembler::BlockConstPoolScope block_const_pool(masm());
|
| @@ -2754,7 +2754,7 @@ void LCodeGen::DoInstanceOf(LInstanceOf* instr) {
|
| ASSERT(ToRegister(instr->left()).is(r0)); // Object is in r0.
|
| ASSERT(ToRegister(instr->right()).is(r1)); // Function is in r1.
|
|
|
| - InstanceofStub stub(InstanceofStub::kArgsInRegisters);
|
| + InstanceofStub stub(isolate(), InstanceofStub::kArgsInRegisters);
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
|
|
| __ cmp(r0, Operand::Zero());
|
| @@ -2851,7 +2851,7 @@ void LCodeGen::DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr,
|
| flags | InstanceofStub::kCallSiteInlineCheck);
|
| flags = static_cast<InstanceofStub::Flags>(
|
| flags | InstanceofStub::kReturnTrueFalseObject);
|
| - InstanceofStub stub(flags);
|
| + InstanceofStub stub(isolate(), flags);
|
|
|
| PushSafepointRegistersScope scope(this, Safepoint::kWithRegisters);
|
| LoadContextFromDeferred(instr->context());
|
| @@ -3870,7 +3870,7 @@ void LCodeGen::DoPower(LPower* instr) {
|
| ASSERT(ToDoubleRegister(instr->result()).is(d2));
|
|
|
| if (exponent_type.IsSmi()) {
|
| - MathPowStub stub(MathPowStub::TAGGED);
|
| + MathPowStub stub(isolate(), MathPowStub::TAGGED);
|
| __ CallStub(&stub);
|
| } else if (exponent_type.IsTagged()) {
|
| Label no_deopt;
|
| @@ -3880,14 +3880,14 @@ void LCodeGen::DoPower(LPower* instr) {
|
| __ cmp(r6, Operand(ip));
|
| DeoptimizeIf(ne, instr->environment());
|
| __ bind(&no_deopt);
|
| - MathPowStub stub(MathPowStub::TAGGED);
|
| + MathPowStub stub(isolate(), MathPowStub::TAGGED);
|
| __ CallStub(&stub);
|
| } else if (exponent_type.IsInteger32()) {
|
| - MathPowStub stub(MathPowStub::INTEGER);
|
| + MathPowStub stub(isolate(), MathPowStub::INTEGER);
|
| __ CallStub(&stub);
|
| } else {
|
| ASSERT(exponent_type.IsDouble());
|
| - MathPowStub stub(MathPowStub::DOUBLE);
|
| + MathPowStub stub(isolate(), MathPowStub::DOUBLE);
|
| __ CallStub(&stub);
|
| }
|
| }
|
| @@ -3994,7 +3994,7 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) {
|
| ASSERT(ToRegister(instr->result()).is(r0));
|
|
|
| int arity = instr->arity();
|
| - CallFunctionStub stub(arity, instr->hydrogen()->function_flags());
|
| + CallFunctionStub stub(isolate(), arity, instr->hydrogen()->function_flags());
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| }
|
|
|
| @@ -4007,7 +4007,7 @@ void LCodeGen::DoCallNew(LCallNew* instr) {
|
| __ mov(r0, Operand(instr->arity()));
|
| // No cell in r2 for construct type feedback in optimized code
|
| __ LoadRoot(r2, Heap::kUndefinedValueRootIndex);
|
| - CallConstructStub stub(NO_CALL_FUNCTION_FLAGS);
|
| + CallConstructStub stub(isolate(), NO_CALL_FUNCTION_FLAGS);
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
| }
|
|
|
| @@ -4026,7 +4026,7 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) {
|
| : DONT_OVERRIDE;
|
|
|
| if (instr->arity() == 0) {
|
| - ArrayNoArgumentConstructorStub stub(kind, override_mode);
|
| + ArrayNoArgumentConstructorStub stub(isolate(), kind, override_mode);
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
| } else if (instr->arity() == 1) {
|
| Label done;
|
| @@ -4039,17 +4039,19 @@ void LCodeGen::DoCallNewArray(LCallNewArray* instr) {
|
| __ b(eq, &packed_case);
|
|
|
| ElementsKind holey_kind = GetHoleyElementsKind(kind);
|
| - ArraySingleArgumentConstructorStub stub(holey_kind, override_mode);
|
| + ArraySingleArgumentConstructorStub stub(isolate(),
|
| + holey_kind,
|
| + override_mode);
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
| __ jmp(&done);
|
| __ bind(&packed_case);
|
| }
|
|
|
| - ArraySingleArgumentConstructorStub stub(kind, override_mode);
|
| + ArraySingleArgumentConstructorStub stub(isolate(), kind, override_mode);
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
| __ bind(&done);
|
| } else {
|
| - ArrayNArgumentsConstructorStub stub(kind, override_mode);
|
| + ArrayNArgumentsConstructorStub stub(isolate(), kind, override_mode);
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CONSTRUCT_CALL, instr);
|
| }
|
| }
|
| @@ -4446,7 +4448,7 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
|
| this, Safepoint::kWithRegistersAndDoubles);
|
| __ Move(r1, to_map);
|
| bool is_js_array = from_map->instance_type() == JS_ARRAY_TYPE;
|
| - TransitionElementsKindStub stub(from_kind, to_kind, is_js_array);
|
| + TransitionElementsKindStub stub(isolate(), from_kind, to_kind, is_js_array);
|
| __ CallStub(&stub);
|
| RecordSafepointWithRegistersAndDoubles(
|
| instr->pointer_map(), 0, Safepoint::kLazyDeopt);
|
| @@ -4469,7 +4471,8 @@ void LCodeGen::DoStringAdd(LStringAdd* instr) {
|
| ASSERT(ToRegister(instr->context()).is(cp));
|
| ASSERT(ToRegister(instr->left()).is(r1));
|
| ASSERT(ToRegister(instr->right()).is(r0));
|
| - StringAddStub stub(instr->hydrogen()->flags(),
|
| + StringAddStub stub(isolate(),
|
| + instr->hydrogen()->flags(),
|
| instr->hydrogen()->pretenure_flag());
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
| }
|
| @@ -5447,7 +5450,8 @@ void LCodeGen::DoFunctionLiteral(LFunctionLiteral* instr) {
|
| // space for nested functions that don't need literals cloning.
|
| bool pretenure = instr->hydrogen()->pretenure();
|
| if (!pretenure && instr->hydrogen()->has_no_literals()) {
|
| - FastNewClosureStub stub(instr->hydrogen()->strict_mode(),
|
| + FastNewClosureStub stub(isolate(),
|
| + instr->hydrogen()->strict_mode(),
|
| instr->hydrogen()->is_generator());
|
| __ mov(r2, Operand(instr->hydrogen()->shared_info()));
|
| CallCode(stub.GetCode(isolate()), RelocInfo::CODE_TARGET, instr);
|
|
|