10 files changed, 13 insertions, 13 deletions
diff --git a/test/files/run/existentials3.check b/test/files/run/existentials3.check
index 8227d77909..85bc430a21 100644
--- a/test/files/run/existentials3.check
+++ b/test/files/run/existentials3.check
@@ -7,7 +7,7 @@ ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
 ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
 ConcreteTypeTag[$anon], t=TypeRef, s= <: B with Test.ToS
 ConcreteTypeTag[$anon], t=TypeRef, s= <: B with A with Test.ToS
-ConcreteTypeTag[List[Object{type T1}#T1]], t=TypeRef, s=class List
+TypeTag[List[Object{type T1}#T1]], t=TypeRef, s=class List
 ConcreteTypeTag[List[Seq[Int]]], t=TypeRef, s=class List
 ConcreteTypeTag[List[Seq[U forSome { type U <: Int }]]], t=TypeRef, s=class List
 ConcreteTypeTag[Bar.type], t=TypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
@@ -19,6 +19,6 @@ ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
 ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
 ConcreteTypeTag[$anon], t=TypeRef, s= <: B with Test.ToS
 ConcreteTypeTag[$anon], t=TypeRef, s= <: B with A with Test.ToS
-ConcreteTypeTag[List[Object{type T1}#T1]], t=TypeRef, s=class List
+TypeTag[List[Object{type T1}#T1]], t=TypeRef, s=class List
 ConcreteTypeTag[List[Seq[Int]]], t=TypeRef, s=class List
 ConcreteTypeTag[List[Seq[U forSome { type U <: Int }]]], t=TypeRef, s=class List
diff --git a/test/files/run/macro-reify-typetag-typeparams-notags.check b/test/files/run/macro-reify-typetag-typeparams-notags.check
index af4877e205..11d78ece41 100644
--- a/test/files/run/macro-reify-typetag-typeparams-notags.check
+++ b/test/files/run/macro-reify-typetag-typeparams-notags.check
@@ -1,2 +1,2 @@
-ConcreteTypeTag[T]
-ConcreteTypeTag[List[T]]
+TypeTag[T]
+TypeTag[List[T]]
diff --git a/test/files/run/macro-reify-typetag-typeparams-tags.check b/test/files/run/macro-reify-typetag-typeparams-tags.check
index d75b3c72b2..458593c449 100644
--- a/test/files/run/macro-reify-typetag-typeparams-tags.check
+++ b/test/files/run/macro-reify-typetag-typeparams-tags.check
@@ -1,2 +1,2 @@
 ConcreteTypeTag[Int]
-ConcreteTypeTag[List[Int]]
+*ConcreteTypeTag[List[Int]]
diff --git a/test/files/run/macro-reify-typetag-usegroundtypetag.check b/test/files/run/macro-reify-typetag-usegroundtypetag.check
index d75b3c72b2..458593c449 100644
--- a/test/files/run/macro-reify-typetag-usegroundtypetag.check
+++ b/test/files/run/macro-reify-typetag-usegroundtypetag.check
@@ -1,2 +1,2 @@
 ConcreteTypeTag[Int]
-ConcreteTypeTag[List[Int]]
+*ConcreteTypeTag[List[Int]]
diff --git a/test/files/run/macro-typecheck-macrosdisabled.check b/test/files/run/macro-typecheck-macrosdisabled.check
index b432a539fc..3e1057520b 100644
--- a/test/files/run/macro-typecheck-macrosdisabled.check
+++ b/test/files/run/macro-typecheck-macrosdisabled.check
@@ -1,5 +1,5 @@
 {
   val $mr: reflect.mirror.type = scala.reflect.`package`.mirror;
-  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))
+  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2)), classOf[scala.Int]))
 }
 mr.reify[Int](2)
diff --git a/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala b/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
index c253f0b1fb..a1f124f790 100644
--- a/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
+++ b/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
@@ -8,7 +8,7 @@ object Macros {
     //val mrPkg = staticModule("scala.reflect.package")
     //val mrSym = selectTerm(mrPkg, "mirror")
     //val NullaryMethodType(mrTpe) = mrSym.typeSignature
-    //val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror, null)
+    //val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror)
     //val tree1 = Apply(Select(Ident(mr), newTermName("reify")), List(Literal(Constant(2))))
 
     val mr = Select(Select(Select(Ident(newTermName("scala")), newTermName("reflect")), newTermName("package")), newTermName("mirror"))
@@ -25,7 +25,7 @@ object Macros {
     val mrPkg = staticModule("scala.reflect.package")
     val mrSym = selectTerm(mrPkg, "mirror")
     val NullaryMethodType(mrTpe) = mrSym.typeSignature
-    val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror, null)
+    val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror)
 
     val tree2 = Apply(Select(Ident(mr), newTermName("reify")), List(Literal(Constant(2))))
     val ttree2 = c.typeCheck(tree2, withMacrosDisabled = true)
diff --git a/test/files/run/reify_newimpl_26.check b/test/files/run/reify_newimpl_26.check
index bfbf1d653d..d92b3bd817 100644
--- a/test/files/run/reify_newimpl_26.check
+++ b/test/files/run/reify_newimpl_26.check
@@ -16,7 +16,7 @@ scala> def foo[T]{
 foo: [T]=> Unit
 
 scala> foo[Int]
-ConcreteTypeTag[List[T]]
+TypeTag[List[T]]
 
 scala> 
 
diff --git a/test/files/run/t3507.check b/test/files/run/t3507.check
index 50ab029592..6e4fa4170e 100644
--- a/test/files/run/t3507.check
+++ b/test/files/run/t3507.check
@@ -1 +1 @@
-ConcreteTypeTag[_1.type#b.c.type]
+ConcreteTypeTag[_1.b.c.type]
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.check b/test/files/run/toolbox_typecheck_macrosdisabled.check
index cf2420bc17..c4af175812 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled.check
+++ b/test/files/run/toolbox_typecheck_macrosdisabled.check
@@ -1,5 +1,5 @@
 {
   val $mr: mr.type = mr;
-  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2))))
+  $mr.Expr.apply[Int(2)]($mr.Literal.apply($mr.Constant.apply(2)))($mr.ConcreteTypeTag.apply[Int(2)]($mr.ConstantType.apply($mr.Constant.apply(2)), classOf[scala.Int]))
 }
 mr.reify[Int](2)
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.scala b/test/files/run/toolbox_typecheck_macrosdisabled.scala
index 7d2707d5e1..afbbce1736 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled.scala
+++ b/test/files/run/toolbox_typecheck_macrosdisabled.scala
@@ -5,7 +5,7 @@ object Test extends App {
   val mrPkg = staticModule("scala.reflect.package")
   val mrSym = selectTerm(mrPkg, "mirror")
   val NullaryMethodType(mrTpe) = mrSym.typeSignature
-  val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror, null)
+  val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror)
 
   val tree1 = Apply(Select(Ident(mr), newTermName("reify")), List(Literal(Constant(2))))
   val ttree1 = toolbox.typeCheck(tree1, withMacrosDisabled = false)