Port scala.js changes

More details: scala-js/scala-js@e02799b#diff-c9a195a739d51194e79f0655bc93bd61R2343-R2363
scala · Jul 22, 2020 · ff7ed07 · ff7ed07
1 parent 22cc628
commit ff7ed07
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -1388,7 +1388,7 @@ class JSCodeGen()(using genCtx: Context) {
    */
   private def genSuperCall(tree: Apply, isStat: Boolean): js.Tree = {
     implicit val pos = tree.span
-    val Apply(fun @ Select(sup @ Super(_, mix), _), args) = tree
+    val Apply(fun @ Select(sup @ Super(qual, _), _), args) = tree
     val sym = fun.symbol
 
     if (sym == defn.Any_getClass) {
@@ -1397,8 +1397,11 @@ class JSCodeGen()(using genCtx: Context) {
     } else /*if (isScalaJSDefinedJSClass(currentClassSym)) {
       genJSSuperCall(tree, isStat)
     } else*/ {
+      /* #3013 `qual` can be `this.$outer()` in some cases since Scala 2.12,
+       * so we call `genExpr(qual)`, not just `genThis()`.
+       */
       val superCall = genApplyMethodStatically(
-          genThis()(sup.span), sym, genActualArgs(sym, args))
+          genExpr(qual), sym, genActualArgs(sym, args))
 
       // Initialize the module instance just after the super constructor call.
       if (isStaticModule(currentClassSym) && !isModuleInitialized &&