File tree 2 files changed +5
-5
lines changed
compiler/src/dotty/tools/dotc
2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -1430,7 +1430,7 @@ object Types {
1430
1430
/** If this is an ignored proto type, its underlying type, otherwise the type itself */
1431
1431
def revealIgnored : Type = this
1432
1432
1433
- /** If this is a proto type, the ignored version , otherwise the type itself */
1433
+ /** If this is a proto type, WildcardType , otherwise the type itself */
1434
1434
def dropIfProto : Type = this
1435
1435
1436
1436
// ----- Substitutions -----------------------------------------------------
Original file line number Diff line number Diff line change @@ -493,16 +493,16 @@ trait ImplicitRunInfo { self: Run =>
493
493
override implicit protected val ctx : Context = liftingCtx
494
494
override def stopAtStatic = true
495
495
496
+ private def isLiftTarget (sym : Symbol ) = sym.isClass || sym.isOpaqueAlias
497
+
496
498
def apply (tp : Type ) = tp match {
497
499
case tp : TypeRef =>
498
- val sym = tp.symbol
499
- if (sym.isClass || sym.isOpaqueAlias) tp
500
+ if (isLiftTarget(tp.symbol)) tp
500
501
else {
501
502
val pre = tp.prefix
502
503
def joinClass (tp : Type , cls : Symbol ) =
503
504
AndType .make(tp, cls.typeRef.asSeenFrom(pre, cls.owner))
504
505
val lead = if (pre eq NoPrefix ) defn.AnyType else apply(pre)
505
- def isLiftTarget (sym : Symbol ) = sym.isClass || sym.isOpaqueAlias
506
506
(lead /: tp.parentSymbols(isLiftTarget))(joinClass)
507
507
}
508
508
case tp : TypeVar =>
@@ -583,7 +583,7 @@ trait ImplicitRunInfo { self: Run =>
583
583
val liftedTp = if (isLifted) tp else liftToClasses(tp)
584
584
val refs =
585
585
if (liftedTp ne tp) {
586
- implicitsDetailed.println(i " lifted of $tp = $liftedTp" )
586
+ implicitsDetailed.println(i " lifted of $tp = $liftedTp" )
587
587
iscope(liftedTp, isLifted = true ).companionRefs
588
588
}
589
589
else
You can’t perform that action at this time.
0 commit comments