Commit c39caa9
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 <tebbi@chromium.org>
Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48445}
Refs: v8/v8@0f1dfae
PR-URL: #15362
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>1 parent 33f5014 commit c39caa9
3 files changed
Lines changed: 11 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | 28 | # Reset this number to 0 on major V8 upgrades. | |
| 29 | 29 | # Increment by one for each non-official patch applied to deps/v8. | |
| 30 | - 'v8_embedder_string': '-node.2', | ||
| 30 | + 'v8_embedder_string': '-node.3', | ||
| 31 | 31 | ||
| 32 | 32 | # Enable disassembler for `--print-code` v8 options | |
| 33 | 33 | 'v8_enable_disassembler': 1, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1255,7 +1255,7 @@ bool IsRestOf(Operator const* op) { | |||
| 1255 | 1255 | return OpParameter<bool>(op); | |
| 1256 | 1256 | } | |
| 1257 | 1257 | ||
| 1258 | - const Operator* CommonOperatorBuilder::ObjectState(int object_id, | ||
| 1258 | + const Operator* CommonOperatorBuilder::ObjectState(uint32_t object_id, | ||
| 1259 | 1259 | int pointer_slots) { | |
| 1260 | 1260 | return new (zone()) Operator1<ObjectStateInfo>( // -- | |
| 1261 | 1261 | IrOpcode::kObjectState, Operator::kPure, // opcode | |
@@ -1265,7 +1265,7 @@ const Operator* CommonOperatorBuilder::ObjectState(int object_id, | |||
| 1265 | 1265 | } | |
| 1266 | 1266 | ||
| 1267 | 1267 | const Operator* CommonOperatorBuilder::TypedObjectState( | |
| 1268 | - int object_id, const ZoneVector<MachineType>* types) { | ||
| 1268 | + uint32_t object_id, const ZoneVector<MachineType>* types) { | ||
| 1269 | 1269 | return new (zone()) Operator1<TypedObjectStateInfo>( // -- | |
| 1270 | 1270 | IrOpcode::kTypedObjectState, Operator::kPure, // opcode | |
| 1271 | 1271 | "TypedObjectState", // name | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -125,7 +125,8 @@ V8_EXPORT_PRIVATE int ParameterIndexOf(const Operator* const); | |||
| 125 | 125 | const ParameterInfo& ParameterInfoOf(const Operator* const); | |
| 126 | 126 | ||
| 127 | 127 | 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) {} | ||
| 129 | 130 | uint32_t object_id() const { return first; } | |
| 130 | 131 | int size() const { return second; } | |
| 131 | 132 | }; | |
@@ -134,7 +135,10 @@ size_t hash_value(ObjectStateInfo const& p); | |||
| 134 | 135 | ||
| 135 | 136 | struct TypedObjectStateInfo final | |
| 136 | 137 | : 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) {} | ||
| 138 | 142 | uint32_t object_id() const { return first; } | |
| 139 | 143 | const ZoneVector<MachineType>* machine_types() const { return second; } | |
| 140 | 144 | }; | |
@@ -385,8 +389,8 @@ class V8_EXPORT_PRIVATE CommonOperatorBuilder final | |||
| 385 | 389 | SparseInputMask bitmask); | |
| 386 | 390 | const Operator* ArgumentsElementsState(bool is_rest); | |
| 387 | 391 | 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, | ||
| 390 | 394 | const ZoneVector<MachineType>* types); | |
| 391 | 395 | const Operator* FrameState(BailoutId bailout_id, | |
| 392 | 396 | OutputFrameStateCombine state_combine, | |
0 commit comments