Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
02602f7
deps: update V8 to 6.2.414.46
targos Jan 15, 2018
743012e
src: update NODE_MODULE_VERSION to 59
targos Jan 15, 2018
0252467
test: fix message test after V8 upgrade
targos Aug 28, 2017
e4dc16b
src: update ustack offset identifiers
geek Aug 28, 2017
fcd5860
src: fix rename of entry frame in v8abbr.h
geek Aug 29, 2017
3d3da4a
deps: cherry-pick 9b21865822243 from V8 upstream
addaleax Sep 8, 2017
7181fcd
deps: v8: fix potential segfault in profiler
ofrobots Sep 20, 2017
150e954
deps: backport 0f1dfae from V8 upstream
tebbi Oct 10, 2017
21bfde6
deps: cherry-pick 37a3a15c3 from V8 upstream
fhinkel Oct 18, 2017
d8de486
deps: cherry-pick 2c75616 from upstream V8
targos Oct 25, 2017
5a16d2e
deps: cherry-pick 676c413 from upstream V8
targos Oct 25, 2017
b56c82c
deps: cherry-pick e0d64dc from upstream V8
targos Oct 25, 2017
55d386c
deps: V8: backport b1cd96e from upstream
ofrobots Oct 18, 2017
dd8c994
deps: cherry-pick b8331cc030 from upstream V8
danbev Oct 30, 2017
3ad6a7d
deps: cherry-pick cc55747 from V8 upstream
fhinkel Nov 8, 2017
e2d41ed
deps: cherry-pick 1420e44db0 from upstream V8
TimothyGu Nov 27, 2017
259192f
deps: backport 3c8195d from V8 upstream
MylesBorins Nov 8, 2017
a10b18e
deps: V8: backport 14ac02c from upstream
ofrobots Dec 6, 2017
6e4a26d
deps: V8: cherry-pick ac0fe8ec from upstream
ofrobots Dec 15, 2017
c693140
deps: cherry-pick c3458a8 from upstream V8
targos Jan 11, 2018
d6e6253
deps: revert ABI breaking changes in V8 6.2
addaleax Oct 13, 2017
421626e
deps: revert ABI breaking changes in V8 6.1
addaleax Sep 14, 2017
c2f8d54
Revert "src: update NODE_MODULE_VERSION to 59"
MylesBorins Feb 7, 2018
40197d8
v8: make building addons with VS2013 work again
bnoordhuis Jan 29, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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>
  • Loading branch information
tebbi authored and MylesBorins committed Feb 7, 2018
commit 150e954af019758a2f35679b9ede2a5ad4000f99
4 changes: 2 additions & 2 deletions deps/v8/src/compiler/common-operator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ bool IsRestOf(Operator const* op) {
return OpParameter<bool>(op);
}

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

const Operator* CommonOperatorBuilder::TypedObjectState(
int object_id, const ZoneVector<MachineType>* types) {
uint32_t object_id, const ZoneVector<MachineType>* types) {
return new (zone()) Operator1<TypedObjectStateInfo>( // --
IrOpcode::kTypedObjectState, Operator::kPure, // opcode
"TypedObjectState", // name
Expand Down
12 changes: 8 additions & 4 deletions deps/v8/src/compiler/common-operator.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ V8_EXPORT_PRIVATE int ParameterIndexOf(const Operator* const);
const ParameterInfo& ParameterInfoOf(const Operator* const);

struct ObjectStateInfo final : std::pair<uint32_t, int> {
using std::pair<uint32_t, int>::pair;
ObjectStateInfo(uint32_t object_id, int size)
: std::pair<uint32_t, int>(object_id, size) {}
uint32_t object_id() const { return first; }
int size() const { return second; }
};
Expand All @@ -134,7 +135,10 @@ size_t hash_value(ObjectStateInfo const& p);

struct TypedObjectStateInfo final
: std::pair<uint32_t, const ZoneVector<MachineType>*> {
using std::pair<uint32_t, const ZoneVector<MachineType>*>::pair;
TypedObjectStateInfo(uint32_t object_id,
const ZoneVector<MachineType>* machine_types)
: std::pair<uint32_t, const ZoneVector<MachineType>*>(object_id,
machine_types) {}
uint32_t object_id() const { return first; }
const ZoneVector<MachineType>* machine_types() const { return second; }
};
Expand Down Expand Up @@ -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<MachineType>* types);
const Operator* FrameState(BailoutId bailout_id,
OutputFrameStateCombine state_combine,
Expand Down