Avoid typechecking val and def tpt-s twice

Author: retronym

src/compiler/scala/tools/nsc/typechecker/Namers.scala

@@ -1311,7 +1311,11 @@ trait Namers extends MethodSynthesis {
 
       val resTpGiven =
         if (tpt.isEmpty) WildcardType
-        else typer.typedType(tpt).tpe
+        else {
+          val tptTyped = typer.typedType(tpt)
+          context.unit.transformed(tpt) = tptTyped
+          tptTyped.tpe
+        }
 
 
       // ignore missing types unless we can look to overridden method to recover the missing information
@@ -1723,7 +1727,11 @@ trait Namers extends MethodSynthesis {
 
             tptFromRhsUnderPt
           }
-        } else typer.typedType(tpt).tpe
+        } else {
+          val tptTyped = typer.typedType(tpt)
+          context.unit.transformed(tpt) = tptTyped
+          tptTyped.tpe
+        }
 
 //      println(s"val: $result / ${vdef.tpt.tpe} / ")
 

src/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -2087,7 +2087,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
       } else typedModifiers(vdef.mods)
 
       sym.annotations.map(_.completeInfo())
-      val tpt1 = checkNoEscaping.privates(this, sym, typedType(vdef.tpt))
+      val tpt1 = checkNoEscaping.privates(this, sym, transformedOr(vdef.tpt, typedType(vdef.tpt)))
       checkNonCyclic(vdef, tpt1)
 
       // allow trait accessors: it's the only vehicle we have to hang on to annotations that must be passed down to
@@ -2315,7 +2315,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
           if (isRepeatedParamType(vparam1.symbol.tpe))
             StarParamNotLastError(vparam1)
 
-        val tpt1 = checkNoEscaping.privates(this, meth, typedType(ddef.tpt))
+        val tpt1 = checkNoEscaping.privates(this, meth, transformedOr(ddef.tpt, typedType(ddef.tpt)))
         checkNonCyclic(ddef, tpt1)
         ddef.tpt.setType(tpt1.tpe)
         val typedMods = typedModifiers(ddef.mods)

test/files/neg/t5148.check

@@ -1,13 +1,7 @@
-t5148.scala:4: error: Symbol 'term scala.tools.nsc.interpreter.IMain.memberHandlers' is missing from the classpath.
-This symbol is required by 'method scala.tools.nsc.interpreter.Imports.allReqAndHandlers'.
-Make sure that term memberHandlers is in your classpath and check for conflicting dependencies with `-Ylog-classpath`.
+t5148.scala:4: error: Symbol 'term scala.tools.nsc.interpreter.IMain.global' is missing from the classpath.
+This symbol is required by 'method scala.tools.nsc.interpreter.Imports.membersAtPickler'.
+Make sure that term global is in your classpath and check for conflicting dependencies with `-Ylog-classpath`.
 A full rebuild may help if 'Imports.class' was compiled against an incompatible version of scala.tools.nsc.interpreter.IMain.
 class IMain extends Imports
             ^
-t5148.scala:4: error: Symbol 'type scala.tools.nsc.interpreter.IMain.Request.Wrapper' is missing from the classpath.
-This symbol is required by 'value scala.tools.nsc.interpreter.Imports.wrapper'.
-Make sure that type Wrapper is in your classpath and check for conflicting dependencies with `-Ylog-classpath`.
-A full rebuild may help if 'Imports.class' was compiled against an incompatible version of scala.tools.nsc.interpreter.IMain.Request.
-class IMain extends Imports
-      ^
-two errors found
+one error found

test/files/run/reflection-names.check

@@ -1,4 +1,4 @@
 (java.lang.String,bc)
-(scala.reflect.internal.Names$TermName,bc)
-(scala.reflect.internal.Names$TypeName,bc)
-(scala.reflect.internal.Names$TypeName,bc)
+(scala.reflect.internal.NameTable$TermName,bc)
+(scala.reflect.internal.NameTable$TypeName,bc)
+(scala.reflect.internal.NameTable$TypeName,bc)

test/junit/scala/reflect/internal/PrintersTest.scala

@@ -332,7 +332,7 @@ class BasePrintTest {
   @Test def testFunc2 = assertResultCode(
     code = "val sum: Seq[Int] => Int = _ reduceLeft (_+_)")(
     parsedCode = "val sum: _root_.scala.Function1[Seq[Int], Int] = ((x$1) => x$1.reduceLeft(((x$2, x$3) => x$2.+(x$3))))",
-    typedCode = "val sum: _root_.scala.Function1[scala.`package`.Seq[scala.Int], scala.Int] = ((x$1: Seq[Int]) => x$1.reduceLeft[Int](((x$2: Int, x$3: Int) => x$2.+(x$3))))")
+    typedCode = "val sum: scala.Function1[scala.`package`.Seq[scala.Int], scala.Int] = ((x$1: Seq[Int]) => x$1.reduceLeft[Int](((x$2: Int, x$3: Int) => x$2.+(x$3))))")
 
   @Test def testFunc3 = assertResultCode(
     code = "List(1, 2, 3) map (_ - 1)")(