Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/passes/SafeHeap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,8 @@ struct SafeHeap : public Pass {
}
}

bool
isPossibleAtomicOperation(Index align, Index bytes, bool shared, Type type) {
return align == bytes && shared && type.isInteger();
bool isPossibleAtomicOperation(Index align, Index bytes, Type type) {
return align == bytes && type.isInteger();
}

void addGlobals(Module* module, FeatureSet features) {
Expand Down Expand Up @@ -264,8 +263,8 @@ struct SafeHeap : public Pass {
for (MemoryOrder memoryOrder : memoryOrdersToGenerate) {
load.order = memoryOrder;
if (load.isAtomic() &&
!isPossibleAtomicOperation(
align, bytes, module->memories[0]->shared, type)) {
(!features.hasAtomics() ||
!isPossibleAtomicOperation(align, bytes, type))) {
continue;
}
addLoadFunc(load, module);
Expand Down Expand Up @@ -300,8 +299,8 @@ struct SafeHeap : public Pass {
for (auto memoryOrder : memoryOrdersToGenerate) {
store.order = memoryOrder;
if (store.isAtomic() &&
!isPossibleAtomicOperation(
align, bytes, module->memories[0]->shared, valueType)) {
(!features.hasAtomics() ||
!isPossibleAtomicOperation(align, bytes, valueType))) {
continue;
}
addStoreFunc(store, module);
Expand Down
Loading
Loading