diff options
author | Logan Chien <tzuhsiang.chien@gmail.com> | 2016-08-26 02:13:00 +0800 |
---|---|---|
committer | Logan Chien <tzuhsiang.chien@gmail.com> | 2016-08-26 02:47:00 +0800 |
commit | a008d4fd7af3b04a3d351a03d56df7c28998690e (patch) | |
tree | e82a2dc300b867ff995b856f1c4d0e503af251b2 /src/wasm-module-building.h | |
parent | a08643d788dd025345c63798f2e3ed7ca9b12e06 (diff) | |
download | binaryen-a008d4fd7af3b04a3d351a03d56df7c28998690e.tar.gz binaryen-a008d4fd7af3b04a3d351a03d56df7c28998690e.tar.bz2 binaryen-a008d4fd7af3b04a3d351a03d56df7c28998690e.zip |
Fix asm2wasm dead lock caused by empty modules.
This commit fixes an asm2wasm dead lock when asm2wasm is compiling an
empty module, i.e. a module without any functions.
Without this commit, worker threads are likely to leave `workerMain()`
and decrease `liveWorkers` early. Consequently, `waitUntilAllReady()`
will never observe `liveWorkers == numWorkers`.
Diffstat (limited to 'src/wasm-module-building.h')
-rw-r--r-- | src/wasm-module-building.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/wasm-module-building.h b/src/wasm-module-building.h index cb72fef3f..ead074991 100644 --- a/src/wasm-module-building.h +++ b/src/wasm-module-building.h @@ -86,7 +86,15 @@ class OptimizingIncrementalModuleBuilder { public: // numFunctions must be equal to the number of functions allocated, or higher. Knowing // this bounds helps avoid locking. - OptimizingIncrementalModuleBuilder(Module* wasm, Index numFunctions) : wasm(wasm), numFunctions(numFunctions), nextFunction(0), finishing(false) { + OptimizingIncrementalModuleBuilder(Module* wasm, Index numFunctions) + : wasm(wasm), numFunctions(numFunctions), endMarker(nullptr), list(nullptr), nextFunction(0), + numWorkers(0), liveWorkers(0), activeWorkers(0), availableFuncs(0), finishedFuncs(0), + finishing(false) { + if (numFunctions == 0) { + // special case: no functions to be optimized. Don't create any threads. + return; + } + // prepare work list endMarker = new Function(); list = new std::atomic<Function*>[numFunctions]; |