Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 84e3c56

Browse files
committed
Fix regression that broke asm.js validation in #139 (since 2016-03-24. Fixes emscripten-core/emscripten#4307.
1 parent 7ef1745 commit 84e3c56

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/Target/JSBackend/CallHandlers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ DEF_BUILTIN_HANDLER(emscripten_bool8x16_anyTrue, SIMD_Bool8x16_anyTrue);
14381438
DEF_BUILTIN_HANDLER(emscripten_bool8x16_allTrue, SIMD_Bool8x16_allTrue);
14391439

14401440
DEF_CALL_HANDLER(emscripten_atomic_fence, {
1441-
if (EnablePthreads) return "Atomics_add(HEAP32, 0, 0) /* fence */";
1441+
if (EnablePthreads) return "(Atomics_add(HEAP32, 0, 0)|0) /* fence */";
14421442
else return "/* fence */";
14431443
})
14441444

lib/Target/JSBackend/JSBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2728,7 +2728,7 @@ void JSWriter::generateExpression(const User *I, raw_string_ostream& Code) {
27282728
break;
27292729
}
27302730
case Instruction::Fence:
2731-
if (EnablePthreads) Code << "Atomics_add(HEAP32, 0, 0) /* fence */";
2731+
if (EnablePthreads) Code << "(Atomics_add(HEAP32, 0, 0)|0) /* fence */";
27322732
else Code << "/* fence */";
27332733
break;
27342734
}

0 commit comments

Comments
 (0)