yolo

src/ir/ReFinalize.cpp

@@ -172,6 +172,8 @@ void ReFinalize::visitArrayCopy(ArrayCopy* curr) { curr->finalize(); }
 void ReFinalize::visitArrayFill(ArrayFill* curr) { curr->finalize(); }
 void ReFinalize::visitArrayInitData(ArrayInitData* curr) { curr->finalize(); }
 void ReFinalize::visitArrayInitElem(ArrayInitElem* curr) { curr->finalize(); }
+void ReFinalize::visitArrayRMW(ArrayRMW* curr) { curr->finalize(); }
+void ReFinalize::visitArrayCmpxchg(ArrayCmpxchg* curr) { curr->finalize(); }
 void ReFinalize::visitRefAs(RefAs* curr) { curr->finalize(); }
 void ReFinalize::visitStringNew(StringNew* curr) { curr->finalize(); }
 void ReFinalize::visitStringConst(StringConst* curr) { curr->finalize(); }

src/ir/possible-contents.cpp

@@ -1100,6 +1100,22 @@ struct InfoCollector
   }
   void visitArrayInitData(ArrayInitData* curr) { visitArrayInit(curr); }
   void visitArrayInitElem(ArrayInitElem* curr) { visitArrayInit(curr); }
+  void visitArrayRMW(ArrayRMW* curr) {
+    if (curr->ref->type == Type::unreachable) {
+      return;
+    }
+    // TODO: Model the modification part of the RMW in addition to the read and
+    // the write.
+    addRoot(curr);
+  }
+  void visitArrayCmpxchg(ArrayCmpxchg* curr) {
+    if (curr->ref->type == Type::unreachable) {
+      return;
+    }
+    // TODO: Model the modification part of the RMW in addition to the read and
+    // the write.
+    addRoot(curr);
+  }
   void visitStringNew(StringNew* curr) {
     if (curr->type == Type::unreachable) {
       return;
@@ -1618,6 +1634,10 @@ void TNHOracle::scan(Function* func,
     void visitArrayInitElem(ArrayInitElem* curr) {
       notePossibleTrap(curr->ref);
     }
+    void visitArrayRMW(ArrayRMW* curr) { notePossibleTrap(curr->ref); }
+    void visitArrayCmpxchg(ArrayCmpxchg* curr) {
+      notePossibleTrap(curr->ref);
+    }
 
     void visitFunction(Function* curr) {
       // In optimized TNH code, a function that always traps will be turned

src/passes/Heap2Local.cpp

@@ -448,6 +448,18 @@ struct EscapeAnalyzer {
         escapes = false;
         fullyConsumes = true;
       }
+      void visitArrayRMW(ArrayRMW* curr) {
+        if (curr->ref == child) {
+          escapes = false;
+          fullyConsumes = true;
+        }
+      }
+      void visitArrayCmpxchg(ArrayCmpxchg* curr) {
+        if (curr->ref == child || curr->expected == child) {
+          escapes = false;
+          fullyConsumes = true;
+        }
+      }
       // TODO other GC operations
     } checker;
 

src/passes/TypeGeneralizing.cpp

@@ -727,6 +727,10 @@ struct TransferFn : OverriddenVisitor<TransferFn> {
     }
   }
 
+  void visitArrayRMW(ArrayRMW* curr) { WASM_UNREACHABLE("TODO"); }
+
+  void visitArrayCmpxchg(ArrayCmpxchg* curr) { WASM_UNREACHABLE("TODO"); }
+
   HeapType
   generalizeArrayType(HeapType type,
                       std::optional<Type> reqFieldType = std::nullopt) {