Skip to content

Make annotation reading lazier in Scala2Unpickler #12117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 19, 2021
Merged

Make annotation reading lazier in Scala2Unpickler #12117

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abbdfe6
Don't eta expand when reading Scala 2 types
odersky Apr 16, 2021
59bf89f
Alternative fix: Make annotation reading lazier
odersky Apr 17, 2021
0a5c927
Test with Scala 2.13 compiler
odersky Apr 17, 2021
51f0677
Drop build.properties
odersky Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,9 +1011,9 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
*/
protected def deferredAnnot(end: Int)(using Context): Annotation = {
val start = readIndex
val atp = readTypeRef()
val phase = ctx.phase
Annotation.deferred(atp.typeSymbol)(
Annotation.deferredSymAndTree(
atReadPos(start, () => atPhase(phase)(readTypeRef().typeSymbol)))(
atReadPos(start, () => atPhase(phase)(readAnnotationContents(end))))
}

Expand Down
3 changes: 3 additions & 0 deletions sbt-dotty/sbt-test/scala2-compat/i12109/app/App.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import i12109.*

def test = JsonReaderDefaultValue
13 changes: 13 additions & 0 deletions sbt-dotty/sbt-test/scala2-compat/i12109/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
val scala3Version = sys.props("plugin.scalaVersion")
val scala2Version = "2.13.5"

lazy val lib = project.in(file("lib"))
.settings(
scalaVersion := scala2Version
)

lazy val app = project.in(file("app"))
.dependsOn(lib)
.settings(
scalaVersion := scala3Version
)
10 changes: 10 additions & 0 deletions sbt-dotty/sbt-test/scala2-compat/i12109/lib/Lib.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package i12109

object JsonReaderDefaultValue extends LowPriorityDefaultValue {
class ReaderDefaultValue extends scala.annotation.StaticAnnotation
}

trait LowPriorityDefaultValue {
@JsonReaderDefaultValue.ReaderDefaultValue
class NoDefaultValue
}
1 change: 1 addition & 0 deletions sbt-dotty/sbt-test/scala2-compat/i12109/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=1.3.12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That build.properties file isn't needed for a scripted test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied everything from the scala-compat test that you added recently.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I don't see that file in https://github.com/lampepfl/dotty/pull/12120/files, it might have been auto-generated by sbt.

1 change: 1 addition & 0 deletions sbt-dotty/sbt-test/scala2-compat/i12109/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
1 change: 1 addition & 0 deletions sbt-dotty/sbt-test/scala2-compat/i12109/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
> app/compile