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
v8: make building addons with VS2013 work again
Work around some C++11 shortcomings in Visual Studio 2013:

1. Replace `constexpr` with `const`, and
2. Remove default move constructors and assignment operators.
  • Loading branch information
bnoordhuis authored and MylesBorins committed Feb 7, 2018
commit 40197d886effecc3760f1fdb838bf9dbc0494305
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 6
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 414
#define V8_PATCH_LEVEL 49
#define V8_PATCH_LEVEL 50

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
21 changes: 8 additions & 13 deletions deps/v8/include/v8.h
Original file line number Diff line number Diff line change
Expand Up @@ -2452,7 +2452,7 @@ enum class NewStringType {
*/
class V8_EXPORT String : public Name {
public:
static constexpr int kMaxLength =
static const int kMaxLength =
sizeof(void*) == 4 ? (1 << 28) - 16 : (1 << 30) - 1 - 24;

enum Encoding {
Expand Down Expand Up @@ -4122,10 +4122,10 @@ class V8_EXPORT WasmCompiledModule : public Object {
// supports move semantics, and does not support copy semantics.
class TransferrableModule final {
public:
TransferrableModule(TransferrableModule&& src) = default;
TransferrableModule(TransferrableModule&& src);
TransferrableModule(const TransferrableModule& src) = delete;

TransferrableModule& operator=(TransferrableModule&& src) = default;
TransferrableModule& operator=(TransferrableModule&& src);
TransferrableModule& operator=(const TransferrableModule& src) = delete;

private:
Expand Down Expand Up @@ -4200,24 +4200,19 @@ class V8_EXPORT WasmModuleObjectBuilderStreaming final {

WasmModuleObjectBuilderStreaming(const WasmModuleObjectBuilderStreaming&) =
delete;
WasmModuleObjectBuilderStreaming(WasmModuleObjectBuilderStreaming&&) =
default;
WasmModuleObjectBuilderStreaming(WasmModuleObjectBuilderStreaming&&);
WasmModuleObjectBuilderStreaming& operator=(
const WasmModuleObjectBuilderStreaming&) = delete;
WasmModuleObjectBuilderStreaming& operator=(
WasmModuleObjectBuilderStreaming&&) = default;
WasmModuleObjectBuilderStreaming&&);
Isolate* isolate_ = nullptr;

#if V8_CC_MSVC
// We don't need the static Copy API, so the default
// NonCopyablePersistentTraits would be sufficient, however,
// MSVC eagerly instantiates the Copy.
// We ensure we don't use Copy, however, by compiling with the
// defaults everywhere else.
Persistent<Promise, CopyablePersistentTraits<Promise>> promise_;
#else
Persistent<Promise> promise_;
#endif
std::vector<Buffer> received_buffers_;
size_t total_size_ = 0;
};
Expand All @@ -4238,9 +4233,9 @@ class V8_EXPORT WasmModuleObjectBuilder final {
// Disable copy semantics *in this implementation*. We can choose to
// relax this, albeit it's not clear why.
WasmModuleObjectBuilder(const WasmModuleObjectBuilder&) = delete;
WasmModuleObjectBuilder(WasmModuleObjectBuilder&&) = default;
WasmModuleObjectBuilder(WasmModuleObjectBuilder&&);
WasmModuleObjectBuilder& operator=(const WasmModuleObjectBuilder&) = delete;
WasmModuleObjectBuilder& operator=(WasmModuleObjectBuilder&&) = default;
WasmModuleObjectBuilder& operator=(WasmModuleObjectBuilder&&);

std::vector<Buffer> received_buffers_;
size_t total_size_ = 0;
Expand Down Expand Up @@ -4502,7 +4497,7 @@ class V8_EXPORT TypedArray : public ArrayBufferView {
/*
* The largest typed array size that can be constructed using New.
*/
static constexpr size_t kMaxLength =
static const size_t kMaxLength =
sizeof(void*) == 4 ? (1u << 30) - 1 : (1u << 31) - 1;

/**
Expand Down
39 changes: 39 additions & 0 deletions deps/v8/src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7714,6 +7714,18 @@ MaybeLocal<Proxy> Proxy::New(Local<Context> context, Local<Object> local_target,
RETURN_ESCAPED(result);
}

WasmCompiledModule::TransferrableModule::TransferrableModule(
TransferrableModule&& src)
: compiled_code(std::move(src.compiled_code))
, wire_bytes(std::move(src.wire_bytes)) {}

WasmCompiledModule::TransferrableModule&
WasmCompiledModule::TransferrableModule::operator=(TransferrableModule&& src) {
compiled_code = std::move(src.compiled_code);
wire_bytes = std::move(src.wire_bytes);
return *this;
}

Local<String> WasmCompiledModule::GetWasmWireBytes() {
i::Handle<i::WasmModuleObject> obj =
i::Handle<i::WasmModuleObject>::cast(Utils::OpenHandle(this));
Expand Down Expand Up @@ -7826,6 +7838,22 @@ WasmModuleObjectBuilderStreaming::WasmModuleObjectBuilderStreaming(
}
}

WasmModuleObjectBuilderStreaming::WasmModuleObjectBuilderStreaming(
WasmModuleObjectBuilderStreaming&& src)
: isolate_(std::move(src.isolate_))
, promise_(std::move(src.promise_))
, received_buffers_(std::move(src.received_buffers_))
, total_size_(std::move(src.total_size_)) {}

WasmModuleObjectBuilderStreaming& WasmModuleObjectBuilderStreaming::operator=(
WasmModuleObjectBuilderStreaming&& src) {
isolate_ = std::move(src.isolate_);
promise_ = std::move(src.promise_);
received_buffers_ = std::move(src.received_buffers_);
total_size_ = std::move(src.total_size_);
return *this;
}

Local<Promise> WasmModuleObjectBuilderStreaming::GetPromise() {
return promise_.Get(isolate_);
}
Expand Down Expand Up @@ -7871,6 +7899,17 @@ WasmModuleObjectBuilderStreaming::~WasmModuleObjectBuilderStreaming() {
promise_.Reset();
}

WasmModuleObjectBuilder::WasmModuleObjectBuilder(WasmModuleObjectBuilder&& src)
: received_buffers_(std::move(src.received_buffers_))
, total_size_(std::move(src.total_size_)) {}

WasmModuleObjectBuilder&
WasmModuleObjectBuilder::operator=(WasmModuleObjectBuilder&& src) {
received_buffers_ = std::move(src.received_buffers_);
total_size_ = std::move(src.total_size_);
return *this;
}

void WasmModuleObjectBuilder::OnBytesReceived(const uint8_t* bytes,
size_t size) {
std::unique_ptr<uint8_t[]> cloned_bytes(new uint8_t[size]);
Expand Down