Revert "SI-5824 Fix crashes in reify with _*"

This reverts commit 0a25ee3431d0314c782dd2e6620bc75c4de0d1a4.

It came with a test failure which I overlooked.

5 files changed, 5 insertions, 25 deletions

diff --git a/src/compiler/scala/reflect/reify/codegen/GenTrees.scala b/src/compiler/scala/reflect/reify/codegen/GenTrees.scala
index fd3673552b..f60089c935 100644
--- a/src/compiler/scala/reflect/reify/codegen/GenTrees.scala
+++ b/src/compiler/scala/reflect/reify/codegen/GenTrees.scala
@@ -177,7 +177,7 @@ trait GenTrees {
       // then we can reify the scrutinee as a symless AST and that will definitely be hygienic
       // why? because then typechecking of a scrutinee doesn't depend on the environment external to the quasiquote
       // otherwise we need to reify the corresponding type
-      if (tree.symbol.isLocalToReifee || tree.tpe.isLocalToReifee || treeInfo.isWildcardStarType(tree))
+      if (sym.isLocalToReifee || tpe.isLocalToReifee)
         reifyProduct(tree)
       else {
         if (reifyDebug) println("reifying bound type %s (underlying type is %s)".format(sym, tpe))
diff --git a/src/compiler/scala/reflect/reify/phases/Reshape.scala b/src/compiler/scala/reflect/reify/phases/Reshape.scala
index 71fe4ddeea..5dd5f08b45 100644
--- a/src/compiler/scala/reflect/reify/phases/Reshape.scala
+++ b/src/compiler/scala/reflect/reify/phases/Reshape.scala
@@ -187,12 +187,8 @@ trait Reshape {
     }
 
     private def toPreTyperTypedOrAnnotated(tree: Tree): Tree = tree match {
-      case ty @ Typed(expr1, tpt) =>
+      case ty @ Typed(expr1, tt @ TypeTree()) =>
         if (reifyDebug) println("reify typed: " + tree)
-        val original = tpt match {
-          case tt @ TypeTree() => tt.original
-          case tpt => tpt
-        }
         val annotatedArg = {
           def loop(tree: Tree): Tree = tree match {
             case annotated1 @ Annotated(ann, annotated2 @ Annotated(_, _)) => loop(annotated2)
@@ -200,15 +196,15 @@ trait Reshape {
             case _ => EmptyTree
           }
 
-          loop(original)
+          loop(tt.original)
         }
         if (annotatedArg != EmptyTree) {
           if (annotatedArg.isType) {
             if (reifyDebug) println("verdict: was an annotated type, reify as usual")
             ty
           } else {
-            if (reifyDebug) println("verdict: was an annotated value, equivalent is " + original)
-            toPreTyperTypedOrAnnotated(original)
+            if (reifyDebug) println("verdict: was an annotated value, equivalent is " + tt.original)
+            toPreTyperTypedOrAnnotated(tt.original)
           }
         } else {
           if (reifyDebug) println("verdict: wasn't annotated, reify as usual")
diff --git a/src/reflect/scala/reflect/internal/TreeInfo.scala b/src/reflect/scala/reflect/internal/TreeInfo.scala
index 0a8f1cb9ed..032a4aebef 100644
--- a/src/reflect/scala/reflect/internal/TreeInfo.scala
+++ b/src/reflect/scala/reflect/internal/TreeInfo.scala
@@ -412,13 +412,6 @@ abstract class TreeInfo {
     case _                   => false
   }
 
-  /** Is the argument a wildcard star type of the form `_*`?
-   */
-  def isWildcardStarType(tree: Tree): Boolean = tree match {
-    case Ident(tpnme.WILDCARD_STAR) => true
-    case _                          => false
-  }
-
   /** Is this pattern node a catch-all (wildcard or variable) pattern? */
   def isDefaultCase(cdef: CaseDef) = cdef match {
     case CaseDef(pat, EmptyTree, _) => isWildcardArg(pat)
diff --git a/test/files/run/t5824.check b/test/files/run/t5824.check
deleted file mode 100644
index 3774da60e5..0000000000
--- a/test/files/run/t5824.check
+++ /dev/null
@@ -1 +0,0 @@
-a b c
diff --git a/test/files/run/t5824.scala b/test/files/run/t5824.scala
deleted file mode 100644
index 2ad169e2d1..0000000000
--- a/test/files/run/t5824.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import scala.reflect.runtime.universe._
-import scala.tools.reflect.Eval
-
-object Test extends App {
-  reify {
-    println("%s %s %s".format(List("a", "b", "c"): _*))
-  }.eval
-}