wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -508,12 +508,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     val boundSym = newSym(InlineBinderName.fresh(name.asTermName), bindingFlags, bindingType).asTerm
     val binding = {
       var newArg = arg.changeOwner(ctx.owner, boundSym)
-      if argIsBottom && bindingFlags.is(Inline) then
+      if bindingFlags.is(Inline) && argIsBottom then
         newArg = Typed(newArg, TypeTree(formal)) // type ascribe RHS to avoid type errors in expansion. See i8612.scala
-      else if defn.isTupleNType(formal.widenExpr) && !defn.isTupleNType(argtpe.widen) then
-        // Also see `argtpe1` above
-        newArg = Typed(newArg, TypeTree(formal.widenExpr))
-
       if isByName then DefDef(boundSym, newArg)
       else ValDef(boundSym, newArg)
     }.withSpan(boundSym.span)
@@ -984,21 +980,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
           paramProxy.get(tree.tpe) match {
             case Some(t) if tree.isTerm && t.isSingleton =>
               val inlinedSingleton = singleton(t).withSpan(argSpan)
-              val tree1 = inlinedFromOutside(inlinedSingleton)(tree.span)
-              if defn.isTupleNType(tree.tpe.widenTermRefExpr) && !defn.isTupleNType(t.widenTermRefExpr) then
-                // See tests/pos/i14182b.scala
-                // FIXME: We have a `tree1` that has a term ref `tup.type` with underlying `1 *: 2 *: EmptyTuple` type but the original reference is to a `Tuple2[Int, Int]`
-                // If we take the `tree1` then it is impossible to select the `_1` field. If we take the parameter type we can lose singletons references that we should keep.
-                // Ideally we should ascribe it to a `tup.type & Tuple2[Int, Int]` but that is not working because we have the some special sub-typing rule that makes
-                // `1 *: 2 *: EmptyTuple <:< Tuple2[Int, Int]`. Therefore the glb of the two types ends up being `tup.type` which drops the extra information we need to add.
-                // None of the following attempts work.
-
-
-                // tree1.ensureConforms(tree.tpe.widenTermRefExpr)
-                // Typed(tree1, TypeTree(tree.tpe.widenTermRefExpr & t))
-                Typed(tree1, TypeTree(AndType(tree.tpe.widenTermRefExpr, t)))
-                // tree1.asInstance(AndType(tree.tpe.widenTermRefExpr, t))
-              else tree1
+              inlinedFromOutside(inlinedSingleton)(tree.span)
             case Some(t) if tree.isType =>
               inlinedFromOutside(TypeTree(t).withSpan(argSpan))(tree.span)
             case _ => tree