diff --git a/common.gypi b/common.gypi index 985061da396caf..17d9e24600bd25 100644 --- a/common.gypi +++ b/common.gypi @@ -27,7 +27,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.2', + 'v8_embedder_string': '-node.3', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/compiler/common-operator.cc b/deps/v8/src/compiler/common-operator.cc index c48773920d8b87..d92722f7015f48 100644 --- a/deps/v8/src/compiler/common-operator.cc +++ b/deps/v8/src/compiler/common-operator.cc @@ -1255,7 +1255,7 @@ bool IsRestOf(Operator const* op) { return OpParameter(op); } -const Operator* CommonOperatorBuilder::ObjectState(int object_id, +const Operator* CommonOperatorBuilder::ObjectState(uint32_t object_id, int pointer_slots) { return new (zone()) Operator1( // -- IrOpcode::kObjectState, Operator::kPure, // opcode @@ -1265,7 +1265,7 @@ const Operator* CommonOperatorBuilder::ObjectState(int object_id, } const Operator* CommonOperatorBuilder::TypedObjectState( - int object_id, const ZoneVector* types) { + uint32_t object_id, const ZoneVector* types) { return new (zone()) Operator1( // -- IrOpcode::kTypedObjectState, Operator::kPure, // opcode "TypedObjectState", // name diff --git a/deps/v8/src/compiler/common-operator.h b/deps/v8/src/compiler/common-operator.h index f7638a3cca3e46..9dfb0595189973 100644 --- a/deps/v8/src/compiler/common-operator.h +++ b/deps/v8/src/compiler/common-operator.h @@ -125,7 +125,8 @@ V8_EXPORT_PRIVATE int ParameterIndexOf(const Operator* const); const ParameterInfo& ParameterInfoOf(const Operator* const); struct ObjectStateInfo final : std::pair { - using std::pair::pair; + ObjectStateInfo(uint32_t object_id, int size) + : std::pair(object_id, size) {} uint32_t object_id() const { return first; } int size() const { return second; } }; @@ -134,7 +135,10 @@ size_t hash_value(ObjectStateInfo const& p); struct TypedObjectStateInfo final : std::pair*> { - using std::pair*>::pair; + TypedObjectStateInfo(uint32_t object_id, + const ZoneVector* machine_types) + : std::pair*>(object_id, + machine_types) {} uint32_t object_id() const { return first; } const ZoneVector* machine_types() const { return second; } }; @@ -385,8 +389,8 @@ class V8_EXPORT_PRIVATE CommonOperatorBuilder final SparseInputMask bitmask); const Operator* ArgumentsElementsState(bool is_rest); const Operator* ArgumentsLengthState(bool is_rest); - const Operator* ObjectState(int object_id, int pointer_slots); - const Operator* TypedObjectState(int object_id, + const Operator* ObjectState(uint32_t object_id, int pointer_slots); + const Operator* TypedObjectState(uint32_t object_id, const ZoneVector* types); const Operator* FrameState(BailoutId bailout_id, OutputFrameStateCombine state_combine,