| Index: src/ic/x87/stub-cache-x87.cc
|
| diff --git a/src/ic/x87/stub-cache-x87.cc b/src/ic/x87/stub-cache-x87.cc
|
| index 0d16d84322d04b281d553dfc2d92deb4d493c8d0..d76d0a26b74655ea92183cfd0d931c41ef031842 100644
|
| --- a/src/ic/x87/stub-cache-x87.cc
|
| +++ b/src/ic/x87/stub-cache-x87.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 name, Register receiver,
|
| // Number of the cache entry pointer-size scaled.
|
| Register offset, Register extra) {
|
| @@ -63,8 +63,6 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
|
| __ pop(LoadDescriptor::SlotRegister());
|
| }
|
|
|
| - if (leave_frame) __ leave();
|
| -
|
| // Jump to the first instruction in the code stub.
|
| __ add(extra, Immediate(Code::kHeaderSize - kHeapObjectTag));
|
| __ jmp(extra);
|
| @@ -118,8 +116,6 @@ static void ProbeTable(Isolate* isolate, MacroAssembler* masm,
|
| __ pop(slot);
|
| }
|
|
|
| - if (leave_frame) __ leave();
|
| -
|
| // Jump to the first instruction in the code stub.
|
| __ add(offset, Immediate(Code::kHeaderSize - kHeapObjectTag));
|
| __ jmp(offset);
|
| @@ -132,10 +128,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) {
|
| Label miss;
|
|
|
| // Assert that code is valid. The multiplying code relies on the entry size
|
| @@ -178,8 +173,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
|
| DCHECK(kCacheIndexShift == kPointerSizeLog2);
|
|
|
| // Probe the primary table.
|
| - ProbeTable(isolate(), masm, ic_kind, flags, leave_frame, kPrimary, name,
|
| - receiver, offset, extra);
|
| + ProbeTable(isolate(), masm, ic_kind, flags, kPrimary, name, receiver, offset,
|
| + extra);
|
|
|
| // Primary miss: Compute hash for secondary probe.
|
| __ mov(offset, FieldOperand(name, Name::kHashFieldOffset));
|
| @@ -191,8 +186,8 @@ void StubCache::GenerateProbe(MacroAssembler* masm, Code::Kind ic_kind,
|
| __ and_(offset, (kSecondaryTableSize - 1) << kCacheIndexShift);
|
|
|
| // Probe the secondary table.
|
| - ProbeTable(isolate(), masm, ic_kind, flags, leave_frame, kSecondary, name,
|
| - receiver, offset, extra);
|
| + ProbeTable(isolate(), masm, ic_kind, flags, kSecondary, name, receiver,
|
| + offset, extra);
|
|
|
| // Cache miss: Fall-through and let caller handle the miss by
|
| // entering the runtime system.
|
|
|