@@ -410,8 +410,8 @@ object Semantic {
410
410
def select (f : Symbol , source : Tree ): Contextual [Result ] =
411
411
value.select(f, source) ++ errors
412
412
413
- def call (meth : Symbol , args : List [ArgInfo ], superType : Type , source : Tree ): Contextual [Result ] =
414
- value.call(meth, args, superType, source) ++ errors
413
+ def call (meth : Symbol , args : List [ArgInfo ], receiver : Type , superType : Type , source : Tree ): Contextual [Result ] =
414
+ value.call(meth, args, receiver, superType, source) ++ errors
415
415
416
416
def callConstructor (ctor : Symbol , args : List [ArgInfo ], source : Tree ): Contextual [Result ] =
417
417
value.callConstructor(ctor, args, source) ++ errors
@@ -587,7 +587,7 @@ object Semantic {
587
587
}
588
588
}
589
589
590
- def call (meth : Symbol , args : List [ArgInfo ], superType : Type , source : Tree , needResolve : Boolean = true ): Contextual [Result ] = log(" call " + meth.show + " , args = " + args, printer, (_ : Result ).show) {
590
+ def call (meth : Symbol , args : List [ArgInfo ], receiver : Type , superType : Type , source : Tree , needResolve : Boolean = true ): Contextual [Result ] = log(" call " + meth.show + " , args = " + args, printer, (_ : Result ).show) {
591
591
def checkArgs = args.flatMap(_.promote)
592
592
593
593
def isSyntheticApply (meth : Symbol ) =
@@ -600,6 +600,19 @@ object Semantic {
600
600
|| (meth eq defn.Object_ne )
601
601
|| (meth eq defn.Any_isInstanceOf )
602
602
603
+ def checkArgsWithParametricity () =
604
+ val methodType = meth.info.stripPoly
605
+ var allArgsPromote = true
606
+ val errors = methodType.paramInfoss.flatten.zip(args).flatMap { (info, arg) =>
607
+ val isMatchable = info.repeatedToSingle <:< defn.MatchableType
608
+ // val isTypeVar =
609
+ val isAnyRef = info.repeatedToSingle <:< defn.AnyRefType
610
+ val errors = arg.promote
611
+ allArgsPromote = allArgsPromote && errors.isEmpty
612
+ if ! isMatchable then Nil else errors
613
+ }
614
+ (errors, allArgsPromote)
615
+
603
616
// fast track if the current object is already initialized
604
617
if promoted.isCurrentObjectPromoted then Result (Hot , Nil )
605
618
else if isAlwaysSafe(meth) then Result (Hot , Nil )
@@ -610,7 +623,14 @@ object Semantic {
610
623
val klass = meth.owner.companionClass.asClass
611
624
instantiate(klass, klass.primaryConstructor, args, source)
612
625
else
613
- Result (Hot , checkArgs)
626
+ if meth.isStatic || receiver.isSingleton then
627
+ val (errors, allArgsPromote) = checkArgsWithParametricity()
628
+ if allArgsPromote || errors.nonEmpty then
629
+ Result (Hot , errors)
630
+ else
631
+ Result (Cold , errors)
632
+ else
633
+ Result (Hot , checkArgs)
614
634
615
635
case Cold =>
616
636
val error = CallCold (meth, source, trace.toVector)
@@ -666,7 +686,7 @@ object Semantic {
666
686
}
667
687
668
688
case RefSet (refs) =>
669
- val resList = refs.map(_.call(meth, args, superType, source))
689
+ val resList = refs.map(_.call(meth, args, receiver, superType, source))
670
690
val value2 = resList.map(_.value).join
671
691
val errors = resList.flatMap(_.errors)
672
692
Result (value2, errors)
@@ -946,7 +966,7 @@ object Semantic {
946
966
locally {
947
967
given Trace = trace2
948
968
val args = member.info.paramInfoss.flatten.map(_ => ArgInfo (Hot , EmptyTree ))
949
- val res = warm.call(member, args, superType = NoType , source = member.defTree)
969
+ val res = warm.call(member, args, receiver = NoType , superType = NoType , source = member.defTree)
950
970
buffer ++= res.ensureHot(msg, source).errors
951
971
}
952
972
else
@@ -1126,14 +1146,14 @@ object Semantic {
1126
1146
case Select (supert : Super , _) =>
1127
1147
val SuperType (thisTp, superTp) = supert.tpe
1128
1148
val thisValue2 = resolveThis(thisTp.classSymbol.asClass, thisV, klass, ref)
1129
- Result (thisValue2, errors).call(ref.symbol, args, superTp, expr)
1149
+ Result (thisValue2, errors).call(ref.symbol, args, thisTp, superTp, expr)
1130
1150
1131
1151
case Select (qual, _) =>
1132
1152
val res = eval(qual, thisV, klass) ++ errors
1133
1153
if ref.symbol.isConstructor then
1134
1154
res.callConstructor(ref.symbol, args, source = expr)
1135
1155
else
1136
- res.call(ref.symbol, args, superType = NoType , source = expr)
1156
+ res.call(ref.symbol, args, receiver = qual.tpe, superType = NoType , source = expr)
1137
1157
1138
1158
case id : Ident =>
1139
1159
id.tpe match
@@ -1142,13 +1162,13 @@ object Semantic {
1142
1162
val enclosingClass = id.symbol.owner.enclosingClass.asClass
1143
1163
val thisValue2 = resolveThis(enclosingClass, thisV, klass, id)
1144
1164
// local methods are not a member, but we can reuse the method `call`
1145
- thisValue2.call(id.symbol, args, superType = NoType , expr, needResolve = false )
1165
+ thisValue2.call(id.symbol, args, receiver = NoType , superType = NoType , expr, needResolve = false )
1146
1166
case TermRef (prefix, _) =>
1147
1167
val res = cases(prefix, thisV, klass, id) ++ errors
1148
1168
if id.symbol.isConstructor then
1149
1169
res.callConstructor(id.symbol, args, source = expr)
1150
1170
else
1151
- res.call(id.symbol, args, superType = NoType , source = expr)
1171
+ res.call(id.symbol, args, receiver = prefix, superType = NoType , source = expr)
1152
1172
1153
1173
case Select (qualifier, name) =>
1154
1174
val qualRes = eval(qualifier, thisV, klass)
0 commit comments