Merge pull request #110 from sjrd/remove-defaults

Generate defaults from IR types instead of from Wasm types.

Author: tanishiking

Diff for: wasm/src/main/scala/ir2wasm/HelperFunctions.scala

@@ -15,7 +15,6 @@ import wasm.wasm4s.WasmInstr._
 
 import EmbeddedConstants._
 import TypeTransformer._
-import wasm4s.Defaults
 
 object HelperFunctions {
 
@@ -1878,7 +1877,7 @@ object HelperFunctions {
     assert(clazz.hasDirectInstances)
 
     val structName = WasmTypeName.WasmStructTypeName.forClass(className)
-    val fctx = WasmFunctionContext(
+    implicit val fctx = WasmFunctionContext(
       Names.WasmFunctionName.newDefault(className),
       Nil,
       List(WasmRefType(structName))
@@ -1895,8 +1894,7 @@ object HelperFunctions {
       instrs += REF_NULL(WasmHeapType(WasmArrayTypeName.itables))
 
     classInfo.allFieldDefs.foreach { f =>
-      val ty = transformType(f.ftpe)
-      instrs += Defaults.defaultValue(ty)
+      WasmExpressionBuilder.generateIRBody(IRTypes.zeroOf(f.ftpe)(clazz.pos), f.ftpe)
     }
     instrs += STRUCT_NEW(structName)
 

Diff for: wasm/src/main/scala/ir2wasm/WasmBuilder.scala

@@ -18,8 +18,6 @@ import org.scalajs.linker.interface.unstable.RuntimeClassNameMapperImpl
 import org.scalajs.linker.standard.{CoreSpec, LinkedClass, LinkedTopLevelExport}
 
 import collection.mutable
-import java.awt.Window.Type
-import _root_.wasm4s.Defaults
 
 import EmbeddedConstants._
 
@@ -67,11 +65,10 @@ class WasmBuilder(coreSpec: CoreSpec) {
       field @ IRTrees.FieldDef(flags, name, _, ftpe) <- clazz.fields
       if flags.namespace.isStatic
     } {
-      val typ = transformType(ftpe)
       val global = WasmGlobal(
         WasmGlobalName.forStaticField(name.name),
-        typ,
-        WasmExpr(List(Defaults.defaultValue(typ))),
+        transformType(ftpe),
+        WasmExpr(List(genStaticVarInit(ftpe))),
         isMutable = true
       )
       ctx.addGlobal(global)
@@ -96,6 +93,21 @@ class WasmBuilder(coreSpec: CoreSpec) {
     }
   }
 
+  private def genStaticVarInit(tpe: IRTypes.Type)(implicit ctx: WasmContext): WasmInstr = {
+    import IRTypes._
+
+    tpe match {
+      case BooleanType | CharType | ByteType | ShortType | IntType => I32_CONST(0)
+      case LongType                                                => I64_CONST(0L)
+      case FloatType                                               => F32_CONST(0.0f)
+      case DoubleType                                              => F64_CONST(0.0)
+      case AnyType | ClassType(_) | ArrayType(_) | NullType        => REF_NULL(WasmHeapType.None)
+
+      case NoType | NothingType | StringType | UndefType | _: RecordType =>
+        throw new AssertionError(s"Unexpected type for static variable: ${tpe.show()}")
+    }
+  }
+
   def genArrayClasses()(implicit ctx: WasmContext): Unit = {
     import WasmTypeName.WasmStructTypeName
 

Diff for: wasm/src/main/scala/ir2wasm/WasmExpressionBuilder.scala

@@ -16,7 +16,6 @@ import wasm4s.WasmInstr._
 import org.scalajs.ir.Types.ClassType
 import org.scalajs.ir.ClassKind
 import org.scalajs.ir.Position
-import _root_.wasm4s.Defaults
 
 import EmbeddedConstants._