diff --git a/src/interpreter/interpreter-assembler.cc b/src/interpreter/interpreter-assembler.cc index d42863108e..8d68c32aa6 100644 --- a/src/interpreter/interpreter-assembler.cc +++ b/src/interpreter/interpreter-assembler.cc @@ -157,8 +157,7 @@ TNode InterpreterAssembler::GetAccumulator() { return TaggedPoisonOnSpeculation(GetAccumulatorUnchecked()); } -// TODO(v8:6949): Remove sloppy-ness from SetAccumulator's value argument. -void InterpreterAssembler::SetAccumulator(SloppyTNode value) { +void InterpreterAssembler::SetAccumulator(TNode value) { DCHECK(Bytecodes::WritesAccumulator(bytecode_)); accumulator_use_ = accumulator_use_ | AccumulatorUse::kWrite; accumulator_ = value; diff --git a/src/interpreter/interpreter-assembler.h b/src/interpreter/interpreter-assembler.h index 4a1882b82c..006b247794 100644 --- a/src/interpreter/interpreter-assembler.h +++ b/src/interpreter/interpreter-assembler.h @@ -67,7 +67,7 @@ class V8_EXPORT_PRIVATE InterpreterAssembler : public CodeStubAssembler { TNode BytecodeOperandIntrinsicId(int operand_index); // Accumulator. TNode GetAccumulator(); - void SetAccumulator(SloppyTNode value); + void SetAccumulator(TNode value); // Context. TNode GetContext(); diff --git a/src/interpreter/interpreter-generator.cc b/src/interpreter/interpreter-generator.cc index 6d686a7db7..cee850c5ba 100644 --- a/src/interpreter/interpreter-generator.cc +++ b/src/interpreter/interpreter-generator.cc @@ -1692,7 +1692,7 @@ IGNITION_HANDLER(CallRuntime, InterpreterAssembler) { TNode function_id = BytecodeOperandRuntimeId(0); RegListNodePair args = GetRegisterListAtOperandIndex(1); TNode context = GetContext(); - Node* result = CallRuntimeN(function_id, context, args); + TNode result = CAST(CallRuntimeN(function_id, context, args)); SetAccumulator(result); Dispatch(); } diff --git a/test/unittests/interpreter/interpreter-assembler-unittest.cc b/test/unittests/interpreter/interpreter-assembler-unittest.cc index de98f1fd07..ebc6790a40 100644 --- a/test/unittests/interpreter/interpreter-assembler-unittest.cc +++ b/test/unittests/interpreter/interpreter-assembler-unittest.cc @@ -46,7 +46,7 @@ InterpreterAssemblerTest::InterpreterAssemblerForTest:: GetAccumulator(); } if (Bytecodes::WritesAccumulator(bytecode())) { - SetAccumulator(nullptr); + SetAccumulator(NullConstant()); } }