From 828105f8ca5c34399608e87968fa840044113f3f Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Thu, 24 Mar 2016 14:50:15 -0700
Subject: Refactor. Extract mkLiteralUnit and mkUnitBlock

---
 src/compiler/scala/tools/nsc/typechecker/Typers.scala |  2 +-
 src/reflect/scala/reflect/internal/TreeGen.scala      | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 16d3f5134b..dd0c9fe945 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1186,7 +1186,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
       val savedUndetparams = context.undetparams
       silent(_.instantiate(tree, mode, UnitTpe)) orElse { _ =>
         context.undetparams = savedUndetparams
-        val valueDiscard = atPos(tree.pos)(Block(List(instantiate(tree, mode, WildcardType)), Literal(Constant(()))))
+        val valueDiscard = atPos(tree.pos)(gen.mkUnitBlock(instantiate(tree, mode, WildcardType)))
         typed(valueDiscard, mode, UnitTpe)
       }
     }
diff --git a/src/reflect/scala/reflect/internal/TreeGen.scala b/src/reflect/scala/reflect/internal/TreeGen.scala
index ec6426558c..c5038fd1bb 100644
--- a/src/reflect/scala/reflect/internal/TreeGen.scala
+++ b/src/reflect/scala/reflect/internal/TreeGen.scala
@@ -310,13 +310,16 @@ abstract class TreeGen {
   /** Builds a tuple */
   def mkTuple(elems: List[Tree], flattenUnary: Boolean = true): Tree = elems match {
     case Nil =>
-      Literal(Constant(()))
+      mkLiteralUnit
     case tree :: Nil if flattenUnary =>
       tree
     case _ =>
       Apply(scalaDot(TupleClass(elems.length).name.toTermName), elems)
   }
 
+  def mkLiteralUnit: Literal = Literal(Constant(()))
+  def mkUnitBlock(expr: Tree): Block = Block(List(expr), mkLiteralUnit)
+
   def mkTupleType(elems: List[Tree], flattenUnary: Boolean = true): Tree = elems match {
     case Nil =>
       scalaDot(tpnme.Unit)
@@ -395,7 +398,7 @@ abstract class TreeGen {
         if (body forall treeInfo.isInterfaceMember) None
         else Some(
           atPos(wrappingPos(superPos, lvdefs)) (
-            DefDef(NoMods, nme.MIXIN_CONSTRUCTOR, Nil, ListOfNil, TypeTree(), Block(lvdefs, Literal(Constant(()))))))
+            DefDef(NoMods, nme.MIXIN_CONSTRUCTOR, Nil, ListOfNil, TypeTree(), Block(lvdefs, mkLiteralUnit))))
       }
       else {
         // convert (implicit ... ) to ()(implicit ... ) if it's the only parameter section
@@ -409,7 +412,7 @@ abstract class TreeGen {
                                          // therefore here we emit a dummy which gets populated when the template is named and typechecked
         Some(
           atPos(wrappingPos(superPos, lvdefs ::: vparamss1.flatten).makeTransparent) (
-            DefDef(constrMods, nme.CONSTRUCTOR, List(), vparamss1, TypeTree(), Block(lvdefs ::: List(superCall), Literal(Constant(()))))))
+            DefDef(constrMods, nme.CONSTRUCTOR, List(), vparamss1, TypeTree(), Block(lvdefs ::: List(superCall), mkLiteralUnit))))
       }
     }
     constr foreach (ensureNonOverlapping(_, parents ::: gvdefs, focus = false))
@@ -481,7 +484,7 @@ abstract class TreeGen {
    *  written by end user. It's important to distinguish the two so that
    *  quasiquotes can strip synthetic ones away.
    */
-  def mkSyntheticUnit() = Literal(Constant(())).updateAttachment(SyntheticUnitAttachment)
+  def mkSyntheticUnit() = mkLiteralUnit.updateAttachment(SyntheticUnitAttachment)
 
   /** Create block of statements `stats`  */
   def mkBlock(stats: List[Tree], doFlatten: Boolean = true): Tree =
-- 
cgit v1.2.3