Remove the remaining encoding decisions from Types.

Use `VarGen.genTypeName` instead.

Author: sjrd

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

@@ -295,14 +295,14 @@ object HelperFunctions {
     val fctx = WasmFunctionContext(
       genFunctionName.createClassOf,
       List("typeData" -> typeDataType),
-      List(WasmRefType(WasmHeapType.ClassType))
+      List(WasmRefType(genTypeName.ClassStruct))
     )
 
     val List(typeDataParam) = fctx.paramIndices
 
     import fctx.instrs
 
-    val classInstanceLocal = fctx.addLocal("classInstance", WasmRefType(WasmHeapType.ClassType))
+    val classInstanceLocal = fctx.addLocal("classInstance", WasmRefType(genTypeName.ClassStruct))
 
     // classInstance := newDefault$java.lang.Class()
     // leave it on the stack for the constructor call
@@ -413,14 +413,14 @@ object HelperFunctions {
     val fctx = WasmFunctionContext(
       genFunctionName.getClassOf,
       List("typeData" -> typeDataType),
-      List(WasmRefType(WasmHeapType.ClassType))
+      List(WasmRefType(genTypeName.ClassStruct))
     )
 
     val List(typeDataParam) = fctx.paramIndices
 
     import fctx.instrs
 
-    instrs.block(WasmRefType(WasmHeapType.ClassType)) { alreadyInitializedLabel =>
+    instrs.block(WasmRefType(genTypeName.ClassStruct)) { alreadyInitializedLabel =>
       // fast path
       instrs += LOCAL_GET(typeDataParam)
       instrs += STRUCT_GET(genTypeName.typeData, genFieldIdx.typeData.classOfIdx)
@@ -976,7 +976,7 @@ object HelperFunctions {
     val fctx = WasmFunctionContext(
       genFunctionName.getComponentType,
       List("typeData" -> typeDataType),
-      List(WasmRefType.nullable(WasmHeapType.ClassType))
+      List(WasmRefType.nullable(genTypeName.ClassStruct))
     )
 
     val List(typeDataParam) = fctx.paramIndices
@@ -997,7 +997,7 @@ object HelperFunctions {
       instrs += CALL(genFunctionName.getClassOf)
       instrs += RETURN
     } // end block nullResultLabel
-    instrs += REF_NULL(WasmHeapType.ClassType)
+    instrs += REF_NULL(WasmHeapType(genTypeName.ClassStruct))
 
     fctx.buildAndAddToContext()
   }
@@ -1013,7 +1013,7 @@ object HelperFunctions {
     val fctx = WasmFunctionContext(
       genFunctionName.newArrayOfThisClass,
       List("typeData" -> typeDataType, "lengths" -> WasmRefType.anyref),
-      List(WasmRefType(WasmHeapType.ObjectType))
+      List(WasmRefType(genTypeName.ObjectStruct))
     )
 
     val List(typeDataParam, lengthsParam) = fctx.paramIndices
@@ -1090,7 +1090,7 @@ object HelperFunctions {
     val fctx = WasmFunctionContext(
       genFunctionName.anyGetClass,
       List("value" -> WasmRefType.any),
-      List(WasmRefType.nullable(WasmHeapType.ClassType))
+      List(WasmRefType.nullable(genTypeName.ClassStruct))
     )
 
     val List(valueParam) = fctx.paramIndices
@@ -1100,20 +1100,20 @@ object HelperFunctions {
     val typeDataLocal = fctx.addLocal("typeData", typeDataType)
     val doubleValueLocal = fctx.addLocal("doubleValue", WasmFloat64)
     val intValueLocal = fctx.addLocal("intValue", WasmInt32)
-    val ourObjectLocal = fctx.addLocal("ourObject", WasmRefType(WasmHeapType.ObjectType))
+    val ourObjectLocal = fctx.addLocal("ourObject", WasmRefType(genTypeName.ObjectStruct))
 
     def getHijackedClassTypeDataInstr(className: IRNames.ClassName): WasmInstr =
       GLOBAL_GET(genGlobalName.forVTable(className))
 
-    instrs.block(WasmRefType.nullable(WasmHeapType.ClassType)) { nonNullClassOfLabel =>
+    instrs.block(WasmRefType.nullable(genTypeName.ClassStruct)) { nonNullClassOfLabel =>
       instrs.block(typeDataType) { gotTypeDataLabel =>
-        instrs.block(WasmRefType(WasmHeapType.ObjectType)) { ourObjectLabel =>
+        instrs.block(WasmRefType(genTypeName.ObjectStruct)) { ourObjectLabel =>
           // if value is our object, jump to $ourObject
           instrs += LOCAL_GET(valueParam)
           instrs += BR_ON_CAST(
             ourObjectLabel,
             WasmRefType.any,
-            WasmRefType(WasmHeapType.ObjectType)
+            WasmRefType(genTypeName.ObjectStruct)
           )
 
           // switch(jsValueType(value)) { ... }
@@ -1209,7 +1209,7 @@ object HelperFunctions {
             }
           ) { () =>
             // case _ (JSValueTypeOther) => return null
-            instrs += REF_NULL(WasmHeapType.ClassType)
+            instrs += REF_NULL(WasmHeapType(genTypeName.ClassStruct))
             instrs += RETURN
           }
 
@@ -1263,7 +1263,7 @@ object HelperFunctions {
     val objectVTableType = WasmRefType(genTypeName.ObjectVTable)
     val arrayTypeDataType = objectVTableType
     val itablesType = WasmRefType.nullable(genTypeName.itables)
-    val nonNullObjectType = WasmRefType(WasmHeapType.ObjectType)
+    val nonNullObjectType = WasmRefType(genTypeName.ObjectStruct)
     val anyArrayType = WasmRefType(genTypeName.anyArray)
 
     val fctx = WasmFunctionContext(
@@ -1478,7 +1478,7 @@ object HelperFunctions {
     instrs += LOCAL_TEE(objNonNullLocal)
 
     // If `obj` is one of our objects, skip all the jsValueType tests
-    instrs += REF_TEST(WasmRefType(WasmHeapType.ObjectType))
+    instrs += REF_TEST(WasmRefType(genTypeName.ObjectStruct))
     instrs += I32_EQZ
     instrs.ifThen() {
       instrs.switch() { () =>
@@ -1690,11 +1690,11 @@ object HelperFunctions {
       instrs += BR_ON_CAST_FAIL(
         testFail,
         WasmRefType.anyref,
-        WasmRefType(Types.WasmHeapType.ObjectType)
+        WasmRefType(genTypeName.ObjectStruct)
       )
 
       // get itables and store
-      instrs += STRUCT_GET(Types.WasmHeapType.ObjectType.typ, genFieldIdx.objStruct.itables)
+      instrs += STRUCT_GET(genTypeName.ObjectStruct, genFieldIdx.objStruct.itables)
       instrs += LOCAL_SET(itables)
 
       // Dummy return value from the block
@@ -1767,8 +1767,8 @@ object HelperFunctions {
         WasmHeapType(genTypeName.forClass(clazz.name.name))
       val fctx = WasmFunctionContext(
         genFunctionName.clone(clazz.name.name),
-        List("from" -> WasmRefType(WasmHeapType.ObjectType)),
-        List(WasmRefType(WasmHeapType.ObjectType))
+        List("from" -> WasmRefType(genTypeName.ObjectStruct)),
+        List(WasmRefType(genTypeName.ObjectStruct))
       )
       val List(fromParam) = fctx.paramIndices
       import fctx.instrs
@@ -1811,8 +1811,8 @@ object HelperFunctions {
 
     val fctx = WasmFunctionContext(
       genFunctionName.clone(arrayTypeRef.base),
-      List("from" -> WasmRefType(WasmHeapType.ObjectType)),
-      List(WasmRefType(WasmHeapType.ObjectType))
+      List("from" -> WasmRefType(genTypeName.ObjectStruct)),
+      List(WasmRefType(genTypeName.ObjectStruct))
     )
     val List(fromParam) = fctx.paramIndices
     import fctx.instrs

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

@@ -57,7 +57,7 @@ object TypeTransformer {
     if (info.isAncestorOfHijackedClass)
       Types.WasmRefType.anyref
     else if (info.isInterface)
-      Types.WasmRefType.nullable(Types.WasmHeapType.ObjectType)
+      Types.WasmRefType.nullable(genTypeName.ObjectStruct)
     else
       Types.WasmRefType.nullable(genTypeName.forClass(className))
   }

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

@@ -403,6 +403,11 @@ object VarGen {
     def forClass(name: ClassName): WasmTypeName =
       WasmTypeName(s"c.L${name.nameString}")
 
+    val ObjectStruct = forClass(ObjectClass)
+    val ClassStruct = forClass(ClassClass)
+    val ThrowableStruct = forClass(ThrowableClass)
+    val JSExceptionStruct = forClass(SpecialNames.JSExceptionClass)
+
     def captureData(index: Int): WasmTypeName =
       WasmTypeName(s"captureData.$index")
 

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

@@ -360,7 +360,7 @@ class WasmBuilder(coreSpec: CoreSpec) {
         // name - initially `null`; filled in by the `typeDataName` helper
         REF_NULL(WasmHeapType.Any),
         // the classOf instance - initially `null`; filled in by the `createClassOf` helper
-        REF_NULL(WasmHeapType.ClassType),
+        REF_NULL(WasmHeapType(genTypeName.ClassStruct)),
         // arrayOf, the typeData of an array of this type - initially `null`; filled in by the `arrayTypeData` helper
         REF_NULL(WasmHeapType(genTypeName.ObjectVTable)),
         // clonefFunction - will be invoked from `clone()` method invokaion on the class

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

@@ -308,8 +308,8 @@ final class WasmContext extends TypeDefinableWasmContext {
   val cloneFunctionTypeName: WasmTypeName =
     addFunctionTypeInMainRecType(
       WasmFunctionSignature(
-        List(WasmRefType(WasmHeapType.ObjectType)),
-        List(WasmRefType(WasmHeapType.ObjectType))
+        List(WasmRefType(genTypeName.ObjectStruct)),
+        List(WasmRefType(genTypeName.ObjectStruct))
       )
     )
 
@@ -335,7 +335,7 @@ final class WasmContext extends TypeDefinableWasmContext {
       WasmStructField(strictAncestors, nullable(genTypeName.typeDataArray), isMutable = false),
       WasmStructField(componentType, nullable(genTypeName.typeData), isMutable = false),
       WasmStructField(name, anyref, isMutable = true),
-      WasmStructField(classOfValue, nullable(WasmHeapType.ClassType), isMutable = true),
+      WasmStructField(classOfValue, nullable(genTypeName.ClassStruct), isMutable = true),
       WasmStructField(arrayOf, nullable(genTypeName.ObjectVTable), isMutable = true),
       WasmStructField(cloneFunction, nullable(cloneFunctionTypeName), isMutable = false),
       WasmStructField(

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

@@ -388,7 +388,7 @@ private class WasmExpressionBuilder private (
         instrs += BR_ON_CAST_FAIL(
           labelNotOurObject,
           Types.WasmRefType.any,
-          Types.WasmRefType(Types.WasmHeapType.ObjectType)
+          Types.WasmRefType(genTypeName.ObjectStruct)
         )
         instrs += STRUCT_GET(
           genTypeName.forClass(IRNames.ObjectClass),
@@ -430,16 +430,15 @@ private class WasmExpressionBuilder private (
      * This is used in the code paths where we have already ruled out `null`
      * values and primitive values (that implement hijacked classes).
      */
-    val heapTypeForDispatch: Types.WasmHeapType = {
+    val refTypeForDispatch: Types.WasmRefType = {
       if (receiverClassInfo.isInterface)
-        Types.WasmHeapType.ObjectType
+        Types.WasmRefType(genTypeName.ObjectStruct)
       else
-        Types.WasmHeapType(genTypeName.forClass(receiverClassName))
+        Types.WasmRefType(genTypeName.forClass(receiverClassName))
     }
 
     // A local for a copy of the receiver that we will use to resolve dispatch
-    val receiverLocalForDispatch =
-      fctx.addSyntheticLocal(Types.WasmRefType(heapTypeForDispatch))
+    val receiverLocalForDispatch = fctx.addSyntheticLocal(refTypeForDispatch)
 
     /* Gen loading of the receiver and check that it is non-null.
      * After this codegen, the non-null receiver is on the stack.
@@ -535,11 +534,7 @@ private class WasmExpressionBuilder private (
             argsLocals
           }
 
-          instrs += BR_ON_CAST_FAIL(
-            labelNotOurObject,
-            Types.WasmRefType.any,
-            Types.WasmRefType(heapTypeForDispatch)
-          )
+          instrs += BR_ON_CAST_FAIL(labelNotOurObject, Types.WasmRefType.any, refTypeForDispatch)
           instrs += LOCAL_TEE(receiverLocalForDispatch)
           pushArgs(argsLocals)
           genTableDispatch(receiverClassInfo, t.method.name, receiverLocalForDispatch)
@@ -835,7 +830,7 @@ private class WasmExpressionBuilder private (
   }
 
   private def genClassOfFromTypeData(loadTypeDataInstr: WasmInstr): Unit = {
-    instrs.block(Types.WasmRefType(Types.WasmHeapType.ClassType)) { nonNullLabel =>
+    instrs.block(Types.WasmRefType(genTypeName.ClassStruct)) { nonNullLabel =>
       // fast path first
       instrs += loadTypeDataInstr
       instrs += STRUCT_GET(genTypeName.typeData, genFieldIdx.typeData.classOfIdx)
@@ -1249,7 +1244,7 @@ private class WasmExpressionBuilder private (
 
         // A local for a copy of the receiver that we will use to resolve dispatch
         val receiverLocalForDispatch =
-          fctx.addSyntheticLocal(Types.WasmRefType(Types.WasmHeapType.ObjectType))
+          fctx.addSyntheticLocal(Types.WasmRefType(genTypeName.ObjectStruct))
 
         val objectClassInfo = ctx.getClassInfo(IRNames.ObjectClass)
 
@@ -1309,7 +1304,7 @@ private class WasmExpressionBuilder private (
               instrs += BR_ON_CAST_FAIL(
                 labelNotOurObject,
                 Types.WasmRefType.anyref,
-                Types.WasmRefType(Types.WasmHeapType.ObjectType)
+                Types.WasmRefType(genTypeName.ObjectStruct)
               )
               instrs += LOCAL_TEE(receiverLocalForDispatch)
               genTableDispatch(objectClassInfo, toStringMethodName, receiverLocalForDispatch)
@@ -1569,7 +1564,7 @@ private class WasmExpressionBuilder private (
               Types.WasmRefType.nullable(genTypeName.forClass(targetClassName))
             )
           } else if (info.isInterface) {
-            instrs += REF_CAST(Types.WasmRefType.nullable(Types.WasmHeapType.ObjectType))
+            instrs += REF_CAST(Types.WasmRefType.nullable(genTypeName.ObjectStruct))
           }
 
         case IRTypes.ArrayType(arrayTypeRef) =>
@@ -1971,7 +1966,7 @@ private class WasmExpressionBuilder private (
 
   private def genWrapAsThrowable(tree: IRTrees.WrapAsThrowable): IRTypes.Type = {
     val throwableClassType = IRTypes.ClassType(IRNames.ThrowableClass)
-    val nonNullThrowableTyp = Types.WasmRefType(Types.WasmHeapType.ThrowableType)
+    val nonNullThrowableTyp = Types.WasmRefType(genTypeName.ThrowableStruct)
 
     val jsExceptionTyp =
       TypeTransformer.transformClassType(SpecialNames.JSExceptionClass)(ctx).toNonNullable
@@ -2021,8 +2016,8 @@ private class WasmExpressionBuilder private (
       // if !expr.isInstanceOf[js.JavaScriptException], then br $done
       instrs += BR_ON_CAST_FAIL(
         doneLabel,
-        Types.WasmRefType(Types.WasmHeapType.ThrowableType),
-        Types.WasmRefType(Types.WasmHeapType.JSExceptionType)
+        Types.WasmRefType(genTypeName.ThrowableStruct),
+        Types.WasmRefType(genTypeName.JSExceptionStruct)
       )
 
       // otherwise, unwrap the JavaScriptException by reading its field
@@ -2486,7 +2481,7 @@ private class WasmExpressionBuilder private (
 
     fctx.markPosition(t)
 
-    instrs += REF_CAST(Types.WasmRefType(Types.WasmHeapType.ObjectType))
+    instrs += REF_CAST(Types.WasmRefType(genTypeName.ObjectStruct))
     instrs += LOCAL_TEE(expr)
     instrs += REF_AS_NOT_NULL // cloneFunction argument is not nullable
 

Diff for: wasm/src/main/scala/wasm4s/Types.scala

@@ -4,9 +4,6 @@ import org.scalajs.ir.{Names => IRNames}
 import Names._
 import Names.WasmTypeName._
 
-import wasm.ir2wasm.SpecialNames
-import wasm.ir2wasm.VarGen._
-
 object Types {
   sealed trait WasmStorageType
 
@@ -93,10 +90,5 @@ object Types {
 
     def apply(typ: WasmTypeName): WasmHeapType.Type =
       WasmHeapType.Type(typ)
-
-    val ObjectType = Type(genTypeName.forClass(IRNames.ObjectClass))
-    val ClassType = Type(genTypeName.forClass(IRNames.ClassClass))
-    val ThrowableType = Type(genTypeName.forClass(IRNames.ThrowableClass))
-    val JSExceptionType = Type(genTypeName.forClass(SpecialNames.JSExceptionClass))
   }
 }