Fix scala-js#4769: Give JSPropertyDef a hash

Author: gzm0

compiler/src/main/scala/org/scalajs/nscplugin/GenJSExports.scala

@@ -264,7 +264,7 @@ trait GenJSExports[G <: Global with Singleton] extends SubComponent {
         reporter.error(alts.head.pos,
             s"Conflicting properties and methods for ${classSym.fullName}::$name.")
         implicit val pos = alts.head.pos
-        js.JSPropertyDef(js.MemberFlags.empty, genExpr(name), None, None)
+        js.JSPropertyDef(js.MemberFlags.empty, genExpr(name), None, None)(None)
       } else {
         genMemberExportOrDispatcher(name, isProp, alts, static = false)
       }
@@ -317,7 +317,7 @@ trait GenJSExports[G <: Global with Singleton] extends SubComponent {
         }
       }
 
-      js.JSPropertyDef(flags, genExpr(jsName), getterBody, setterArgAndBody)
+      js.JSPropertyDef(flags, genExpr(jsName), getterBody, setterArgAndBody)(None)
     }
 
     /** generates the exporter function (i.e. exporter for non-properties) for

ir/shared/src/main/scala/org/scalajs/ir/Hashers.scala

@@ -87,12 +87,35 @@ object Hashers {
     }
   }
 
+  def hashJSPropertyDef(propDef: JSPropertyDef): JSPropertyDef = {
+    if (propDef.hash.isDefined) propDef
+    else {
+      val hasher = new TreeHasher()
+      val JSPropertyDef(flags, name, getterBody, setterArgAndBody) = propDef
+
+      hasher.mixPos(propDef.pos)
+      hasher.mixInt(MemberFlags.toBits(flags))
+      hasher.mixTree(name)
+      getterBody.foreach(hasher.mixTree(_))
+      setterArgAndBody.foreach { case (param, body) =>
+        hasher.mixParamDef(param)
+        hasher.mixTree(body)
+      }
+
+      val hash = hasher.finalizeHash()
+
+      JSPropertyDef(flags, name, getterBody, setterArgAndBody)(Some(hash))(propDef.pos)
+    }
+  }
+
   /** Hash definitions from a ClassDef where applicable */
   def hashMemberDefs(memberDefs: List[MemberDef]): List[MemberDef] = memberDefs.map {
     case methodDef: MethodDef      => hashMethodDef(methodDef)
     case ctorDef: JSConstructorDef => hashJSConstructorDef(ctorDef)
     case methodDef: JSMethodDef    => hashJSMethodDef(methodDef)
-    case otherDef                  => otherDef
+    case propDef: JSPropertyDef    => hashJSPropertyDef(propDef)
+    case fieldDef: AnyFieldDef     => fieldDef
+    case native: JSNativeMemberDef => native
   }
 
   /** Hash the definitions in a ClassDef (where applicable) */

ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala

@@ -711,8 +711,17 @@ object Serializers {
           writeInt(length)
           bufferUnderlying.continue()
 
-        case JSPropertyDef(flags, name, getter, setterArgAndBody) =>
+        case propDef: JSPropertyDef =>
+          val JSPropertyDef(flags, name, getter, setterArgAndBody) = propDef
+
           writeByte(TagJSPropertyDef)
+          writeOptHash(propDef.hash)
+
+          // Prepare for back-jump and write dummy length
+          bufferUnderlying.markJump()
+          writeInt(-1)
+
+          // Write out prop def
           writeInt(MemberFlags.toBits(flags))
           writeTree(name)
           writeOptTree(getter)
@@ -721,6 +730,11 @@ object Serializers {
             writeParamDef(arg); writeTree(body)
           }
 
+          // Jump back and write true length
+          val length = bufferUnderlying.jumpBack()
+          writeInt(length)
+          bufferUnderlying.continue()
+
         case JSNativeMemberDef(flags, name, jsNativeLoadSpec) =>
           writeByte(TagJSNativeMemberDef)
           writeInt(MemberFlags.toBits(flags))
@@ -1591,6 +1605,18 @@ object Serializers {
               OptimizerHints.fromBits(readInt()), optHash)
 
         case TagJSPropertyDef =>
+          val optHash = {
+            if (hacks.use12) {
+              None
+            } else {
+              val optHash = readOptHash()
+              // read and discard the length
+              val len = readInt()
+              assert(len >= 0)
+              optHash
+            }
+          }
+
           val flags = MemberFlags.fromBits(readInt())
           val name = bodyHack5Expr(readTree())
           val getterBody = readOptTree().map(bodyHack5Expr(_))
@@ -1600,7 +1626,7 @@ object Serializers {
             else
               None
           }
-          JSPropertyDef(flags, name, getterBody, setterArgAndBody)
+          JSPropertyDef(flags, name, getterBody, setterArgAndBody)(optHash)
 
         case TagJSNativeMemberDef =>
           val flags = MemberFlags.fromBits(readInt())
@@ -2021,6 +2047,13 @@ object Serializers {
     private val use7: Boolean = use6 || sourceVersion == "1.7"
 
     val use8: Boolean = use7 || sourceVersion == "1.8"
+
+    assert(sourceVersion != "1.9", "source version 1.9 does not exist")
+    assert(sourceVersion != "1.10", "source version 1.10 does not exist")
+
+    private val use11: Boolean = use8 || sourceVersion == "1.11"
+
+    val use12: Boolean = use11 || sourceVersion == "1.12"
   }
 
   /** Names needed for hacks. */

ir/shared/src/main/scala/org/scalajs/ir/Transformers.scala

@@ -273,7 +273,7 @@ object Transformers {
               getterBody.map(transformStat),
               setterArgAndBody map { case (arg, body) =>
                 (arg, transformStat(body))
-              })
+              })(None)
       }
     }
 

ir/shared/src/main/scala/org/scalajs/ir/Trees.scala

@@ -1193,6 +1193,7 @@ object Trees {
 
   sealed case class JSPropertyDef(flags: MemberFlags, name: Tree,
       getterBody: Option[Tree], setterArgAndBody: Option[(ParamDef, Tree)])(
+      val hash: Option[TreeHash])(
       implicit val pos: Position)
       extends JSMethodPropDef
 

linker/shared/src/main/scala/org/scalajs/linker/frontend/BaseLinker.scala

@@ -189,8 +189,10 @@ final class BaseLinker(config: CommonPhaseConfig, checkIR: Boolean) {
         }
 
       case m: JSPropertyDef =>
-        if (analyzerInfo.isAnySubclassInstantiated)
-          exportedMembers += new Versioned(m, None)
+        if (analyzerInfo.isAnySubclassInstantiated) {
+          val version = m.hash.map(Hashers.hashAsVersion(_))
+          exportedMembers += new Versioned(m, version)
+        }
 
       case m: JSNativeMemberDef =>
         if (analyzerInfo.jsNativeMembersUsed.contains(m.name.name))