Do not normalizedType in the default code path

Author: OlivierBlanvillain

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

@@ -376,10 +376,9 @@ trait TypeAssigner {
           val tpe =
             if (fntpe.isResultDependent) safeSubstParams(fntpe.resultType, fntpe.paramRefs, args.tpes)
             else fntpe.resultType
-          val tpe1 =
-            if (!ctx.erasedTypes && (fn.symbol.isDependentMethod || ctx.isDependent)) TypeOf(tpe, tree)
-            else tpe
-          ctx.normalizedType(tpe1)
+          if (!ctx.erasedTypes && (fn.symbol.isDependentMethod || ctx.isDependent))
+            ctx.normalizedType(TypeOf(tpe, tree))
+          else tpe
         } else
           errorType(i"wrong number of arguments at ${ctx.phase.prev} for $fntpe: ${fn.tpe}, expected: ${fntpe.paramInfos.length}, found: ${args.length}", tree.pos)
       case t =>
@@ -439,10 +438,9 @@ trait TypeAssigner {
           val argTypes = args.tpes
           if (sameLength(argTypes, paramNames)) {
             val tpe = pt.instantiate(argTypes)
-            val tpe1 =
-              if (!ctx.erasedTypes && (fn.symbol.isDependentMethod || ctx.isDependent)) TypeOf(tpe, tree)
-              else tpe
-            ctx.normalizedType(tpe1)
+            if (!ctx.erasedTypes && (fn.symbol.isDependentMethod || ctx.isDependent))
+              ctx.normalizedType(TypeOf(tpe, tree))
+            else tpe
           }
           else wrongNumberOfTypeArgs(fn.tpe, pt.typeParams, args, tree.pos)
         }
@@ -517,13 +515,13 @@ trait TypeAssigner {
         if (TypeOf.isLegalTopLevelTree(ref))
           if (ref.tpe.isInstanceOf[TypeOf] ||
               ref.tpe.isInstanceOf[ConstantType]) // Can happen because of typer's constant folding
-            ref.tpe
+            ctx.normalizedType(ref.tpe)
           else
             errorType(i"Non-sensical singleton-type expression: $ref: ${ref.tpe}", ref.pos)
         else
           throw new AssertionError(i"Tree $ref is not a valid reference for a singleton type tree.")
     }
-    tree.withType(ctx.normalizedType(tp))
+    tree.withType(tp)
   }
 
   def assignType(tree: untpd.AndTypeTree, left: Tree, right: Tree)(implicit ctx: Context) =