wasm2js: Fix null handling and RefAsNonNull (#6656)

2 files changed, 31 insertions, 27 deletions

diff --git a/src/emscripten-optimizer/optimizer-shared.cpp b/src/emscripten-optimizer/optimizer-shared.cpp
index 773c5d9fc..f4482aa09 100644
--- a/src/emscripten-optimizer/optimizer-shared.cpp
+++ b/src/emscripten-optimizer/optimizer-shared.cpp
@@ -17,6 +17,7 @@
 #include <limits>
 
 #include "optimizer.h"
+#include "shared-constants.h"
 #include "support/safe_integer.h"
 
 using namespace cashew;
@@ -33,17 +34,14 @@ Ref makeJsCoercedZero(JsType type) {
   switch (type) {
     case JS_INT:
       return ValueBuilder::makeNum(0);
-      break;
     case JS_DOUBLE:
       return ValueBuilder::makeUnary(PLUS, ValueBuilder::makeNum(0));
-      break;
     case JS_FLOAT: {
       if (!JS_FLOAT_ZERO.isNull()) {
         return ValueBuilder::makeName(JS_FLOAT_ZERO);
       } else {
         return ValueBuilder::makeCall(MATH_FROUND, ValueBuilder::makeNum(0));
       }
-      break;
     }
     case JS_FLOAT32X4: {
       return ValueBuilder::makeCall(SIMD_FLOAT32X4,
@@ -51,12 +49,10 @@ Ref makeJsCoercedZero(JsType type) {
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0));
-      break;
     }
     case JS_FLOAT64X2: {
       return ValueBuilder::makeCall(
         SIMD_FLOAT64X2, ValueBuilder::makeNum(0), ValueBuilder::makeNum(0));
-      break;
     }
     case JS_INT8X16: {
       return ValueBuilder::makeCall(SIMD_INT8X16,
@@ -76,7 +72,6 @@ Ref makeJsCoercedZero(JsType type) {
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0));
-      break;
     }
     case JS_INT16X8: {
       return ValueBuilder::makeCall(SIMD_INT16X8,
@@ -88,7 +83,6 @@ Ref makeJsCoercedZero(JsType type) {
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0));
-      break;
     }
     case JS_INT32X4: {
       return ValueBuilder::makeCall(SIMD_INT32X4,
@@ -96,7 +90,9 @@ Ref makeJsCoercedZero(JsType type) {
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0),
                                     ValueBuilder::makeNum(0));
-      break;
+    }
+    case JS_REF: {
+      return ValueBuilder::makeName(wasm::NULL_);
     }
     default:
       assert(0);
diff --git a/src/wasm2js.h b/src/wasm2js.h
index dd4e61a51..034212b79 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -846,44 +846,45 @@ void Wasm2JSBuilder::addExports(Ref ast, Module* wasm) {
 }
 
 void Wasm2JSBuilder::addGlobal(Ref ast, Global* global) {
-  if (auto* const_ = global->init->dynCast<Const>()) {
-    Ref theValue;
+  Ref theVar = ValueBuilder::makeVar();
+  ast->push_back(theVar);
+
+  auto* init = global->init;
+  Ref value;
+
+  if (auto* const_ = init->dynCast<Const>()) {
     TODO_SINGLE_COMPOUND(const_->type);
     switch (const_->type.getBasic()) {
       case Type::i32: {
-        theValue = ValueBuilder::makeInt(const_->value.geti32());
+        value = ValueBuilder::makeInt(const_->value.geti32());
         break;
       }
       case Type::f32: {
-        theValue = ValueBuilder::makeCall(
+        value = ValueBuilder::makeCall(
           MATH_FROUND,
           makeJsCoercion(ValueBuilder::makeDouble(const_->value.getf32()),
                          JS_DOUBLE));
         break;
       }
       case Type::f64: {
-        theValue = makeJsCoercion(
-          ValueBuilder::makeDouble(const_->value.getf64()), JS_DOUBLE);
+        value = makeJsCoercion(ValueBuilder::makeDouble(const_->value.getf64()),
+                               JS_DOUBLE);
         break;
       }
       default: {
         assert(false && "Top const type not supported");
       }
     }
-    Ref theVar = ValueBuilder::makeVar();
-    ast->push_back(theVar);
-    ValueBuilder::appendToVar(
-      theVar, fromName(global->name, NameScope::Top), theValue);
-  } else if (auto* get = global->init->dynCast<GlobalGet>()) {
-    Ref theVar = ValueBuilder::makeVar();
-    ast->push_back(theVar);
-    ValueBuilder::appendToVar(
-      theVar,
-      fromName(global->name, NameScope::Top),
-      ValueBuilder::makeName(fromName(get->name, NameScope::Top)));
+  } else if (auto* get = init->dynCast<GlobalGet>()) {
+    value = ValueBuilder::makeName(fromName(get->name, NameScope::Top));
+  } else if (init->is<RefNull>()) {
+    value = ValueBuilder::makeName(NULL_);
   } else {
     assert(false && "Top init type not supported");
   }
+
+  ValueBuilder::appendToVar(
+    theVar, fromName(global->name, NameScope::Top), value);
 }
 
 Ref Wasm2JSBuilder::processFunction(Module* m,
@@ -2415,8 +2416,15 @@ Ref Wasm2JSBuilder::processFunctionBody(Module* m,
       WASM_UNREACHABLE("unimp");
     }
     Ref visitRefAs(RefAs* curr) {
-      unimplemented(curr);
-      WASM_UNREACHABLE("unimp");
+      // TODO: support others
+      assert(curr->op == RefAsNonNull);
+
+      // value || trap()
+      ABI::wasm2js::ensureHelpers(module, ABI::wasm2js::TRAP);
+      return ValueBuilder::makeBinary(
+        visit(curr->value, EXPRESSION_RESULT),
+        IString("||"),
+        ValueBuilder::makeCall(ABI::wasm2js::TRAP));
     }
 
     Ref visitContBind(ContBind* curr) {