[wasm] Disallow interpreter move

backes · Commit Bot · commit cfe9172e6479 · 2019-10-21T13:55:41.000Z
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 nodejs/node#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. R=ahaas@chromium.org Change-Id: Iba7d30243510ed9554be62b0c4c8e6f47f0c3307 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1871921 Reviewed-by: Andreas Haas <ahaas@chromium.org> Commit-Queue: Clemens Backes <clemensb@chromium.org> Cr-Commit-Position: refs/heads/master@{#64423}
diff --git a/src/wasm/wasm-debug.cc b/src/wasm/wasm-debug.cc
@@ -97,7 +97,6 @@ MaybeHandle<String> GetLocalName(Isolate* isolate,
 }
 
 class InterpreterHandle {
-  MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(InterpreterHandle);
   Isolate* isolate_;
   const WasmModule* module_;
   WasmInterpreter interpreter_;
@@ -461,6 +460,9 @@ class InterpreterHandle {
     }
     return local_scope_object;
   }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InterpreterHandle);
 };
 
 }  // namespace
diff --git a/src/wasm/wasm-interpreter.h b/src/wasm/wasm-interpreter.h
@@ -171,8 +171,6 @@ class V8_EXPORT_PRIVATE WasmInterpreter {
     uint32_t ActivationFrameBase(uint32_t activation_id);
   };
 
-  MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(WasmInterpreter);
-
   WasmInterpreter(Isolate* isolate, const WasmModule* module,
                   const ModuleWireBytes& wire_bytes,
                   Handle<WasmInstanceObject> instance);
@@ -219,6 +217,8 @@ class V8_EXPORT_PRIVATE WasmInterpreter {
  private:
   Zone zone_;
   std::unique_ptr<WasmInterpreterInternals> internals_;
+
+  DISALLOW_COPY_AND_ASSIGN(WasmInterpreter);
 };
 
 }  // namespace wasm

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ MaybeHandle<String> GetLocalName(Isolate* isolate,`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`class InterpreterHandle {`
`100`		`- MOVE_ONLY_NO_DEFAULT_CONSTRUCTOR(InterpreterHandle);`
`101`	`100`	`Isolate* isolate_;`
`102`	`101`	`const WasmModule* module_;`
`103`	`102`	`WasmInterpreter interpreter_;`
`@@ -461,6 +460,9 @@ class InterpreterHandle {`
`461`	`460`	`}`
`462`	`461`	`return local_scope_object;`
`463`	`462`	`}`
	`463`	`+`
	`464`	`+ private:`
	`465`	`+ DISALLOW_COPY_AND_ASSIGN(InterpreterHandle);`
`464`	`466`	`};`
`465`	`467`
`466`	`468`	`} // namespace`