| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 7c5ae268517e573aef5f28bf2e494bab1a0599df..f5fdc5d8d49f7bdf4e4aba93912e566c49225be1 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -4038,23 +4038,23 @@ bool CEntryStub::IsPregenerated() {
|
| }
|
|
|
|
|
| -void CodeStub::GenerateStubsAheadOfTime() {
|
| - CEntryStub::GenerateAheadOfTime();
|
| - StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime();
|
| +void CodeStub::GenerateStubsAheadOfTime(Isolate* isolate) {
|
| + CEntryStub::GenerateAheadOfTime(isolate);
|
| + StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime(isolate);
|
| // It is important that the store buffer overflow stubs are generated first.
|
| - RecordWriteStub::GenerateFixedRegStubsAheadOfTime();
|
| + RecordWriteStub::GenerateFixedRegStubsAheadOfTime(isolate);
|
| }
|
|
|
|
|
| -void CodeStub::GenerateFPStubs() {
|
| +void CodeStub::GenerateFPStubs(Isolate* isolate) {
|
| }
|
|
|
|
|
| -void CEntryStub::GenerateAheadOfTime() {
|
| +void CEntryStub::GenerateAheadOfTime(Isolate* isolate) {
|
| CEntryStub stub(1, kDontSaveFPRegs);
|
| - stub.GetCode()->set_is_pregenerated(true);
|
| + stub.GetCode(isolate)->set_is_pregenerated(true);
|
| CEntryStub save_doubles(1, kSaveFPRegs);
|
| - save_doubles.GetCode()->set_is_pregenerated(true);
|
| + save_doubles.GetCode(isolate)->set_is_pregenerated(true);
|
| }
|
|
|
|
|
| @@ -5808,7 +5808,7 @@ void ICCompareStub::GenerateHeapNumbers(MacroAssembler* masm) {
|
| __ bind(&generic_stub);
|
| ICCompareStub stub(op_, CompareIC::GENERIC, CompareIC::GENERIC,
|
| CompareIC::GENERIC);
|
| - __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| + __ jmp(stub.GetCode(masm->isolate()), RelocInfo::CODE_TARGET);
|
|
|
| __ bind(&maybe_undefined1);
|
| if (Token::IsOrderedRelationalCompareOp(op_)) {
|
| @@ -6299,15 +6299,16 @@ bool RecordWriteStub::IsPregenerated() {
|
| }
|
|
|
|
|
| -void StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime() {
|
| +void StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime(
|
| + Isolate* isolate) {
|
| StoreBufferOverflowStub stub1(kDontSaveFPRegs);
|
| - stub1.GetCode()->set_is_pregenerated(true);
|
| + stub1.GetCode(isolate)->set_is_pregenerated(true);
|
| StoreBufferOverflowStub stub2(kSaveFPRegs);
|
| - stub2.GetCode()->set_is_pregenerated(true);
|
| + stub2.GetCode(isolate)->set_is_pregenerated(true);
|
| }
|
|
|
|
|
| -void RecordWriteStub::GenerateFixedRegStubsAheadOfTime() {
|
| +void RecordWriteStub::GenerateFixedRegStubsAheadOfTime(Isolate* isolate) {
|
| for (AheadOfTimeWriteBarrierStubList* entry = kAheadOfTime;
|
| !entry->object.is(no_reg);
|
| entry++) {
|
| @@ -6316,7 +6317,7 @@ void RecordWriteStub::GenerateFixedRegStubsAheadOfTime() {
|
| entry->address,
|
| entry->action,
|
| kDontSaveFPRegs);
|
| - stub.GetCode()->set_is_pregenerated(true);
|
| + stub.GetCode(isolate)->set_is_pregenerated(true);
|
| }
|
| }
|
|
|
| @@ -6615,7 +6616,7 @@ void StoreArrayLiteralElementStub::Generate(MacroAssembler* masm) {
|
| void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
|
| ASSERT(!Serializer::enabled());
|
| CEntryStub ces(1, kSaveFPRegs);
|
| - __ Call(ces.GetCode(), RelocInfo::CODE_TARGET);
|
| + __ Call(ces.GetCode(masm->isolate()), RelocInfo::CODE_TARGET);
|
| int parameter_count_offset =
|
| StubFailureTrampolineFrame::kCallerStackParameterCountFrameOffset;
|
| __ movq(rbx, MemOperand(rbp, parameter_count_offset));
|
|
|