Merge pull request scala-js#4425 from sjrd/dont-emit-abstract-members-in-js-classes

sjrd · web-flow · commit ff0627a5e904 · 2021-02-11T21:33:22.000+01:00
Fix scala-js#4409: Do not emit abstract methods in non-native JS classes.
diff --git a/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala b/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala
@@ -1820,11 +1820,16 @@ abstract class GenJSCode[G <: Global with Singleton](val global: G)
         val methodName = encodeMethodSym(sym)
         val originalName = originalNameOfMethod(sym)
 
+        val isAbstract = isAbstractMethod(dd)
+
         def jsParams = params.map(genParamDef(_))
 
         if (scalaPrimitives.isPrimitive(sym)) {
           None
-        } else if (isAbstractMethod(dd)) {
+        } else if (isAbstract && isNonNativeJSClass(currentClassSym)) {
+          // #4409: Do not emit abstract methods in non-native JS classes
+          None
+        } else if (isAbstract) {
           val body = if (scalaUsesImplClasses &&
               sym.hasAnnotation(JavaDefaultMethodAnnotation)) {
             /* For an interface method with @JavaDefaultMethod, make it a
diff --git a/ir/shared/src/main/scala/org/scalajs/ir/InvalidIRException.scala b/ir/shared/src/main/scala/org/scalajs/ir/InvalidIRException.scala
@@ -12,5 +12,5 @@
 
 package org.scalajs.ir
 
-class InvalidIRException(val tree: Trees.Tree, message: String)
+class InvalidIRException(val tree: Trees.IRNode, message: String)
     extends Exception(message)
diff --git a/ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala b/ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala
@@ -1349,8 +1349,39 @@ object Serializers {
       }
     }
 
-    def readMemberDefs(owner: ClassName, ownerKind: ClassKind): List[MemberDef] =
-      List.fill(readInt())(readMemberDef(owner, ownerKind))
+    def readMemberDefs(owner: ClassName, ownerKind: ClassKind): List[MemberDef] = {
+      val memberDefs = List.fill(readInt())(readMemberDef(owner, ownerKind))
+
+      // #4409: Filter out abstract methods in non-native JS classes for version < 1.5
+      if (ownerKind.isJSClass) {
+        if (hacks.use14) {
+          memberDefs.filter { m =>
+            m match {
+              case MethodDef(_, _, _, _, _, None) => false
+              case _                              => true
+            }
+          }
+        } else {
+          /* #4388 This check should be moved to a link-time check dependent on
+           * `checkIR`, but currently we only have the post-BaseLinker IR
+           * checker, at which points those methods have already been
+           * eliminated.
+           */
+          for (m <- memberDefs) {
+            m match {
+              case MethodDef(_, _, _, _, _, None) =>
+                throw new InvalidIRException(m,
+                    "Invalid abstract method in non-native JS class")
+              case _ =>
+                // ok
+            }
+          }
+          memberDefs
+        }
+      } else {
+        memberDefs
+      }
+    }
 
     def readTopLevelExportDef(owner: ClassName,
         ownerKind: ClassKind): TopLevelExportDef = {
