Skip to content

Commit 28ca44c

Browse files
targosMylesBorins
authored andcommitted
deps: V8: cherry-pick cfe9172
Original commit message: [wasm] Disallow interpreter move The MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR macro defines a defaulted move constructor and move-assignment operator. The {std::unique_ptr} on the other hand needs the contained type to be complete when instantiating the move assignment operator. Hence, this fails e.g. on MSVC, see #30020 (comment). It turns out that we never actually move the interpreter, so we can just replace the MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR by DISALLOW_COPY_AND_ASSIGN. [email protected] Change-Id: Iba7d30243510ed9554be62b0c4c8e6f47f0c3307 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1871921 Reviewed-by: Andreas Haas <[email protected]> Commit-Queue: Clemens Backes <[email protected]> Cr-Commit-Position: refs/heads/master@{#64423} Refs: v8/v8@cfe9172 Backport-PR-URL: #30513 PR-URL: #30020 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent ba4abfd commit 28ca44c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Reset this number to 0 on major V8 upgrades.
4141
# Increment by one for each non-official patch applied to deps/v8.
42-
'v8_embedder_string': '-node.10',
42+
'v8_embedder_string': '-node.11',
4343

4444
##### V8 defaults for Node.js #####
4545

deps/v8/src/wasm/wasm-debug.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ MaybeHandle<String> GetLocalName(Isolate* isolate,
9797
}
9898

9999
class InterpreterHandle {
100-
MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(InterpreterHandle);
101100
Isolate* isolate_;
102101
const WasmModule* module_;
103102
WasmInterpreter interpreter_;
@@ -461,6 +460,9 @@ class InterpreterHandle {
461460
}
462461
return local_scope_object;
463462
}
463+
464+
private:
465+
DISALLOW_COPY_AND_ASSIGN(InterpreterHandle);
464466
};
465467

466468
} // namespace

deps/v8/src/wasm/wasm-interpreter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ class V8_EXPORT_PRIVATE WasmInterpreter {
172172
uint32_t ActivationFrameBase(uint32_t activation_id);
173173
};
174174

175-
MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(WasmInterpreter);
176-
177175
WasmInterpreter(Isolate* isolate, const WasmModule* module,
178176
const ModuleWireBytes& wire_bytes,
179177
Handle<WasmInstanceObject> instance);
@@ -220,6 +218,8 @@ class V8_EXPORT_PRIVATE WasmInterpreter {
220218
private:
221219
Zone zone_;
222220
std::unique_ptr<WasmInterpreterInternals> internals_;
221+
222+
DISALLOW_COPY_AND_ASSIGN(WasmInterpreter);
223223
};
224224

225225
} // namespace wasm

0 commit comments

Comments
 (0)