diff options
Diffstat (limited to 'deps/v8/src/interpreter/interpreter.cc')
| -rw-r--r-- | deps/v8/src/interpreter/interpreter.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/deps/v8/src/interpreter/interpreter.cc b/deps/v8/src/interpreter/interpreter.cc index 11c83fa9b5..a39483f768 100644 --- a/deps/v8/src/interpreter/interpreter.cc +++ b/deps/v8/src/interpreter/interpreter.cc @@ -111,16 +111,15 @@ Builtin BuiltinIndexFromBytecode(Bytecode bytecode, } // namespace -CodeT Interpreter::GetBytecodeHandler(Bytecode bytecode, - OperandScale operand_scale) { +Code Interpreter::GetBytecodeHandler(Bytecode bytecode, + OperandScale operand_scale) { Builtin builtin = BuiltinIndexFromBytecode(bytecode, operand_scale); return isolate_->builtins()->code(builtin); } void Interpreter::SetBytecodeHandler(Bytecode bytecode, - OperandScale operand_scale, - CodeT handler) { - DCHECK(handler.is_off_heap_trampoline()); + OperandScale operand_scale, Code handler) { + DCHECK(!handler.has_instruction_stream()); DCHECK(handler.kind() == CodeKind::BYTECODE_HANDLER); size_t index = GetDispatchTableIndex(bytecode, operand_scale); dispatch_table_[index] = handler.InstructionStart(); @@ -341,16 +340,15 @@ void Interpreter::Initialize() { // Set the interpreter entry trampoline entry point now that builtins are // initialized. - Handle<CodeT> code = BUILTIN_CODE(isolate_, InterpreterEntryTrampoline); + Handle<Code> code = BUILTIN_CODE(isolate_, InterpreterEntryTrampoline); DCHECK(builtins->is_initialized()); - DCHECK(code->is_off_heap_trampoline() || - isolate_->heap()->IsImmovable(FromCodeT(*code))); + DCHECK(!code->has_instruction_stream()); interpreter_entry_trampoline_instruction_start_ = code->InstructionStart(); // Initialize the dispatch table. ForEachBytecode([=](Bytecode bytecode, OperandScale operand_scale) { Builtin builtin = BuiltinIndexFromBytecode(bytecode, operand_scale); - CodeT handler = builtins->code(builtin); + Code handler = builtins->code(builtin); if (Bytecodes::BytecodeHasHandler(bytecode, operand_scale)) { #ifdef DEBUG std::string builtin_name(Builtins::name(builtin)); |