Skip to content

Commit bfb4694

Browse files
bzoztargos
authored andcommitted
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: nodejs/node-v8#4 PR-URL: nodejs#13263 Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]> Reviewed-By: Myles Borins <[email protected]>
1 parent bc8e487 commit bfb4694

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

deps/v8/include/v8.h

+8-4
Original file line numberDiff line numberDiff line change
@@ -4025,10 +4025,12 @@ class V8_EXPORT WasmCompiledModule : public Object {
40254025
// supports move semantics, and does not support copy semantics.
40264026
class TransferrableModule final {
40274027
public:
4028-
TransferrableModule(TransferrableModule&& src) = default;
4028+
TransferrableModule(TransferrableModule&& src)
4029+
: compiled_code(std::move(src.compiled_code)),
4030+
wire_bytes(std::move(src.wire_bytes)) {}
40294031
TransferrableModule(const TransferrableModule& src) = delete;
40304032

4031-
TransferrableModule& operator=(TransferrableModule&& src) = default;
4033+
TransferrableModule& operator=(TransferrableModule&& src);
40324034
TransferrableModule& operator=(const TransferrableModule& src) = delete;
40334035

40344036
private:
@@ -4101,9 +4103,11 @@ class V8_EXPORT WasmModuleObjectBuilder final {
41014103
// Disable copy semantics *in this implementation*. We can choose to
41024104
// relax this, albeit it's not clear why.
41034105
WasmModuleObjectBuilder(const WasmModuleObjectBuilder&) = delete;
4104-
WasmModuleObjectBuilder(WasmModuleObjectBuilder&&) = default;
4106+
WasmModuleObjectBuilder(WasmModuleObjectBuilder&& src)
4107+
: received_buffers_(std::move(src.received_buffers_)),
4108+
total_size_(src.total_size_) {}
41054109
WasmModuleObjectBuilder& operator=(const WasmModuleObjectBuilder&) = delete;
4106-
WasmModuleObjectBuilder& operator=(WasmModuleObjectBuilder&&) = default;
4110+
WasmModuleObjectBuilder& operator=(WasmModuleObjectBuilder&&);
41074111

41084112
std::vector<Buffer> received_buffers_;
41094113
size_t total_size_ = 0;

deps/v8/src/api.cc

+15
Original file line numberDiff line numberDiff line change
@@ -7591,6 +7591,14 @@ Local<String> WasmCompiledModule::GetWasmWireBytes() {
75917591
return Local<String>::Cast(Utils::ToLocal(wire_bytes));
75927592
}
75937593

7594+
WasmCompiledModule::TransferrableModule&
7595+
WasmCompiledModule::TransferrableModule::operator=(
7596+
TransferrableModule&& src) {
7597+
compiled_code = std::move(src.compiled_code);
7598+
wire_bytes = std::move(src.wire_bytes);
7599+
return *this;
7600+
}
7601+
75947602
// Currently, wasm modules are bound, both to Isolate and to
75957603
// the Context they were created in. The currently-supported means to
75967604
// decontextualize and then re-contextualize a module is via
@@ -7705,6 +7713,13 @@ MaybeLocal<WasmCompiledModule> WasmModuleObjectBuilder::Finish() {
77057713
return WasmCompiledModule::Compile(isolate_, wire_bytes.get(), total_size_);
77067714
}
77077715

7716+
WasmModuleObjectBuilder&
7717+
WasmModuleObjectBuilder::operator=(WasmModuleObjectBuilder&& src) {
7718+
received_buffers_ = std::move(src.received_buffers_);
7719+
total_size_ = src.total_size_;
7720+
return *this;
7721+
}
7722+
77087723
// static
77097724
v8::ArrayBuffer::Allocator* v8::ArrayBuffer::Allocator::NewDefaultAllocator() {
77107725
return new ArrayBufferAllocator();

0 commit comments

Comments
 (0)