Index: src/isolate.cc |
diff --git a/src/isolate.cc b/src/isolate.cc |
index cb3c4a79dca7aa2feb41a3e392335d5d7de5995c..6bab06cebf365a296e3219b4eec636ce35a170b0 100644 |
--- a/src/isolate.cc |
+++ b/src/isolate.cc |
@@ -20,7 +20,7 @@ |
#include "src/codegen.h" |
#include "src/compilation-cache.h" |
#include "src/compilation-statistics.h" |
-#include "src/compiler-dispatcher/compiler-dispatcher-tracer.h" |
+#include "src/compiler-dispatcher/compiler-dispatcher.h" |
#include "src/compiler-dispatcher/optimizing-compile-dispatcher.h" |
#include "src/crankshaft/hydrogen.h" |
#include "src/debug/debug.h" |
@@ -2278,6 +2278,10 @@ void Isolate::Deinit() { |
delete heap_profiler_; |
heap_profiler_ = NULL; |
+ compiler_dispatcher_->AbortAll(CompilerDispatcher::BlockingBehavior::kBlock); |
+ delete compiler_dispatcher_; |
+ compiler_dispatcher_ = nullptr; |
+ |
cancelable_task_manager()->CancelAndWait(); |
heap_.TearDown(); |
@@ -2286,9 +2290,6 @@ void Isolate::Deinit() { |
delete interpreter_; |
interpreter_ = NULL; |
- delete compiler_dispatcher_tracer_; |
- compiler_dispatcher_tracer_ = nullptr; |
- |
delete cpu_profiler_; |
cpu_profiler_ = NULL; |
@@ -2497,7 +2498,7 @@ bool Isolate::Init(Deserializer* des) { |
cpu_profiler_ = new CpuProfiler(this); |
heap_profiler_ = new HeapProfiler(heap()); |
interpreter_ = new interpreter::Interpreter(this); |
- compiler_dispatcher_tracer_ = new CompilerDispatcherTracer(this); |
+ compiler_dispatcher_ = new CompilerDispatcher(this, FLAG_stack_size); |
// Enable logging before setting up the heap |
logger_->SetUp(this); |