From 17161719b9b7a830b8fc6de9213a202e60ad62f0 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 10 Feb 2024 19:01:10 +0800 Subject: [PATCH] fix scalajs scala3 compilation by removing duplicate HasDefaultParams flag --- build.sc | 11 +++++++---- unroll/plugin/src-3/UnrollPhaseScala3.scala | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.sc b/build.sc index 60a6fd7..b8932a1 100644 --- a/build.sc +++ b/build.sc @@ -83,15 +83,18 @@ trait UnrollModule extends Cross.Module[String]{ def mimaPreviousArtifacts = T.traverse(mimaPrevious)(_.jvm.jar)() override def scalacPluginClasspath = T{ Agg(plugin.jar()) } - // override def scalaCompilerClasspath = T{ - // super.scalaCompilerClasspath().filter(!_.toString().contains("scala-compiler")) ++ - // Agg(PathRef(os.Path("/Users/lihaoyi/.ivy2/local/org.scala-lang/scala-compiler/2.13.12-bin-SNAPSHOT/jars/scala-compiler.jar"))) - // } + // override def scalaCompilerClasspath = T{ + // super.scalaCompilerClasspath().filter(!_.toString().contains("scala3-compiler")) ++ + // Agg(PathRef(os.Path("/Users/lihaoyi/.ivy2/local/org.scala-lang/scala3-compiler_3/3.3.2-RC3-bin-SNAPSHOT/jars/scala3-compiler_3.jar"))) + // } override def scalacOptions = T{ Seq( s"-Xplugin:${plugin.jar().path}", "-Xplugin-require:unroll", //"-Xprint:all", + //"-Ydebug-error", + //"-Ydebug-type-error", + //"-Ydebug-trace" //"-Xprint:typer", //"-Xprint:unroll", //"-Xprint:patmat", diff --git a/unroll/plugin/src-3/UnrollPhaseScala3.scala b/unroll/plugin/src-3/UnrollPhaseScala3.scala index 40e841f..b83c2f5 100644 --- a/unroll/plugin/src-3/UnrollPhaseScala3.scala +++ b/unroll/plugin/src-3/UnrollPhaseScala3.scala @@ -59,7 +59,7 @@ class UnrollPhaseScala3() extends PluginPhase { val forwarderDefSymbol = Symbols.newSymbol( defdef.symbol.owner, defdef.name, - defdef.symbol.flags, + defdef.symbol.flags &~ HasDefaultParams, truncatedMethodType )