Skip to content

Optimization: Introduce CompactAnnotation #24679

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
odersky merged 10 commits into from
Dec 21, 2025
Merged

Optimization: Introduce CompactAnnotation #24679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
434941a
Optimization: Introduce CompactAnnotation
odersky Dec 5, 2025
910529a
Represent all retains annotations as CompactAnnotations
odersky Dec 7, 2025
7b15169
Special class for RetainingAnnotations
odersky Dec 8, 2025
b9e6eb9
Don't detour over tree when going from RetainingAnnotation to capture…
odersky Dec 8, 2025
e648b42
Cache result of toCaptureSet in RetainingAnnotation
odersky Dec 8, 2025
effba5c
Use more RetainingAnnotation tests where it makes sense
odersky Dec 8, 2025
d223e79
Drop RetainingType
odersky Dec 9, 2025
3e8c9cf
Comments and general polishing
odersky Dec 9, 2025
1103348
Fix scaladoc capture type rendering issues
bracevac Dec 19, 2025
9dcbcc6
scaladoc cc: fix rendering of poly functions
bracevac Dec 19, 2025
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
Prev Previous commit
Next Next commit
Use more RetainingAnnotation tests where it makes sense
  • Loading branch information
@odersky
odersky committed Dec 8, 2025
commit effba5cebf7db472146bd848b4d35c4512881777
5 changes: 1 addition & 4 deletions compiler/src/dotty/tools/dotc/cc/CaptureOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import config.Feature
import NameKinds.TryOwnerName
import typer.ProtoTypes.WildcardSelectionProto

/** Attachment key for capturing type trees */
private val Captures: Key[CaptureSet] = Key()

/** Are we at checkCaptures phase? */
def isCaptureChecking(using Context): Boolean =
ctx.phaseId == Phases.checkCapturesPhaseId
Expand Down Expand Up @@ -661,7 +658,7 @@ class PathSelectionProto(val select: Select, val pt: Type) extends typer.ProtoTy
*/
class CleanupRetains(using Context) extends TypeMap:
def apply(tp: Type): Type = tp match
case AnnotatedType(parent, annot) if annot.symbol.isRetainsLike =>
case AnnotatedType(parent, annot: RetainingAnnotation) =>
if Feature.ccEnabled then
if annot.symbol == defn.RetainsAnnot || annot.symbol == defn.RetainsByNameAnnot then
RetainingType(parent, defn.NothingType, byName = annot.symbol == defn.RetainsByNameAnnot)
Expand Down
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/TreeChecker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import collection.mutable
import ProtoTypes.*
import staging.StagingLevel
import inlines.Inlines.inInlineMethod
import cc.{isRetainsLike, CaptureAnnotation}
import cc.RetainingAnnotation

import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions

Expand Down Expand Up @@ -187,7 +187,7 @@ object TreeChecker {
case tp: TypeVar =>
assert(tp.isInstantiated, s"Uninstantiated type variable: ${tp.show}, tree = ${tree.show}")
apply(tp.underlying)
case tp @ AnnotatedType(underlying, annot) if annot.symbol.isRetainsLike && !annot.isInstanceOf[CaptureAnnotation] =>
case tp @ AnnotatedType(underlying, annot: RetainingAnnotation) =>
val underlying1 = this(underlying)
val annot1 = insideRetainingAnnot:
annot.mapWith(this)
Expand Down
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/dotc/typer/Applications.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import annotation.threadUnsafe

import scala.annotation.tailrec
import scala.util.control.NonFatal
import dotty.tools.dotc.cc.isRetains

object Applications {
import tpd.*
Expand Down
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/typer/Checking.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import config.Feature, Feature.{sourceVersion, modularity}
import config.SourceVersion.*
import config.MigrationVersion
import printing.Formatting.hlAsKeyword
import cc.{isCaptureChecking, isRetainsLike}
import cc.{isCaptureChecking, RetainingAnnotation}
import cc.Mutability.isUpdateMethod

import collection.mutable
Expand Down Expand Up @@ -815,7 +815,7 @@ object Checking {
declaredParents =
tp.declaredParents.map(p => transformedParent(apply(p)))
)
case tp @ AnnotatedType(underlying, annot) if annot.symbol.isRetainsLike =>
case tp @ AnnotatedType(underlying, annot: RetainingAnnotation) =>
val underlying1 = this(underlying)
val saved = inCaptureSet
inCaptureSet = true
Expand Down
Loading