File tree 2 files changed +3
-6
lines changed
compiler/src/dotty/tools/backend/sjs
2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -1388,7 +1388,7 @@ class JSCodeGen()(using genCtx: Context) {
1388
1388
*/
1389
1389
private def genSuperCall (tree : Apply , isStat : Boolean ): js.Tree = {
1390
1390
implicit val pos = tree.span
1391
- val Apply (fun @ Select (sup @ Super (qual, _ ), _), args) = tree
1391
+ val Apply (fun @ Select (sup @ Super (_, mix ), _), args) = tree
1392
1392
val sym = fun.symbol
1393
1393
1394
1394
if (sym == defn.Any_getClass ) {
@@ -1397,11 +1397,8 @@ class JSCodeGen()(using genCtx: Context) {
1397
1397
} else /* if (isScalaJSDefinedJSClass(currentClassSym)) {
1398
1398
genJSSuperCall(tree, isStat)
1399
1399
} else*/ {
1400
- /* #3013 `qual` can be `this.$outer()` in some cases since Scala 2.12,
1401
- * so we call `genExpr(qual)`, not just `genThis()`.
1402
- */
1403
1400
val superCall = genApplyMethodStatically(
1404
- genExpr(qual ), sym, genActualArgs(sym, args))
1401
+ genThis()(sup.span ), sym, genActualArgs(sym, args))
1405
1402
1406
1403
// Initialize the module instance just after the super constructor call.
1407
1404
if (isStaticModule(currentClassSym) && ! isModuleInitialized &&
Original file line number Diff line number Diff line change @@ -1021,7 +1021,7 @@ object Build {
1021
1021
managedSources in Test ++= {
1022
1022
val dir = fetchScalaJSSource.value / " test-suite"
1023
1023
(
1024
- (dir / " shared/src/test/scala/org/scalajs/testsuite/compiler" ** ((" *.scala" : FileFilter ) -- " ReflectiveCallTest.scala" )).get
1024
+ (dir / " shared/src/test/scala/org/scalajs/testsuite/compiler" ** ((" *.scala" : FileFilter ) -- " RegressionTest.scala " -- " ReflectiveCallTest.scala" )).get
1025
1025
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/lang" ** " *.scala" ).get
1026
1026
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/io" ** " *.scala" ).get
1027
1027
++ (dir / " shared/src/test/scala/org/scalajs/testsuite/javalib/math" ** " *.scala" ).get
You can’t perform that action at this time.
0 commit comments