Skip to content

Strip CC annotations in TypeMap when CC is not enabled #24556

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 2 commits into from
Nov 27, 2025
Merged

Strip CC annotations in TypeMap when CC is not enabled #24556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52db678
Strip CC annotations in TypeMap when CC is not enabled
mbovel Nov 27, 2025
fe1dfee
Keep opaque types in FollowAliasesMap
mbovel Nov 27, 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
20 changes: 12 additions & 8 deletions compiler/src/dotty/tools/dotc/core/Types.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import Hashable.*
import Uniques.*
import collection.mutable
import config.Config
import config.Feature
import config.Feature.sourceVersion
import config.SourceVersion
import annotation.{tailrec, constructorOnly}
Expand Down Expand Up @@ -6279,12 +6280,12 @@ object Types extends TypeUtils {

end BiTypeMap

/** A typemap that follows aliases and keeps their transformed results if
* there is a change.
*/
/** A typemap that follows non-opaque aliases and keeps their transformed
* results if there is a change.
*/
trait FollowAliasesMap(using Context) extends TypeMap:
def mapFollowingAliases(t: Type): Type =
val t1 = t.dealiasKeepAnnots
val t1 = t.dealiasKeepAnnotsAndOpaques
if t1 ne t then
val t2 = apply(t1)
if t2 ne t1 then t2
Expand Down Expand Up @@ -6483,10 +6484,13 @@ object Types extends TypeUtils {
mapCapturingType(tp, parent, refs, variance)

case tp @ AnnotatedType(underlying, annot) =>
val underlying1 = this(underlying)
val annot1 = annot.mapWith(this)
if annot1 eq EmptyAnnotation then underlying1
else derivedAnnotatedType(tp, underlying1, annot1)
if annot.symbol.isRetainsLike && !Feature.ccEnabledSomewhere then
this(underlying) // strip retains like annotations unless capture checking is enabled
else
val underlying1 = this(underlying)
val annot1 = annot.mapWith(this)
if annot1 eq EmptyAnnotation then underlying1
else derivedAnnotatedType(tp, underlying1, annot1)

case _: ThisType
| _: BoundType
Expand Down
Loading