| Index: src/x64/code-stubs-x64.cc
|
| ===================================================================
|
| --- src/x64/code-stubs-x64.cc (revision 9343)
|
| +++ src/x64/code-stubs-x64.cc (working copy)
|
| @@ -5633,8 +5633,11 @@
|
| __ jmp(&skip_to_incremental_compacting, Label::kFar);
|
|
|
| if (remembered_set_action_ == EMIT_REMEMBERED_SET) {
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
| } else {
|
| __ ret(0);
|
| }
|
| @@ -5675,8 +5678,11 @@
|
| masm, kUpdateRememberedSetOnNoNeedToInformIncrementalMarker, mode);
|
| InformIncrementalMarker(masm, mode);
|
| regs_.Restore(masm);
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
|
|
| __ bind(&dont_need_remembered_set);
|
| }
|
| @@ -5752,8 +5758,11 @@
|
|
|
| regs_.Restore(masm);
|
| if (on_no_need == kUpdateRememberedSetOnNoNeedToInformIncrementalMarker) {
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
| } else {
|
| __ ret(0);
|
| }
|
| @@ -5794,8 +5803,11 @@
|
|
|
| regs_.Restore(masm);
|
| if (on_no_need == kUpdateRememberedSetOnNoNeedToInformIncrementalMarker) {
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
| } else {
|
| __ ret(0);
|
| }
|
|
|