Skip to content
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

Jump to bottom

wildApprox: also approximate FunProto arguments #13361

Merged
merged 1 commit into from
Aug 27, 2021
Merged

wildApprox: also approximate FunProto arguments #13361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions compiler/src/dotty/tools/dotc/typer/Implicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ trait ImplicitRunInfo:

object collectParts extends TypeTraverser:

private var provisional: Boolean = _
private var parts: mutable.LinkedHashSet[Type] = _
private val partSeen = util.HashSet[Type]()

Expand All @@ -587,19 +586,18 @@ trait ImplicitRunInfo:
case t: ConstantType =>
traverse(t.underlying)
case t: TypeParamRef =>
assert(!ctx.typerState.constraint.contains(t), i"`wildApprox` failed to remove uninstantiated $t")
traverse(t.underlying)
if ctx.typerState.constraint.contains(t) then provisional = true
case t: TermParamRef =>
traverse(t.underlying)
case t =>
traverseChildren(t)

def apply(tp: Type): (collection.Set[Type], Boolean) =
provisional = false
def apply(tp: Type): collection.Set[Type] =
parts = mutable.LinkedHashSet()
partSeen.clear()
traverse(tp)
(parts, provisional)
parts
end collectParts

val seen = util.HashSet[Type]()
Expand Down Expand Up @@ -674,12 +672,11 @@ trait ImplicitRunInfo:
end collectCompanions

def recur(tp: Type): OfTypeImplicits =
val (parts, provisional) = collectParts(tp)
val parts = collectParts(tp)
val companions = collectCompanions(tp, parts)
val result = OfTypeImplicits(tp, companions)(runContext)
if Config.cacheImplicitScopes
&& tp.hash != NotCached
&& !provisional
&& (tp eq rootTp) // first type traversed is always cached
|| !incomplete.contains(tp) // other types are cached if they are not incomplete
then implicitScopeCache(tp) = result
Expand Down
16 changes: 15 additions & 1 deletion compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,10 @@ object ProtoTypes {
// `protoTyperState` committable we must ensure that it does not
// contain any type variable which don't already exist in the passed
// TyperState. This is achieved by instantiating any such type
// variable.
// variable. NOTE: this does not suffice to discard type variables
// in ancestors of `protoTyperState`, if this situation ever
// comes up, an assertion in TyperState will trigger and this code
// will need to be generalized.
if protoTyperState.isCommittable then
val passedConstraint = passedTyperState.constraint
val newLambdas = newConstraint.domainLambdas.filter(tl =>
Expand Down Expand Up @@ -822,6 +825,17 @@ object ProtoTypes {
tp.derivedViewProto(
wildApprox(tp.argType, theMap, seen, internal),
wildApprox(tp.resultType, theMap, seen, internal))
case tp: FunProto =>
val args = tp.args.mapconserve(arg =>
val argTp = tp.typeOfArg(arg) match
case NoType => WildcardType
case tp => wildApprox(tp, theMap, seen, internal)
arg.withType(argTp))
val resTp = wildApprox(tp.resultType, theMap, seen, internal)
if (args eq tp.args) && (resTp eq tp.resultType) then
tp
else
FunProtoTyped(args, resTp)(ctx.typer, tp.applyKind)
Copy link
Contributor

Choose a reason for hiding this comment

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

How do we know FunProto was not an UnapplyFunProto? In that case it seems wrong to map to FunProtoTyped. So we either should match on FunProtoTyped, or implement a method that returns
the same kind of FunProto.

Copy link
Member Author

@smarter smarter Aug 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

The wildApprox in master will call derivedFunProto which is not overridden anywhere and therefore always returns a regular FunProto even if we started with a FunProtoTyped or an UnapplyFunProto. As far as I can tell that doesn't matter for the stuf we do with wildApprox (which is collecting companion types from parts of the type). So while I agree we could try improving on this (and maybe making UnapplyFunProto a subtype of FunProtoTyped?), it seems like it could be done in a separate PR.

case tp: IgnoredProto =>
WildcardType
case _: ThisType | _: BoundType => // default case, inlined for speed
Expand Down
3 changes: 3 additions & 0 deletions tests/neg/i13340.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
case class Field(name: String, subQuery: Option[Query] = None)
case class Query(fields: Seq[Field])
val x = Query(Seq(Field("a", subQuery=Some(Query(Seq(Field("b")), Nil)))), Nil) // error