Browse Source

deps: fix addons compilation with VS2013

VS2013 does not support defaulting move constructor and assignment
operator. This adds explicit definitions of those methods for two
classes.
This fix is required because we still support building addons with
VS2013 and the incompatibility is in v8.h.

Fixes: https://github.com/nodejs/node-v8/issues/4

PR-URL: https://github.com/nodejs/node/pull/13263
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
v6
Bartosz Sosnowski 8 years ago
committed by Michaël Zasso
parent
commit
bfb4694408
  1. 12
      deps/v8/include/v8.h
  2. 15
      deps/v8/src/api.cc

12
deps/v8/include/v8.h

@ -4025,10 +4025,12 @@ class V8_EXPORT WasmCompiledModule : public Object {
// supports move semantics, and does not support copy semantics. // supports move semantics, and does not support copy semantics.
class TransferrableModule final { class TransferrableModule final {
public: public:
TransferrableModule(TransferrableModule&& src) = default; TransferrableModule(TransferrableModule&& src)
: compiled_code(std::move(src.compiled_code)),
wire_bytes(std::move(src.wire_bytes)) {}
TransferrableModule(const TransferrableModule& src) = delete; TransferrableModule(const TransferrableModule& src) = delete;
TransferrableModule& operator=(TransferrableModule&& src) = default; TransferrableModule& operator=(TransferrableModule&& src);
TransferrableModule& operator=(const TransferrableModule& src) = delete; TransferrableModule& operator=(const TransferrableModule& src) = delete;
private: private:
@ -4101,9 +4103,11 @@ class V8_EXPORT WasmModuleObjectBuilder final {
// Disable copy semantics *in this implementation*. We can choose to // Disable copy semantics *in this implementation*. We can choose to
// relax this, albeit it's not clear why. // relax this, albeit it's not clear why.
WasmModuleObjectBuilder(const WasmModuleObjectBuilder&) = delete; WasmModuleObjectBuilder(const WasmModuleObjectBuilder&) = delete;
WasmModuleObjectBuilder(WasmModuleObjectBuilder&&) = default; WasmModuleObjectBuilder(WasmModuleObjectBuilder&& src)
: received_buffers_(std::move(src.received_buffers_)),
total_size_(src.total_size_) {}
WasmModuleObjectBuilder& operator=(const WasmModuleObjectBuilder&) = delete; WasmModuleObjectBuilder& operator=(const WasmModuleObjectBuilder&) = delete;
WasmModuleObjectBuilder& operator=(WasmModuleObjectBuilder&&) = default; WasmModuleObjectBuilder& operator=(WasmModuleObjectBuilder&&);
std::vector<Buffer> received_buffers_; std::vector<Buffer> received_buffers_;
size_t total_size_ = 0; size_t total_size_ = 0;

15
deps/v8/src/api.cc

@ -7591,6 +7591,14 @@ Local<String> WasmCompiledModule::GetWasmWireBytes() {
return Local<String>::Cast(Utils::ToLocal(wire_bytes)); return Local<String>::Cast(Utils::ToLocal(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;
}
// Currently, wasm modules are bound, both to Isolate and to // Currently, wasm modules are bound, both to Isolate and to
// the Context they were created in. The currently-supported means to // the Context they were created in. The currently-supported means to
// decontextualize and then re-contextualize a module is via // decontextualize and then re-contextualize a module is via
@ -7705,6 +7713,13 @@ MaybeLocal<WasmCompiledModule> WasmModuleObjectBuilder::Finish() {
return WasmCompiledModule::Compile(isolate_, wire_bytes.get(), total_size_); return WasmCompiledModule::Compile(isolate_, wire_bytes.get(), total_size_);
} }
WasmModuleObjectBuilder&
WasmModuleObjectBuilder::operator=(WasmModuleObjectBuilder&& src) {
received_buffers_ = std::move(src.received_buffers_);
total_size_ = src.total_size_;
return *this;
}
// static // static
v8::ArrayBuffer::Allocator* v8::ArrayBuffer::Allocator::NewDefaultAllocator() { v8::ArrayBuffer::Allocator* v8::ArrayBuffer::Allocator::NewDefaultAllocator() {
return new ArrayBufferAllocator(); return new ArrayBufferAllocator();

Loading…
Cancel
Save