Skip to content

Commit

Permalink
Fix isAliasType (#20195)
Browse files Browse the repository at this point in the history
Symbols that had the TypeParam flag set were classified as alias types
unless they also had the Deferred flag set. Maybe this did not break
that much since Namer always added the Deferred for type parameters. But
export forwarders use synthesized parameters which did not have Deferred
set.

Fixes #20079
  • Loading branch information
smarter authored Apr 24, 2024
2 parents 1fc3916 + 9d88c80 commit b3f0aca
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/cc/CaptureOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ extension (tp: Type)
case tp @ CapturingType(parent, refs) =>
val pcs = getBoxed(parent)
if tp.isBoxed then refs ++ pcs else pcs
case tp: TypeRef if tp.symbol.isAbstractType => CaptureSet.empty
case tp: TypeRef if tp.symbol.isAbstractOrParamType => CaptureSet.empty
case tp: TypeProxy => getBoxed(tp.superType)
case tp: AndType => getBoxed(tp.tp1) ** getBoxed(tp.tp2)
case tp: OrType => getBoxed(tp.tp1) ++ getBoxed(tp.tp2)
Expand Down
6 changes: 2 additions & 4 deletions compiler/src/dotty/tools/dotc/core/SymDenotations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -685,11 +685,9 @@ object SymDenotations {
def isWrappedToplevelDef(using Context): Boolean =
!isConstructor && owner.isPackageObject

/** Is this symbol an abstract type? */
final def isAbstractType(using Context): Boolean = this.is(DeferredType)

/** Is this symbol an alias type? */
final def isAliasType(using Context): Boolean = isAbstractOrAliasType && !this.is(Deferred)
final def isAliasType(using Context): Boolean =
isAbstractOrAliasType && !isAbstractOrParamType

/** Is this symbol an abstract or alias type? */
final def isAbstractOrAliasType: Boolean = isType & !isClass
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/TypeErasure.scala
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ object TypeErasure {
tp.paramNames, tp.paramNames map (Function.const(TypeBounds.upper(defn.ObjectType))), tp.resultType)

if (defn.isPolymorphicAfterErasure(sym)) eraseParamBounds(sym.info.asInstanceOf[PolyType])
else if (sym.isAbstractType) TypeAlias(WildcardType)
else if (sym.isAbstractOrParamType) TypeAlias(WildcardType)
else if sym.is(ConstructorProxy) then NoType
else if (sym.isConstructor) outer.addParam(sym.owner.asClass, erase(tp)(using preErasureCtx))
else if (sym.is(Label)) erase.eraseResult(sym.info)(using preErasureCtx)
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2700,7 +2700,7 @@ object Types extends TypeUtils {
symd.maybeOwner.membersNeedAsSeenFrom(prefix) && !symd.is(NonMember)
|| prefix.match
case prefix: Types.ThisType =>
(symd.isAbstractType
(symd.isAbstractOrParamType
|| symd.isTerm
&& !symd.flagsUNSAFE.isOneOf(Module | Final | Param)
&& !symd.isConstructor
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ private class ExtractAPICollector(nonLocalClassSymbols: mutable.HashSet[Symbol])
if (sym.isAliasType)
api.TypeAlias.of(name, access, modifiers, as.toArray, typeParams, apiType(tpe.bounds.hi))
else {
assert(sym.isAbstractType)
assert(sym.isAbstractOrParamType)
api.TypeDeclaration.of(name, access, modifiers, as.toArray, typeParams, apiType(tpe.bounds.lo), apiType(tpe.bounds.hi))
}
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Deriving.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ trait Deriving {
/** A version of Type#underlyingClassRef that works also for higher-kinded types */
private def underlyingClassRef(tp: Type): Type = tp match {
case tp: TypeRef if tp.symbol.isClass => tp
case tp: TypeRef if tp.symbol.isAbstractType => NoType
case tp: TypeRef if tp.symbol.isAbstractOrParamType => NoType
case tp: TermRef => NoType
case tp: TypeProxy => underlyingClassRef(tp.superType)
case _ => NoType
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Implicits.scala
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ trait ImplicitRunInfo:
private def isAnchor(sym: Symbol) =
sym.isClass && !isExcluded(sym)
|| sym.isOpaqueAlias
|| sym.is(Deferred, butNot = Param)
|| sym.is(Deferred)
|| sym.info.isMatchAlias

private def computeIScope(rootTp: Type): OfTypeImplicits =
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Namer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ class Namer { typer: Typer =>
analyzeRHS(body)
case _ =>
if rhs.isEmpty || flags.is(Opaque) then flags |= Deferred
analyzeRHS(tree.rhs)
if flags.is(Param) then tree.rhs else analyzeRHS(tree.rhs)

// to complete a constructor, move one context further out -- this
// is the context enclosing the class. Note that the context in which a
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):

def canManifest(tp: Manifestable, topLevel: Boolean) =
val sym = tp.typeSymbol
!sym.isAbstractType
!sym.isAbstractOrParamType
&& hasStableErasure(tp)
&& !(topLevel && defn.isBottomClassAfterErasure(sym))

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2687,7 +2687,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
def isAliasType: Boolean = self.denot.isAliasType
def isAnonymousClass: Boolean = self.denot.isAnonymousClass
def isAnonymousFunction: Boolean = self.denot.isAnonymousFunction
def isAbstractType: Boolean = self.denot.isAbstractType
def isAbstractType: Boolean = self.denot.isAbstractOrParamType
def isClassConstructor: Boolean = self.denot.isClassConstructor
def isSuperAccessor = self.name.is(dotc.core.NameKinds.SuperAccessorName)
def isType: Boolean = self.isType
Expand Down
2 changes: 1 addition & 1 deletion library/src/scala/quoted/Quotes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4025,7 +4025,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
/** Is this symbol an anonymous function? */
def isAnonymousFunction: Boolean

/** Is this symbol an abstract type? */
/** Is this symbol an abstract type or a type parameter? */
def isAbstractType: Boolean

/** Is this the constructor of a class? */
Expand Down
5 changes: 5 additions & 0 deletions tests/neg/i20079/Lib_1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
object Foo:
def xyz[A, CC[X] <: Iterable[X]](coll: CC[A]): Unit = ()

object Bar:
export Foo.xyz
6 changes: 6 additions & 0 deletions tests/neg/i20079/Test_2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
object Test:
val ints = List(1)
Foo.xyz[Int, List](ints)
Foo.xyz[Int, scala.collection.View](ints) // error
Bar.xyz[Int, List](ints)
Bar.xyz[Int, scala.collection.View](ints) // error

0 comments on commit b3f0aca

Please sign in to comment.