[wasm] Fix CFI failures due to Wasm threads.

src/wasm/wasm-interpreter.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/wasm/wasm-interpreter.h"
 #include "src/wasm/ast-decoder.h"
 #include "src/wasm/decoder.h"
 #include "src/wasm/wasm-external-refs.h"
 #include "src/wasm/wasm-module.h"
 
@@ skipping 1657 matching lines @@
   }
 };
 
 //============================================================================
 // The implementation details of the interpreter.
 //============================================================================
 class WasmInterpreterInternals : public ZoneObject {
  public:
   WasmModuleInstance* instance_;
   CodeMap codemap_;
-  ZoneVector<ThreadImpl> threads_;
+  ZoneVector<ThreadImpl*> threads_;
 
   WasmInterpreterInternals(Zone* zone, WasmModuleInstance* instance)
       : instance_(instance),
         codemap_(instance_ ? instance_->module : nullptr, zone),
         threads_(zone) {
-    threads_.push_back(ThreadImpl(zone, &codemap_, instance));
+    threads_.push_back(new ThreadImpl(zone, &codemap_, instance));
+  }
+
+  void Delete() {
+    // TODO(titzer): CFI doesn't like threads in the ZoneVector.
+    for (auto t : threads_) delete t;
+    threads_.resize(0);
   }
 };
 
 //============================================================================
 // Implementation of the public interface of the interpreter.
 //============================================================================
 WasmInterpreter::WasmInterpreter(WasmModuleInstance* instance,
                                  base::AccountingAllocator* allocator)
     : zone_(allocator),
       internals_(new (&zone_) WasmInterpreterInternals(&zone_, instance)) {}
 
-WasmInterpreter::~WasmInterpreter() {}
+WasmInterpreter::~WasmInterpreter() { internals_->Delete(); }

[ahaas, 2016/06/09 14:07:17]

I wonder if it would be useful to use a SmartPointer for internals_.

 
-void WasmInterpreter::Run() { internals_->threads_[0].Run(); }
+void WasmInterpreter::Run() { internals_->threads_[0]->Run(); }
 
-void WasmInterpreter::Pause() { internals_->threads_[0].Pause(); }
+void WasmInterpreter::Pause() { internals_->threads_[0]->Pause(); }
 
 bool WasmInterpreter::SetBreakpoint(const WasmFunction* function, pc_t pc,
                                     bool enabled) {
   InterpreterCode* code = internals_->codemap_.FindCode(function);
   if (!code) return false;
   size_t size = static_cast<size_t>(code->end - code->start);
   // Check bounds for {pc}.
   if (pc < code->locals.decls_encoded_size || pc >= size) return false;
   // Make a copy of the code before enabling a breakpoint.
   if (enabled && code->orig_start == code->start) {
@@ skipping 22 matching lines @@
 
 bool WasmInterpreter::SetTracing(const WasmFunction* function, bool enabled) {
   UNIMPLEMENTED();
   return false;
 }
 
 int WasmInterpreter::GetThreadCount() {
   return 1;  // only one thread for now.
 }
 
-WasmInterpreter::Thread& WasmInterpreter::GetThread(int id) {
+WasmInterpreter::Thread* WasmInterpreter::GetThread(int id) {
   CHECK_EQ(0, id);  // only one thread for now.
   return internals_->threads_[id];
 }
 
 WasmVal WasmInterpreter::GetLocalVal(const WasmFrame* frame, int index) {
   CHECK_GE(index, 0);
   UNIMPLEMENTED();
   WasmVal none;
   none.type = kAstStmt;
   return none;
@@ skipping 39 matching lines @@
 
 ControlTransferMap WasmInterpreter::ComputeControlTransfersForTesting(
     Zone* zone, const byte* start, const byte* end) {
   ControlTransfers targets(zone, 0, start, end);
   return targets.map_;
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8