Index: src/x64/ic-x64.cc |
diff --git a/src/x64/ic-x64.cc b/src/x64/ic-x64.cc |
index 4837b9aa9a8831c7dd9ef115baf49dde61f6a2f6..6e238c76ecebaf7e5800e54153d57b4587dbd434 100644 |
--- a/src/x64/ic-x64.cc |
+++ b/src/x64/ic-x64.cc |
@@ -570,10 +570,10 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) { |
__ j(not_zero, &slow); |
// Everything is fine, call runtime. |
- __ PopReturnAddressTo(rcx); |
+ __ pop(rcx); |
__ push(rdx); // receiver |
__ push(rax); // key |
- __ PushReturnAddressFrom(rcx); |
+ __ push(rcx); // return address |
// Perform tail call to the entry. |
__ TailCallExternalReference( |
@@ -1369,10 +1369,10 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) { |
Counters* counters = masm->isolate()->counters(); |
__ IncrementCounter(counters->load_miss(), 1); |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rax); // receiver |
__ push(rcx); // name |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Perform tail call to the entry. |
ExternalReference ref = |
@@ -1388,10 +1388,10 @@ void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rax); // receiver |
__ push(rcx); // name |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Perform tail call to the entry. |
__ TailCallRuntime(Runtime::kGetProperty, 2, 1); |
@@ -1408,10 +1408,10 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm, ICMissMode miss_mode) { |
Counters* counters = masm->isolate()->counters(); |
__ IncrementCounter(counters->keyed_load_miss(), 1); |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rax); // name |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Perform tail call to the entry. |
ExternalReference ref = miss_mode == MISS_FORCE_GENERIC |
@@ -1429,10 +1429,10 @@ void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rax); // name |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Perform tail call to the entry. |
__ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1); |
@@ -1468,11 +1468,11 @@ void StoreIC::GenerateMiss(MacroAssembler* masm) { |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rcx); // name |
__ push(rax); // value |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Perform tail call to the entry. |
ExternalReference ref = |
@@ -1512,13 +1512,13 @@ void StoreIC::GenerateRuntimeSetProperty(MacroAssembler* masm, |
// -- rdx : receiver |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); |
__ push(rcx); |
__ push(rax); |
__ Push(Smi::FromInt(NONE)); // PropertyAttributes |
__ Push(Smi::FromInt(strict_mode)); |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Do tail-call to runtime routine. |
__ TailCallRuntime(Runtime::kSetProperty, 5, 1); |
@@ -1534,13 +1534,13 @@ void KeyedStoreIC::GenerateRuntimeSetProperty(MacroAssembler* masm, |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rcx); // key |
__ push(rax); // value |
__ Push(Smi::FromInt(NONE)); // PropertyAttributes |
__ Push(Smi::FromInt(strict_mode)); // Strict mode. |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Do tail-call to runtime routine. |
__ TailCallRuntime(Runtime::kSetProperty, 5, 1); |
@@ -1555,11 +1555,11 @@ void StoreIC::GenerateSlow(MacroAssembler* masm) { |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rcx); // key |
__ push(rax); // value |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Do tail-call to runtime routine. |
ExternalReference ref(IC_Utility(kStoreIC_Slow), masm->isolate()); |
@@ -1575,11 +1575,11 @@ void KeyedStoreIC::GenerateSlow(MacroAssembler* masm) { |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rcx); // key |
__ push(rax); // value |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Do tail-call to runtime routine. |
ExternalReference ref(IC_Utility(kKeyedStoreIC_Slow), masm->isolate()); |
@@ -1595,11 +1595,11 @@ void KeyedStoreIC::GenerateMiss(MacroAssembler* masm, ICMissMode miss_mode) { |
// -- rsp[0] : return address |
// ----------------------------------- |
- __ PopReturnAddressTo(rbx); |
+ __ pop(rbx); |
__ push(rdx); // receiver |
__ push(rcx); // key |
__ push(rax); // value |
- __ PushReturnAddressFrom(rbx); |
+ __ push(rbx); // return address |
// Do tail-call to runtime routine. |
ExternalReference ref = miss_mode == MISS_FORCE_GENERIC |