AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] Missing lock in import wrapper cache

Browse Source 
Add a lock to prevent races between {WasmImportWrapperCache::Get} and
the cache modification scope.

R=clemensb@chromium.org

Change-Id: Ife281c127c765d3ca57f58c975e15a76833983ca
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1965588
Commit-Queue: Thibaud Michaud <thibaudm@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#65458}
This commit is contained in:
Thibaud Michaud 2019-12-16 13:51:11 +01:00 committed by Commit Bot
parent 7118c421f5
commit 3a7759d320
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wasm/wasm-import-wrapper-cache.cc
View File

@ -25,6 +25,7 @@ WasmCode*& WasmImportWrapperCache::operator[](
WasmCode* WasmImportWrapperCache::Get(compiler::WasmImportCallKind kind,
FunctionSig* sig) const {
base::MutexGuard lock(&mutex_);
auto it = entry_map_.find({kind, sig});
DCHECK(it != entry_map_.end());
return it->second;

4
src/wasm/wasm-import-wrapper-cache.h
View File

@ -49,14 +49,14 @@ class WasmImportWrapperCache {
// cache.
V8_EXPORT_PRIVATE WasmCode*& operator[](const CacheKey& key);
// Assumes the key exists in the map.
// Thread-safe. Assumes the key exists in the map.
V8_EXPORT_PRIVATE WasmCode* Get(compiler::WasmImportCallKind kind,
FunctionSig* sig) const;
~WasmImportWrapperCache();
private:
base::Mutex mutex_;
mutable base::Mutex mutex_;
std::unordered_map<CacheKey, WasmCode*, CacheKeyHash> entry_map_;
};