Merge pull request #682 from loganchien/fix-empty-deadlock

Fix asm2wasm dead lock caused by empty module

1 files changed, 4 insertions, 3 deletions

diff --git a/src/support/threads.cpp b/src/support/threads.cpp
index d9e8f8bf2..18f99d5ca 100644
--- a/src/support/threads.cpp
+++ b/src/support/threads.cpp
@@ -22,6 +22,7 @@
 
 #include "threads.h"
 #include "compiler-support.h"
+#include "utilities.h"
 
 
 // debugging tools
@@ -47,7 +48,7 @@ static std::unique_ptr<ThreadPool> pool;
 
 Thread::Thread() {
   assert(!ThreadPool::get()->isRunning());
-  thread = std::unique_ptr<std::thread>(new std::thread(mainLoop, this));
+  thread = make_unique<std::thread>(mainLoop, this);
 }
 
 Thread::~Thread() {
@@ -110,7 +111,7 @@ void ThreadPool::initialize(size_t num) {
   ready.store(threads.size()); // initial state before first resetThreadsAreReady()
   resetThreadsAreReady();
   for (size_t i = 0; i < num; i++) {
-    threads.emplace_back(std::unique_ptr<Thread>(new Thread()));
+    threads.emplace_back(make_unique<Thread>());
   }
   DEBUG_POOL("initialize() waiting\n");
   condition.wait(lock, [this]() { return areThreadsReady(); });
@@ -127,7 +128,7 @@ size_t ThreadPool::getNumCores() {
 
 ThreadPool* ThreadPool::get() {
   if (!pool) {
-    pool = std::unique_ptr<ThreadPool>(new ThreadPool());
+    pool = make_unique<ThreadPool>();
     pool->initialize(getNumCores());
   }
   return pool.get();