asm2wasm atomics (#1171)

* translate asm.js atomics into wasm atomics

* fix wasm-builder atomic load emitting, the alignment is the loaded size, not the output size

* don't require code for each node type in vaccuum, for non-mentioned nodes, assume we can't optimize them out

* support atomics in hashing, comparing, and copying

2 files changed, 62 insertions, 0 deletions

diff --git a/src/ast/ExpressionAnalyzer.cpp b/src/ast/ExpressionAnalyzer.cpp
index 421206706..b8e2ae34c 100644
--- a/src/ast/ExpressionAnalyzer.cpp
+++ b/src/ast/ExpressionAnalyzer.cpp
@@ -223,6 +223,34 @@ bool ExpressionAnalyzer::flexibleEqual(Expression* left, Expression* right, Expr
         PUSH(Store, value);
         break;
       }
+      case Expression::Id::AtomicCmpxchgId: {
+        CHECK(AtomicCmpxchg, bytes);
+        CHECK(AtomicCmpxchg, offset);
+        PUSH(AtomicCmpxchg, ptr);
+        PUSH(AtomicCmpxchg, expected);
+        PUSH(AtomicCmpxchg, replacement);
+        break;
+      }
+      case Expression::Id::AtomicRMWId: {
+        CHECK(AtomicRMW, op);
+        CHECK(AtomicRMW, bytes);
+        CHECK(AtomicRMW, offset);
+        PUSH(AtomicRMW, ptr);
+        PUSH(AtomicRMW, value);
+        break;
+      }
+      case Expression::Id::AtomicWaitId: {
+        CHECK(AtomicWait, expectedType);
+        PUSH(AtomicWait, ptr);
+        PUSH(AtomicWait, expected);
+        PUSH(AtomicWait, timeout);
+        break;
+      }
+      case Expression::Id::AtomicWakeId: {
+        PUSH(AtomicWake, ptr);
+        PUSH(AtomicWake, wakeCount);
+        break;
+      }
       case Expression::Id::ConstId: {
         CHECK(Const, value);
         break;
@@ -440,6 +468,34 @@ uint32_t ExpressionAnalyzer::hash(Expression* curr) {
         PUSH(Store, value);
         break;
       }
+      case Expression::Id::AtomicCmpxchgId: {
+        HASH(AtomicCmpxchg, bytes);
+        HASH(AtomicCmpxchg, offset);
+        PUSH(AtomicCmpxchg, ptr);
+        PUSH(AtomicCmpxchg, expected);
+        PUSH(AtomicCmpxchg, replacement);
+        break;
+      }
+      case Expression::Id::AtomicRMWId: {
+        HASH(AtomicRMW, op);
+        HASH(AtomicRMW, bytes);
+        HASH(AtomicRMW, offset);
+        PUSH(AtomicRMW, ptr);
+        PUSH(AtomicRMW, value);
+        break;
+      }
+      case Expression::Id::AtomicWaitId: {
+        HASH(AtomicWait, expectedType);
+        PUSH(AtomicWait, ptr);
+        PUSH(AtomicWait, expected);
+        PUSH(AtomicWait, timeout);
+        break;
+      }
+      case Expression::Id::AtomicWakeId: {
+        PUSH(AtomicWake, ptr);
+        PUSH(AtomicWake, wakeCount);
+        break;
+      }
       case Expression::Id::ConstId: {
         HASH(Const, value.type);
         HASH64(Const, value.getBits());
diff --git a/src/ast/ExpressionManipulator.cpp b/src/ast/ExpressionManipulator.cpp
index cca799e10..f5b303488 100644
--- a/src/ast/ExpressionManipulator.cpp
+++ b/src/ast/ExpressionManipulator.cpp
@@ -117,6 +117,12 @@ Expression* flexibleCopy(Expression* original, Module& wasm, CustomCopier custom
 				       copy(curr->ptr), copy(curr->expected), copy(curr->replacement),
 				       curr->type);
     }
+    Expression* visitAtomicWait(AtomicWait* curr) {
+      return builder.makeAtomicWait(copy(curr->ptr), copy(curr->expected), copy(curr->timeout), curr->type);
+    }
+    Expression* visitAtomicWake(AtomicWake* curr) {
+      return builder.makeAtomicWake(copy(curr->ptr), copy(curr->wakeCount));
+    }
     Expression* visitConst(Const *curr) {
       return builder.makeConst(curr->value);
     }