| Index: src/ic/x64/stub-cache-x64.cc
|
| diff --git a/src/ic/x64/stub-cache-x64.cc b/src/ic/x64/stub-cache-x64.cc
|
| index 8e7bbcb9b3eb3c1908f74667f38dec627a61c898..39080189276c72f848a1ca2ed6db179cebaef7ba 100644
|
| --- a/src/ic/x64/stub-cache-x64.cc
|
| +++ b/src/ic/x64/stub-cache-x64.cc
|
| @@ -16,7 +16,7 @@ namespace internal {
|
|
|
|
|
| static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
|
| - Code::Kind ic_kind, Code::Flags flags, bool leave_frame,
|
| + Code::Kind ic_kind, Code::Flags flags,
|
| StubCache::Table table, Register receiver, Register name,
|
| // The offset is scaled by 4, based on
|
| // kCacheIndexShift, which is two bits
|
| @@ -72,8 +72,6 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
|
| }
|
| #endif
|
|
|
| - if (leave_frame) __ leave();
|
| -
|
| // Jump to the first instruction in the code stub.
|
| __ addp(kScratchRegister, Immediate(Code::kHeaderSize - kHeapObjectTag));
|
| __ jmp(kScratchRegister);
|
| @@ -83,10 +81,9 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
|
|
|
|
|
| void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
|
| - Code::Flags flags, bool leave_frame,
|
| - Register receiver, Register name,
|
| - Register scratch, Register extra, Register extra2,
|
| - Register extra3) {
|
| + Code::Flags flags, Register receiver,
|
| + Register name, Register scratch, Register extra,
|
| + Register extra2, Register extra3) {
|
| Isolate* isolate = masm->isolate();
|
| Label miss;
|
| USE(extra); // The register extra is not used on the X64 platform.
|
| @@ -135,8 +132,7 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
|
| __ andp(scratch, Immediate((kPrimaryTableSize - 1) << kCacheIndexShift));
|
|
|
| // Probe the primary table.
|
| - ProbeTable(isolate, masm, ic_kind, flags, leave_frame, kPrimary, receiver,
|
| - name, scratch);
|
| + ProbeTable(isolate, masm, ic_kind, flags, kPrimary, receiver, name, scratch);
|
|
|
| // Primary miss: Compute hash for secondary probe.
|
| __ movl(scratch, FieldOperand(name, Name::kHashFieldOffset));
|
| @@ -148,8 +144,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
|
| __ andp(scratch, Immediate((kSecondaryTableSize - 1) << kCacheIndexShift));
|
|
|
| // Probe the secondary table.
|
| - ProbeTable(isolate, masm, ic_kind, flags, leave_frame, kSecondary, receiver,
|
| - name, scratch);
|
| + ProbeTable(isolate, masm, ic_kind, flags, kSecondary, receiver, name,
|
| + scratch);
|
|
|
| // Cache miss: Fall-through and let caller handle the miss by
|
| // entering the runtime system.
|
|
|