| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index ac46fe8c12e8f5c668827cb7caa1bce5ed8aa56c..5ac17a00f85d5fc73c3e5871ce2e6f47e7f05988 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -4838,7 +4838,7 @@ void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) {
|
| // remembered set.
|
| CheckNeedsToInformIncrementalMarker(
|
| masm, kUpdateRememberedSetOnNoNeedToInformIncrementalMarker, mode);
|
| - InformIncrementalMarker(masm, mode);
|
| + InformIncrementalMarker(masm);
|
| regs_.Restore(masm);
|
| __ RememberedSetHelper(object_,
|
| address_,
|
| @@ -4851,13 +4851,13 @@ void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) {
|
|
|
| CheckNeedsToInformIncrementalMarker(
|
| masm, kReturnOnNoNeedToInformIncrementalMarker, mode);
|
| - InformIncrementalMarker(masm, mode);
|
| + InformIncrementalMarker(masm);
|
| regs_.Restore(masm);
|
| __ Ret();
|
| }
|
|
|
|
|
| -void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm, Mode mode) {
|
| +void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm) {
|
| regs_.SaveCallerSaveRegisters(masm, save_fp_regs_mode_);
|
| int argument_count = 3;
|
| __ PrepareCallCFunction(argument_count, regs_.scratch0());
|
| @@ -4871,18 +4871,10 @@ void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm, Mode mode) {
|
| __ mov(r2, Operand(ExternalReference::isolate_address(masm->isolate())));
|
|
|
| AllowExternalCallThatCantCauseGC scope(masm);
|
| - if (mode == INCREMENTAL_COMPACTION) {
|
| - __ CallCFunction(
|
| - ExternalReference::incremental_evacuation_record_write_function(
|
| - masm->isolate()),
|
| - argument_count);
|
| - } else {
|
| - ASSERT(mode == INCREMENTAL);
|
| - __ CallCFunction(
|
| - ExternalReference::incremental_marking_record_write_function(
|
| - masm->isolate()),
|
| - argument_count);
|
| - }
|
| + __ CallCFunction(
|
| + ExternalReference::incremental_marking_record_write_function(
|
| + masm->isolate()),
|
| + argument_count);
|
| regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode_);
|
| }
|
|
|
|
|