Merge pull request #126 from sjrd/simplify-wasm-context

Simplify WasmContext.

Author: sjrd

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/ClassEmitter.scala

@@ -143,7 +143,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
       )
       val xParam = fb.addParam("x", WasmRefType.anyref)
       fb.setResultType(WasmInt32)
-      fb.setFunctionType(ctx.isJSClassInstanceFuncTypeName)
+      fb.setFunctionType(genTypeName.isJSClassInstanceFuncType)
 
       val instrs = fb
 
@@ -373,7 +373,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
       case None    => genTypeName.typeData
       case Some(s) => genTypeName.forVTable(s)
     }
-    val structType = WasmStructType(ctx.typeDataStructFields ::: vtableFields)
+    val structType = WasmStructType(CoreWasmLib.typeDataStructFields ::: vtableFields)
     val subType = WasmSubType(typeName, isFinal = false, Some(superType), structType)
     ctx.mainRecType.addSubType(subType)
     typeName
@@ -533,7 +533,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
     )
     val fromParam = fb.addParam("from", WasmRefType(genTypeName.ObjectStruct))
     fb.setResultType(WasmRefType(genTypeName.ObjectStruct))
-    fb.setFunctionType(ctx.cloneFunctionTypeName)
+    fb.setFunctionType(genTypeName.cloneFunctionType)
 
     val instrs = fb
 

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/CoreWasmLib.scala

@@ -22,6 +22,42 @@ object CoreWasmLib {
 
   private implicit val noPos: Position = Position.NoPosition
 
+  /** Fields of the `typeData` struct definition.
+    *
+    * They are accessible as a public list because they must be repeated in every vtable type
+    * definition.
+    *
+    * @see
+    *   [[VarGen.genFieldName.typeData]], which contains documentation of what is in each field.
+    */
+  val typeDataStructFields: List[WasmStructField] = {
+    import genFieldName.typeData._
+    import WasmRefType.nullable
+    List(
+      WasmStructField(nameOffset, WasmInt32, isMutable = false),
+      WasmStructField(nameSize, WasmInt32, isMutable = false),
+      WasmStructField(nameStringIndex, WasmInt32, isMutable = false),
+      WasmStructField(kind, WasmInt32, isMutable = false),
+      WasmStructField(specialInstanceTypes, WasmInt32, isMutable = false),
+      WasmStructField(strictAncestors, nullable(genTypeName.typeDataArray), isMutable = false),
+      WasmStructField(componentType, nullable(genTypeName.typeData), isMutable = false),
+      WasmStructField(name, WasmRefType.anyref, isMutable = true),
+      WasmStructField(classOfValue, nullable(genTypeName.ClassStruct), isMutable = true),
+      WasmStructField(arrayOf, nullable(genTypeName.ObjectVTable), isMutable = true),
+      WasmStructField(cloneFunction, nullable(genTypeName.cloneFunctionType), isMutable = false),
+      WasmStructField(
+        isJSClassInstance,
+        nullable(genTypeName.isJSClassInstanceFuncType),
+        isMutable = false
+      ),
+      WasmStructField(
+        reflectiveProxies,
+        WasmRefType(genTypeName.reflectiveProxies),
+        isMutable = false
+      )
+    )
+  }
+
   /** Generates definitions that must come *before* the code generated for regular classes.
     *
     * This notably includes the `typeData` definitions, since the vtable of `jl.Object` is a subtype
@@ -66,6 +102,19 @@ object CoreWasmLib {
   }
 
   private def genCoreTypesInRecType()(implicit ctx: WasmContext): Unit = {
+    ctx.mainRecType.addSubType(
+      genTypeName.cloneFunctionType,
+      WasmFunctionType(
+        List(WasmRefType(genTypeName.ObjectStruct)),
+        List(WasmRefType(genTypeName.ObjectStruct))
+      )
+    )
+
+    ctx.mainRecType.addSubType(
+      genTypeName.isJSClassInstanceFuncType,
+      WasmFunctionType(List(WasmRefType.anyref), List(WasmInt32))
+    )
+
     ctx.mainRecType.addSubType(
       genTypeName.typeDataArray,
       WasmArrayType(WasmFieldType(WasmRefType(genTypeName.typeData), isMutable = false))
@@ -84,7 +133,7 @@ object CoreWasmLib {
         genTypeName.typeData,
         isFinal = false,
         None,
-        WasmStructType(ctx.typeDataStructFields)
+        WasmStructType(typeDataStructFields)
       )
     )
 
@@ -148,7 +197,7 @@ object CoreWasmLib {
 
   private def genTags()(implicit ctx: WasmContext): Unit = {
     val exceptionSig = WasmFunctionSignature(List(WasmRefType.externref), Nil)
-    val typeName = ctx.addFunctionType(exceptionSig)
+    val typeName = ctx.moduleBuilder.signatureToTypeName(exceptionSig)
     ctx.moduleBuilder.addImport(
       WasmImport(
         "__scalaJSHelpers",
@@ -287,7 +336,7 @@ object CoreWasmLib {
         results: List[WasmType]
     ): Unit = {
       val sig = WasmFunctionSignature(params, results)
-      val typeName = ctx.addFunctionType(sig)
+      val typeName = ctx.moduleBuilder.signatureToTypeName(sig)
       ctx.moduleBuilder.addImport(
         WasmImport("__scalaJSHelpers", name.name, WasmImportDesc.Func(name, typeName))
       )
@@ -932,7 +981,7 @@ object CoreWasmLib {
         instrs += REF_NULL(WasmHeapType.None) // arrayOf
 
         // clone
-        instrs.switch(WasmRefType(ctx.cloneFunctionTypeName)) { () =>
+        instrs.switch(WasmRefType(genTypeName.cloneFunctionType)) { () =>
           instrs += LOCAL_GET(typeDataParam)
           instrs += STRUCT_GET(genTypeName.typeData, genFieldIdx.typeData.kindIdx)
         }(
@@ -1104,7 +1153,7 @@ object CoreWasmLib {
           instrs += BR_ON_NULL(isJSClassInstanceIsNull)
 
           // Call the function
-          instrs += CALL_REF(ctx.isJSClassInstanceFuncTypeName)
+          instrs += CALL_REF(genTypeName.isJSClassInstanceFuncType)
           instrs += RETURN
         }
         instrs += DROP // drop `value` which was left on the stack
@@ -2073,7 +2122,7 @@ object CoreWasmLib {
     val fb = newFunctionBuilder(genFunctionName.clone(baseRef))
     val fromParam = fb.addParam("from", WasmRefType(genTypeName.ObjectStruct))
     fb.setResultType(WasmRefType(genTypeName.ObjectStruct))
-    fb.setFunctionType(ctx.cloneFunctionTypeName)
+    fb.setFunctionType(genTypeName.cloneFunctionType)
 
     val instrs = fb
 

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/FunctionEmitter.scala

@@ -47,7 +47,7 @@ object FunctionEmitter {
       restParam: Option[IRTrees.ParamDef],
       body: IRTrees.Tree,
       resultType: IRTypes.Type
-  )(implicit ctx: TypeDefinableWasmContext, pos: Position): Unit = {
+  )(implicit ctx: WasmContext, pos: Position): Unit = {
     val emitter = prepareEmitter(
       functionName,
       enclosingClassName,
@@ -69,7 +69,7 @@ object FunctionEmitter {
       enclosingClassName: IRNames.ClassName,
       jsClassCaptures: List[IRTrees.ParamDef],
       ctor: IRTrees.JSConstructorDef
-  )(implicit ctx: TypeDefinableWasmContext): Unit = {
+  )(implicit ctx: WasmContext): Unit = {
     implicit val pos = ctor.pos
 
     val allCtorParams = ctor.args ::: ctor.restParam.toList
@@ -148,7 +148,7 @@ object FunctionEmitter {
       receiverTyp: Option[Types.WasmType],
       paramDefs: List[IRTrees.ParamDef],
       resultTypes: List[Types.WasmType]
-  )(implicit ctx: TypeDefinableWasmContext, pos: Position): FunctionEmitter = {
+  )(implicit ctx: WasmContext, pos: Position): FunctionEmitter = {
     val fb = new FunctionBuilder(ctx.moduleBuilder, functionName, pos)
 
     def addCaptureLikeParamListAndMakeEnv(
@@ -250,7 +250,7 @@ object FunctionEmitter {
 }
 
 private class FunctionEmitter private (
-    ctx: TypeDefinableWasmContext,
+    ctx: WasmContext,
     val fb: FunctionBuilder,
     enclosingClassName: Option[IRNames.ClassName],
     _newTargetStorage: Option[FunctionEmitter.VarStorage.Local],
@@ -2668,7 +2668,7 @@ private class FunctionEmitter private (
       genFieldIdx.typeData.cloneFunctionIdx
     )
     // cloneFunction: (ref j.l.Object) -> ref j.l.Object
-    instrs += CALL_REF(ctx.cloneFunctionTypeName)
+    instrs += CALL_REF(genTypeName.cloneFunctionType)
 
     t.tpe match {
       case ClassType(className) =>

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/SWasmGen.scala

@@ -50,7 +50,7 @@ object SWasmGen {
   }
 
   def genLoadJSConstructor(fb: FunctionBuilder, className: ClassName)(implicit
-      ctx: TypeDefinableWasmContext
+      ctx: WasmContext
   ): Unit = {
     val info = ctx.getClassInfo(className)
 
@@ -65,7 +65,7 @@ object SWasmGen {
   }
 
   def genLoadJSFromSpec(fb: FunctionBuilder, loadSpec: JSNativeLoadSpec)(implicit
-      ctx: TypeDefinableWasmContext
+      ctx: WasmContext
   ): Unit = {
     def genFollowPath(path: List[String]): Unit = {
       for (prop <- path) {

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/SpecialNames.scala

@@ -23,4 +23,7 @@ object SpecialNames {
   val JSExceptionField = FieldName(JSExceptionClass, SimpleFieldName("exception"))
 
   val hashCodeMethodName = MethodName("hashCode", Nil, IntRef)
+
+  /** A unique simple method name to map all method *signatures* into `MethodName`s. */
+  val normalizedSimpleMethodName = SimpleMethodName("m")
 }

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/TypeTransformer.scala

@@ -24,7 +24,7 @@ object TypeTransformer {
     */
   def transformResultType(
       t: IRTypes.Type
-  )(implicit ctx: ReadOnlyWasmContext): List[Types.WasmType] =
+  )(implicit ctx: WasmContext): List[Types.WasmType] =
     t match {
       case IRTypes.NoType      => Nil
       case IRTypes.NothingType => Nil
@@ -36,7 +36,7 @@ object TypeTransformer {
     * This method cannot be used for `void` and `nothing`, since they have no corresponding Wasm
     * value type.
     */
-  def transformType(t: IRTypes.Type)(implicit ctx: ReadOnlyWasmContext): Types.WasmType =
+  def transformType(t: IRTypes.Type)(implicit ctx: WasmContext): Types.WasmType =
     t match {
       case IRTypes.AnyType => Types.WasmRefType.anyref
 
@@ -51,7 +51,7 @@ object TypeTransformer {
 
   def transformClassType(
       className: IRNames.ClassName
-  )(implicit ctx: ReadOnlyWasmContext): Types.WasmRefType = {
+  )(implicit ctx: WasmContext): Types.WasmRefType = {
     val info = ctx.getClassInfo(className)
     if (info.isAncestorOfHijackedClass)
       Types.WasmRefType.anyref

Diff for: wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/VarGen.scala

@@ -500,7 +500,11 @@ object VarGen {
 
     def forFunction(idx: Int): WasmTypeName = WasmTypeName(s"f.$idx")
 
-    def forRecFunction(idx: Int): WasmTypeName = WasmTypeName(s"recf.$idx")
+    val cloneFunctionType = WasmTypeName("cloneFuncType")
+    val isJSClassInstanceFuncType = WasmTypeName("isJSClassInstanceFuncType")
+
+    def forTableFunctionType(methodName: MethodName): WasmTypeName =
+      WasmTypeName("m." + methodName.nameString)
   }
 
   object genTagName {