| Index: src/compiler/arm64/instruction-selector-arm64.cc
|
| diff --git a/src/compiler/arm64/instruction-selector-arm64.cc b/src/compiler/arm64/instruction-selector-arm64.cc
|
| index 3cb823b164cc8218913fc049211437970bf49e69..7346bd716a9ba021b8b2063c5dac720403b5b205 100644
|
| --- a/src/compiler/arm64/instruction-selector-arm64.cc
|
| +++ b/src/compiler/arm64/instruction-selector-arm64.cc
|
| @@ -393,19 +393,9 @@ void InstructionSelector::VisitStore(Node* node) {
|
| Node* value = node->InputAt(2);
|
|
|
| StoreRepresentation store_rep = OpParameter<StoreRepresentation>(node);
|
| + WriteBarrierKind write_barrier_kind = store_rep.write_barrier_kind();
|
| MachineType rep = RepresentationOf(store_rep.machine_type());
|
| - if (store_rep.write_barrier_kind() == kFullWriteBarrier) {
|
| - DCHECK(rep == kRepTagged);
|
| - // TODO(dcarney): refactor RecordWrite function to take temp registers
|
| - // and pass them here instead of using fixed regs
|
| - // TODO(dcarney): handle immediate indices.
|
| - InstructionOperand temps[] = {g.TempRegister(x11), g.TempRegister(x12)};
|
| - Emit(kArm64StoreWriteBarrier, g.NoOutput(), g.UseFixed(base, x10),
|
| - g.UseFixed(index, x11), g.UseFixed(value, x12), arraysize(temps),
|
| - temps);
|
| - return;
|
| - }
|
| - DCHECK_EQ(kNoWriteBarrier, store_rep.write_barrier_kind());
|
| +
|
| ArchOpcode opcode;
|
| ImmediateMode immediate_mode = kNoImmediate;
|
| switch (rep) {
|
| @@ -446,6 +436,37 @@ void InstructionSelector::VisitStore(Node* node) {
|
| Emit(opcode | AddressingModeField::encode(kMode_MRR), g.NoOutput(),
|
| g.UseRegister(base), g.UseRegister(index), g.UseRegister(value));
|
| }
|
| +
|
| + // TODO(arm64): I guess this could be done in a better way.
|
| + if (write_barrier_kind != kNoWriteBarrier) {
|
| + DCHECK_EQ(kRepTagged, rep);
|
| + InstructionOperand inputs[3];
|
| + size_t input_count = 0;
|
| + inputs[input_count++] = g.UseUniqueRegister(base);
|
| + inputs[input_count++] = g.UseUniqueRegister(index);
|
| + RecordWriteMode record_write_mode;
|
| + switch (write_barrier_kind) {
|
| + case kNoWriteBarrier:
|
| + UNREACHABLE();
|
| + break;
|
| + case kMapWriteBarrier:
|
| + record_write_mode = RecordWriteMode::kValueIsMap;
|
| + break;
|
| + case kPointerWriteBarrier:
|
| + inputs[input_count++] = g.UseUniqueRegister(value);
|
| + record_write_mode = RecordWriteMode::kValueIsPointer;
|
| + break;
|
| + case kFullWriteBarrier:
|
| + inputs[input_count++] = g.UseUniqueRegister(value);
|
| + record_write_mode = RecordWriteMode::kValueIsAny;
|
| + break;
|
| + }
|
| + InstructionOperand temps[] = {g.TempRegister(), g.TempRegister()};
|
| + size_t const temp_count = arraysize(temps);
|
| + InstructionCode code = kArchRecordWrite;
|
| + code |= MiscField::encode(static_cast<int>(record_write_mode));
|
| + Emit(code, 0, nullptr, input_count, inputs, temp_count, temps);
|
| + }
|
| }
|
|
|
|
|
|
|