Skip to content

Commit c39caa9

Browse files
tebbitargos
authored andcommitted
deps: backport 0f1dfae from V8 upstream
Original commit message: avoid constructor inheritance due to compilation issues Constructor inheritance of a templated constructor is causing compilation issues for node.js: https: //github.com//pull/15362#issue-257007421 Change-Id: I7d099ff5a1a2fd5b19c11112ddef8fe824e509f7 Reviewed-on: https://chromium-review.googlesource.com/707008 Commit-Queue: Tobias Tebbi <[email protected]> Commit-Queue: Benedikt Meurer <[email protected]> Reviewed-by: Benedikt Meurer <[email protected]> Cr-Commit-Position: refs/heads/master@{#48445} Refs: v8/v8@0f1dfae PR-URL: #15362 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 33f5014 commit c39caa9

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# Reset this number to 0 on major V8 upgrades.
2929
# Increment by one for each non-official patch applied to deps/v8.
30-
'v8_embedder_string': '-node.2',
30+
'v8_embedder_string': '-node.3',
3131

3232
# Enable disassembler for `--print-code` v8 options
3333
'v8_enable_disassembler': 1,

deps/v8/src/compiler/common-operator.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ bool IsRestOf(Operator const* op) {
12551255
return OpParameter<bool>(op);
12561256
}
12571257

1258-
const Operator* CommonOperatorBuilder::ObjectState(int object_id,
1258+
const Operator* CommonOperatorBuilder::ObjectState(uint32_t object_id,
12591259
int pointer_slots) {
12601260
return new (zone()) Operator1<ObjectStateInfo>( // --
12611261
IrOpcode::kObjectState, Operator::kPure, // opcode
@@ -1265,7 +1265,7 @@ const Operator* CommonOperatorBuilder::ObjectState(int object_id,
12651265
}
12661266

12671267
const Operator* CommonOperatorBuilder::TypedObjectState(
1268-
int object_id, const ZoneVector<MachineType>* types) {
1268+
uint32_t object_id, const ZoneVector<MachineType>* types) {
12691269
return new (zone()) Operator1<TypedObjectStateInfo>( // --
12701270
IrOpcode::kTypedObjectState, Operator::kPure, // opcode
12711271
"TypedObjectState", // name

deps/v8/src/compiler/common-operator.h

+8-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ V8_EXPORT_PRIVATE int ParameterIndexOf(const Operator* const);
125125
const ParameterInfo& ParameterInfoOf(const Operator* const);
126126

127127
struct ObjectStateInfo final : std::pair<uint32_t, int> {
128-
using std::pair<uint32_t, int>::pair;
128+
ObjectStateInfo(uint32_t object_id, int size)
129+
: std::pair<uint32_t, int>(object_id, size) {}
129130
uint32_t object_id() const { return first; }
130131
int size() const { return second; }
131132
};
@@ -134,7 +135,10 @@ size_t hash_value(ObjectStateInfo const& p);
134135

135136
struct TypedObjectStateInfo final
136137
: std::pair<uint32_t, const ZoneVector<MachineType>*> {
137-
using std::pair<uint32_t, const ZoneVector<MachineType>*>::pair;
138+
TypedObjectStateInfo(uint32_t object_id,
139+
const ZoneVector<MachineType>* machine_types)
140+
: std::pair<uint32_t, const ZoneVector<MachineType>*>(object_id,
141+
machine_types) {}
138142
uint32_t object_id() const { return first; }
139143
const ZoneVector<MachineType>* machine_types() const { return second; }
140144
};
@@ -385,8 +389,8 @@ class V8_EXPORT_PRIVATE CommonOperatorBuilder final
385389
SparseInputMask bitmask);
386390
const Operator* ArgumentsElementsState(bool is_rest);
387391
const Operator* ArgumentsLengthState(bool is_rest);
388-
const Operator* ObjectState(int object_id, int pointer_slots);
389-
const Operator* TypedObjectState(int object_id,
392+
const Operator* ObjectState(uint32_t object_id, int pointer_slots);
393+
const Operator* TypedObjectState(uint32_t object_id,
390394
const ZoneVector<MachineType>* types);
391395
const Operator* FrameState(BailoutId bailout_id,
392396
OutputFrameStateCombine state_combine,

0 commit comments

Comments
 (0)