7 files changed, 25 insertions, 21 deletions
diff --git a/test/files/run/existentials3-new.check b/test/files/run/existentials3-new.check
index a036d92a24..2550f4dae0 100644
--- a/test/files/run/existentials3-new.check
+++ b/test/files/run/existentials3-new.check
@@ -1,24 +1,24 @@
-Bar.type, t=TypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
-Bar, t=TypeRef, s= <: Test.ToS with Product with Serializable{def copy(): Bar}
+Bar.type, t=TypeRef, s=type Bar.type
+Bar, t=TypeRef, s=type Bar
 Test.ToS, t=RefinedType, s=f3
 Test.ToS, t=RefinedType, s=f4
 Test.ToS, t=RefinedType, s=f5
 () => Test.ToS, t=TypeRef, s=class Function0
 () => Test.ToS, t=TypeRef, s=class Function0
-$anon, t=TypeRef, s= <: B with Test.ToS
-$anon, t=TypeRef, s= <: B with A with Test.ToS
+$anon, t=TypeRef, s=type $anon
+$anon, t=TypeRef, s=type $anon
 List[java.lang.Object{type T1}#T1], t=TypeRef, s=class List
 List[Seq[Int]], t=TypeRef, s=class List
 List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List
-Bar.type, t=TypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
-Bar, t=TypeRef, s= <: Test.ToS with Product with Serializable{def copy(): Bar}
+Bar.type, t=TypeRef, s=type Bar.type
+Bar, t=TypeRef, s=type Bar
 Test.ToS, t=RefinedType, s=g3
 Test.ToS, t=RefinedType, s=g4
 Test.ToS, t=RefinedType, s=g5
 () => Test.ToS, t=TypeRef, s=class Function0
 () => Test.ToS, t=TypeRef, s=class Function0
-$anon, t=TypeRef, s= <: B with Test.ToS
-$anon, t=TypeRef, s= <: B with A with Test.ToS
+$anon, t=TypeRef, s=type $anon
+$anon, t=TypeRef, s=type $anon
 List[java.lang.Object{type T1}#T1], t=TypeRef, s=class List
 List[Seq[Int]], t=TypeRef, s=class List
 List[Seq[U forSome { type U <: Int }]], t=TypeRef, s=class List
diff --git a/test/files/run/existentials3-new.scala b/test/files/run/existentials3-new.scala
index 16735eab4f..31ddc8cc9e 100644
--- a/test/files/run/existentials3-new.scala
+++ b/test/files/run/existentials3-new.scala
@@ -42,27 +42,27 @@ object Test {
 
   // tags do work for f10/g10
   def main(args: Array[String]): Unit = {
-    m(f1)
-    m(f2)
+    m2(f1)
+    m2(f2)
     m(f3)
     m(f4)
     m(f5)
     m(f6)
     m(f7)
-    m(f8)
-    m(f9)
+    m2(f8)
+    m2(f9)
     m2(f10)
     m(f11)
     m(f12)
-    m(g1)
-    m(g2)
+    m2(g1)
+    m2(g2)
     m(g3)
     m(g4)
     m(g5)
     m(g6)
     m(g7)
-    m(g8)
-    m(g9)
+    m2(g8)
+    m2(g9)
     m2(g10)
     m(g11)
     m(g12)
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 b2f6f7d50e..f693ad78cc 100644
--- a/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
+++ b/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
@@ -18,7 +18,8 @@ object Macros {
     val rupkg = c.mirror.staticModule("scala.reflect.runtime.package")
     val rusym = build.selectTerm(rupkg, "universe")
     val NullaryMethodType(rutpe) = rusym.typeSignature
-    val ru = build.newFreeTerm("ru", rutpe, scala.reflect.runtime.universe)
+    val ru = build.newFreeTerm("ru", scala.reflect.runtime.universe)
+    build.setTypeSignature(ru, rutpe)
 
     val tree2 = Apply(Select(Ident(ru), newTermName("reify")), List(Literal(Constant(2))))
     val ttree2 = c.typeCheck(tree2, withMacrosDisabled = true)
diff --git a/test/files/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala b/test/files/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala
index 948c047351..1dbf5a1a87 100644
--- a/test/files/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala
+++ b/test/files/run/macro-typecheck-macrosdisabled2/Impls_Macros_1.scala
@@ -18,7 +18,8 @@ object Macros {
     val rupkg = c.mirror.staticModule("scala.reflect.runtime.package")
     val rusym = build.selectTerm(rupkg, "universe")
     val NullaryMethodType(rutpe) = rusym.typeSignature
-    val ru = build.newFreeTerm("ru", rutpe, scala.reflect.runtime.universe)
+    val ru = build.newFreeTerm("ru", scala.reflect.runtime.universe)
+    build.setTypeSignature(ru, rutpe)
 
     val tree2 = Apply(Select(Ident(ru), newTermName("reify")), List(Apply(Select(Ident(newTermName("scala")), newTermName("Array")), List(Literal(Constant(2))))))
     val ttree2 = c.typeCheck(tree2, withMacrosDisabled = true)
diff --git a/test/files/run/t1195-new.scala b/test/files/run/t1195-new.scala
index 4edfb5073f..690c6213cf 100644
--- a/test/files/run/t1195-new.scala
+++ b/test/files/run/t1195-new.scala
@@ -9,7 +9,7 @@ object Test {
   val g1 = g()
   val h1 = h()
 
-  def m[T: TypeTag](x: T) = println(typeOf[T] + ", underlying = " + typeOf[T].typeSymbol.typeSignature)
+  def m[T: AbsTypeTag](x: T) = println(absTypeOf[T] + ", underlying = " + absTypeOf[T].typeSymbol.typeSignature)
 
   def main(args: Array[String]): Unit = {
     m(f)
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled.scala b/test/files/run/toolbox_typecheck_macrosdisabled.scala
index 01a418d42e..51eb63f294 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled.scala
+++ b/test/files/run/toolbox_typecheck_macrosdisabled.scala
@@ -12,7 +12,8 @@ object Test extends App {
   val rupkg = cm.staticModule("scala.reflect.runtime.package")
   val rusym = build.selectTerm(rupkg, "universe")
   val NullaryMethodType(rutpe) = rusym.typeSignature
-  val ru = build.newFreeTerm("ru", rutpe, scala.reflect.runtime.universe)
+  val ru = build.newFreeTerm("ru", scala.reflect.runtime.universe)
+  build.setTypeSignature(ru, rutpe)
 
   val tree1 = Apply(Select(Ident(ru), newTermName("reify")), List(Literal(Constant(2))))
   val ttree1 = toolbox.typeCheck(tree1, withMacrosDisabled = false)
diff --git a/test/files/run/toolbox_typecheck_macrosdisabled2.scala b/test/files/run/toolbox_typecheck_macrosdisabled2.scala
index 462dc9fa91..74fd09d9fd 100644
--- a/test/files/run/toolbox_typecheck_macrosdisabled2.scala
+++ b/test/files/run/toolbox_typecheck_macrosdisabled2.scala
@@ -12,7 +12,8 @@ object Test extends App {
   val rupkg = cm.staticModule("scala.reflect.runtime.package")
   val rusym = build.selectTerm(rupkg, "universe")
   val NullaryMethodType(rutpe) = rusym.typeSignature
-  val ru = build.newFreeTerm("ru", rutpe, scala.reflect.runtime.universe)
+  val ru = build.newFreeTerm("ru", scala.reflect.runtime.universe)
+  build.setTypeSignature(ru, rutpe)
 
   val tree1 = Apply(Select(Ident(ru), newTermName("reify")), List(Apply(Select(Ident(newTermName("scala")), newTermName("Array")), List(Literal(Constant(2))))))
   val ttree1 = toolbox.typeCheck(tree1, withMacrosDisabled = false)