deduplicate tuple tree creation code

Previously tuple tree generation code has been implemented in
three place: tree builder, tree gen, build utils. Now it's just
defined once in tree gen.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/reflect/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala
index fc6b26db3f..9d111e8852 100644
--- a/src/reflect/scala/reflect/internal/BuildUtils.scala
+++ b/src/reflect/scala/reflect/internal/BuildUtils.scala
@@ -325,11 +325,9 @@ trait BuildUtils { self: SymbolTable =>
     }
 
     object SyntacticTuple extends SyntacticTupleExtractor {
-      def apply(args: List[Tree]): Tree = args match {
-        case Nil      => Literal(Constant(()))
-        case _        =>
-          require(TupleClass(args.length).exists, s"Tuples with ${args.length} arity aren't supported")
-          self.Apply(TupleClass(args.length).companionModule, args: _*)
+      def apply(args: List[Tree]): Tree = {
+        require(args.isEmpty || TupleClass(args.length).exists, s"Tuples with ${args.length} arity aren't supported")
+        gen.mkTuple(args, flattenUnary = false)
       }
 
       def unapply(tree: Tree): Option[List[Tree]] = tree match {
@@ -343,11 +341,9 @@ trait BuildUtils { self: SymbolTable =>
     }
 
     object SyntacticTupleType extends SyntacticTupleExtractor {
-      def apply(args: List[Tree]): Tree = args match {
-        case Nil => self.Select(self.Ident(nme.scala_), tpnme.Unit)
-        case _   =>
-          require(TupleClass(args.length).exists, s"Tuples with ${args.length} arity aren't supported")
-          AppliedTypeTree(Ident(TupleClass(args.length)), args)
+      def apply(args: List[Tree]): Tree = {
+        require(args.isEmpty || TupleClass(args.length).exists, s"Tuples with ${args.length} arity aren't supported")
+        gen.mkTupleType(args, flattenUnary = false)
       }
 
       def unapply(tree: Tree): Option[List[Tree]] =  tree match {