File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed
compiler/src/dotty/tools/dotc/transform Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -253,13 +253,16 @@ abstract class Recheck extends Phase, SymTransformer:
253
253
sym.typeRef
254
254
255
255
/** Assuming `formals` are parameters of a Java-defined method, remap Object
256
- * to FromJavaObject since it got lost in ElimRepeated
256
+ * to FromJavaObject since it got lost in ElimRepeated.
257
+ * NOTE: It seems this is no longer true, and `mapJavaArgs` is not needed.
258
+ * The invocation is currently disabled in recheckApply.
257
259
*/
258
260
private def mapJavaArgs (formals : List [Type ])(using Context ): List [Type ] =
259
261
val tm = new TypeMap with IdempotentCaptRefMap :
260
- def apply (t : Type ) = t match
261
- case t : TypeRef if t.symbol == defn.ObjectClass => defn.FromJavaObjectType
262
- case _ => mapOver(t)
262
+ def apply (t : Type ) =
263
+ t match
264
+ case t : TypeRef if t.symbol == defn.ObjectClass => defn.FromJavaObjectType
265
+ case _ => mapOver(t)
263
266
formals.mapConserve(tm)
264
267
265
268
/** Hook for method type instantiation */
@@ -274,7 +277,8 @@ abstract class Recheck extends Phase, SymTransformer:
274
277
case fntpe : MethodType =>
275
278
assert(fntpe.paramInfos.hasSameLengthAs(tree.args))
276
279
val formals =
277
- if tree.symbol.is(JavaDefined ) then mapJavaArgs(fntpe.paramInfos)
280
+ if false && tree.symbol.is(JavaDefined ) // see NOTE in mapJavaArgs
281
+ then mapJavaArgs(fntpe.paramInfos)
278
282
else fntpe.paramInfos
279
283
def recheckArgs (args : List [Tree ], formals : List [Type ], prefs : List [ParamRef ]): List [Type ] = args match
280
284
case arg :: args1 =>
You can’t perform that action at this time.
0 commit comments