Merge branch 'merge-2.10.wip-x' into merge-2.10.x-master

* merge-2.10.wip-x: (24 commits)
  SI-6023 reify abstract vals
  Removing controversial `either` method from Futures API.
  SI-6695 Test case for fixed Array match bug
  adds comments to standard attachments
  SI-6673 fixes macro problems with eta expansions
  Restore the opimization apparently lost after merge.
  SI-6624 set info of case pattern binder to help find case field accessors
  Scaladoc update for collection.mutable.MultiMap
  SI-6663: don't ignore type parameter on selectDynamic invocation
  SI-6551: don't insert apply call in polymorphic expression.
  SI-6634 Fixes data corruption issue in ListBuffer#remove
  Fixes SI-6628, Revert "Fix for view isEmpty."
  SI-6661 - Remove obsolete implicit parameter of scala.concurrent.promise method
  Fixes SI-6150 - backport to 2.10.x branch.
  SI-5330, SI-6014 deal with existential self-type
  Fixes SI-6559 - StringContext not using passed in escape function.
  SI-6648 copyAttrs must preserve TypeTree#wasEmpty
  Fix raw string interpolator: string parts which were after the first argument were still escaped
  sane printing of renamed imports
  SI-6440 Address regressions around MissingRequirementError
  ...

Conflicts:
	src/library/scala/collection/generic/IndexedSeqFactory.scala
	src/library/scala/collection/mutable/ListBuffer.scala
	src/reflect/scala/reflect/internal/Symbols.scala
	src/reflect/scala/reflect/internal/Types.scala
	test/files/run/t6150.scala

31 files changed, 509 insertions, 27 deletions

diff --git a/test/files/neg/t5148.check b/test/files/neg/t5148.check
index 6edfdf2b1e..25107c4dbe 100644
--- a/test/files/neg/t5148.check
+++ b/test/files/neg/t5148.check
@@ -1,3 +1,9 @@
-error: bad symbolic reference to value global in class IMain - referenced from t5148.scala (a classfile may be missing)
-error: bad symbolic reference to value memberHandlers in class IMain - referenced from t5148.scala (a classfile may be missing)
+error: bad symbolic reference. A signature in Imports.class refers to term global
+in class scala.tools.nsc.interpreter.IMain which is not available.
+It may be completely missing from the current classpath, or the version on
+the classpath might be incompatible with the version used when compiling Imports.class.
+error: bad symbolic reference. A signature in Imports.class refers to term memberHandlers
+in class scala.tools.nsc.interpreter.IMain which is not available.
+It may be completely missing from the current classpath, or the version on
+the classpath might be incompatible with the version used when compiling Imports.class.
 two errors found
diff --git a/test/files/neg/t6663.check b/test/files/neg/t6663.check
new file mode 100644
index 0000000000..aa4faa4a46
--- /dev/null
+++ b/test/files/neg/t6663.check
@@ -0,0 +1,6 @@
+t6663.scala:16: error: type mismatch;
+ found   : String
+ required: Int
+  var v = new C(42).foo[String].get :Int
+                                ^
+one error found
diff --git a/test/files/neg/t6663.scala b/test/files/neg/t6663.scala
new file mode 100644
index 0000000000..4a358dfbc5
--- /dev/null
+++ b/test/files/neg/t6663.scala
@@ -0,0 +1,19 @@
+import language.dynamics
+
+class C(v: Any) extends Dynamic {
+  def selectDynamic[T](n: String): Option[T] = Option(v.asInstanceOf[T])
+  def applyDynamic[T](n: String)(): Option[T] = Option(v.asInstanceOf[T])
+}
+
+object Test extends App {
+  // this should be converted to
+  // C(42).selectDynamic[String]("foo").get
+  // causing a compile error.
+
+  // but, before fixing SI-6663, became
+  // C(42).selectDynamic("foo").get, ignoring
+  // the [String] type parameter
+  var v = new C(42).foo[String].get :Int
+  println(v)
+}
+
diff --git a/test/files/pos/t6551.scala b/test/files/pos/t6551.scala
new file mode 100644
index 0000000000..fb68663809
--- /dev/null
+++ b/test/files/pos/t6551.scala
@@ -0,0 +1,13 @@
+import language.dynamics
+
+object Test {
+  def main(args: Array[String]) {
+    class Lenser[T] extends Dynamic {
+      def selectDynamic(propName: String) = ???
+    }
+
+    def lens[T] = new Lenser[T]
+
+    val qq = lens[String]
+  }
+}
diff --git a/test/files/pos/t6624.scala b/test/files/pos/t6624.scala
new file mode 100644
index 0000000000..1a92b92d53
--- /dev/null
+++ b/test/files/pos/t6624.scala
@@ -0,0 +1,28 @@
+sealed trait KList[+M[_]]
+
+case class KCons[M[_], +T <: KList[M]](
+  tail: T
+) extends KList[M]
+
+case class KNil[M[_]]() extends KList[M]
+
+object Test {
+  val klist: KCons[Option, KCons[Option, KCons[Option, KNil[Nothing]]]] = ???
+
+  // crashes with
+  // "Exception in thread "main" scala.reflect.internal.Types$TypeError: value _1 is not a member 
+  // of KCons[Option,KCons[Option,KNil[Nothing]]]"
+  klist match {
+   case KCons(KCons(KCons(_))) =>
+  }
+
+  // fails with a similar message as an error, rather than a crash.
+  klist match {
+    case KCons(KCons(_)) =>
+  }
+
+  // succeeds
+  klist match {
+    case KCons(_) =>
+  }
+}
\ No newline at end of file
diff --git a/test/files/pos/t6648.scala b/test/files/pos/t6648.scala
new file mode 100644
index 0000000000..9593ebfee9
--- /dev/null
+++ b/test/files/pos/t6648.scala
@@ -0,0 +1,24 @@
+abstract class Node extends NodeSeq
+trait NodeSeq extends Seq[Node]
+object NodeSeq {
+  implicit def seqToNodeSeq(ns: Seq[Node]): NodeSeq = ???
+   def foo[B, That](f: Seq[B])(implicit bf: scala.collection.generic.CanBuildFrom[Seq[Int], B, That]): That = ???
+}
+
+class Transformer {
+  def apply(nodes: Any): Any = ???
+}
+
+object transformer1 extends Transformer {
+  // Adding explicit type arguments, or making the impilcit view
+  // seqToNodeSeq explicit avoids the crash
+  NodeSeq.foo {
+    // These both avoid the crash:
+    // val t = new Transformer {}; t.apply(null)
+    // new Transformer().apply(null)
+    new Transformer {}.apply(null)
+
+    null: NodeSeq
+  }: NodeSeq
+}
+
diff --git a/test/files/run/showraw_aliases.check b/test/files/run/showraw_aliases.check
new file mode 100644
index 0000000000..1838bf9bec
--- /dev/null
+++ b/test/files/run/showraw_aliases.check
@@ -0,0 +1,2 @@
+Block(List(Import(Select(Select(Ident(scala), scala.reflect), scala.reflect.runtime), List(ImportSelector(newTermName("universe"), 52, newTermName("ru"), 64)))), Select(Select(Select(Select(Ident(scala), scala.reflect), scala.reflect.runtime), scala.reflect.runtime.package), [newTermName("universe") aka newTermName("ru")]))
+Block(List(Import(Select(Select(Ident(scala#<id>), scala.reflect#<id>), scala.reflect.runtime#<id>), List(ImportSelector(newTermName("universe"), 52, newTermName("ru"), 64)))), Select(Select(Select(Select(Ident(scala#<id>), scala.reflect#<id>), scala.reflect.runtime#<id>), scala.reflect.runtime.package#<id>), [newTermName("universe")#<id> aka newTermName("ru")]))
diff --git a/test/files/run/showraw_aliases.scala b/test/files/run/showraw_aliases.scala
new file mode 100644
index 0000000000..3a68ca37b2
--- /dev/null
+++ b/test/files/run/showraw_aliases.scala
@@ -0,0 +1,15 @@
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.ToolBox
+
+object Test extends App {
+  val tb = runtimeMirror(getClass.getClassLoader).mkToolBox()
+  val tree = tb.parse("""
+    import scala.reflect.runtime.{universe => ru}
+    ru
+  """)
+  val ttree = tb.typeCheck(tree)
+
+  def stabilize(s: String) = """#\d+""".r.replaceAllIn(s, "#<id>")
+  println(showRaw(ttree))
+  println(stabilize(showRaw(ttree, printIds = true)))
+}
\ No newline at end of file
diff --git a/test/files/run/t6023.check b/test/files/run/t6023.check
new file mode 100644
index 0000000000..ee93565234
--- /dev/null
+++ b/test/files/run/t6023.check
@@ -0,0 +1,12 @@
+{
+  abstract trait Foo extends AnyRef {
+    <stable> <accessor> def a: Int
+  };
+  ()
+}
+{
+  abstract trait Foo extends AnyRef {
+    <stable> <accessor> def a: Int
+  };
+  ()
+}
diff --git a/test/files/run/t6023.scala b/test/files/run/t6023.scala
new file mode 100644
index 0000000000..07af3685a5
--- /dev/null
+++ b/test/files/run/t6023.scala
@@ -0,0 +1,17 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
+object Test extends App {
+  // test 1: reify
+  val tree = reify{ trait Foo { val a: Int } }.tree
+  println(tree.toString)
+
+  // test 2: import and typecheck
+  val toolbox = cm.mkToolBox()
+  val ttree = toolbox.typeCheck(tree)
+  println(ttree.toString)
+
+  // test 3: import and compile
+  toolbox.eval(tree)
+}
diff --git a/test/files/run/t6440.check b/test/files/run/t6440.check
index b5684daee4..69c253eab4 100644
--- a/test/files/run/t6440.check
+++ b/test/files/run/t6440.check
@@ -1 +1,4 @@
-Stream((), ?)
+pos: source-newSource1,line-9,offset=109 bad symbolic reference. A signature in U.class refers to term pack1
+in package <root> which is not available.
+It may be completely missing from the current classpath, or the version on
+the classpath might be incompatible with the version used when compiling U.class. ERROR
diff --git a/test/files/run/t6440.scala b/test/files/run/t6440.scala
index 2b690f31e1..5a3a4150d9 100644
--- a/test/files/run/t6440.scala
+++ b/test/files/run/t6440.scala
@@ -1,7 +1,48 @@
-object Test {
+import scala.tools.partest._
+import java.io.File
 
-  def main(args: Array[String]): Unit = {
-    println(Stream.continually(()).filterNot(_ => false).take(2))
+object Test extends StoreReporterDirectTest {
+  def code = ???
+
+  def compileCode(code: String) = {
+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
+    compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(code)
   }
 
+  def library1 = """
+    package pack1
+    trait T
+  """
+
+  def library2 = """
+    package pack2
+    trait U extends pack1.T
+  """
+
+  def app = """
+    package pack3
+    object X {
+      trait U
+    }
+    import X._
+    import pack2._
+
+    trait V extends U
+  """
+
+  def show(): Unit = {
+    Seq(library1, library2) foreach compileCode
+    assert(filteredInfos.isEmpty, filteredInfos)
+
+    // blow away the entire package
+    val pack1 = new File(testOutput.path, "pack1")
+    val tClass = new File(pack1, "T.class")
+    assert(tClass.exists)
+    assert(tClass.delete())
+    assert(pack1.delete())
+
+    // bad symbolic reference error expected (but no stack trace!)
+    compileCode(app)
+    println(filteredInfos.mkString("\n"))
+  }
 }
diff --git a/test/files/run/t6440b.check b/test/files/run/t6440b.check
new file mode 100644
index 0000000000..9771ce5efb
--- /dev/null
+++ b/test/files/run/t6440b.check
@@ -0,0 +1,4 @@
+pos: NoPosition bad symbolic reference. A signature in U.class refers to type T
+in package pack1 which is not available.
+It may be completely missing from the current classpath, or the version on
+the classpath might be incompatible with the version used when compiling U.class. ERROR
diff --git a/test/files/run/t6440b.scala b/test/files/run/t6440b.scala
new file mode 100644
index 0000000000..974aca2844
--- /dev/null
+++ b/test/files/run/t6440b.scala
@@ -0,0 +1,61 @@
+import scala.tools.partest._
+import java.io.File
+
+object Test extends StoreReporterDirectTest {
+  def code = ???
+
+  def compileCode(code: String) = {
+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
+    compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(code)
+  }
+
+  def library1 = """
+    package pack1
+    trait T
+    class U {
+      def t = new T {}
+      def one = 1
+    }
+  """
+
+  def library2 = """
+    package pack2
+    object V {
+      def u = new pack1.U
+    }
+    """
+
+  def app1 = """
+    package pack3
+    object Test {
+      pack2.V.u.one // okay
+    }
+  """
+
+  def app2 = """
+    package pack3
+    object Test {
+      pack2.V.u.t // we have to fail if T.class is misisng
+    }
+  """
+
+  def show(): Unit = {
+    compileCode(library1)
+    val pack1 = new File(testOutput.path, "pack1")
+    val tClass = new File(pack1, "T.class")
+    assert(tClass.exists)
+    assert(tClass.delete())
+
+    // allowed to compile, no direct reference to `T`
+    compileCode(library2)
+    assert(filteredInfos.isEmpty, filteredInfos)
+
+    // allowed to compile, no direct reference to `T`
+    compileCode(app1)
+    assert(filteredInfos.isEmpty, filteredInfos)
+
+    // bad symbolic reference error expected (but no stack trace!)
+    compileCode(app2)
+    println(filteredInfos.mkString("\n"))
+  }
+}
diff --git a/test/files/run/t6628.check b/test/files/run/t6628.check
new file mode 100644
index 0000000000..bb101b641b
--- /dev/null
+++ b/test/files/run/t6628.check
@@ -0,0 +1,2 @@
+true
+true
diff --git a/test/files/run/t6628.scala b/test/files/run/t6628.scala
new file mode 100644
index 0000000000..84524a7a35
--- /dev/null
+++ b/test/files/run/t6628.scala
@@ -0,0 +1,11 @@
+object Test {
+  def coll = new Traversable[String] {
+    override def foreach[U](f:String=>U) { f("1") }
+  }
+  val dropped = coll.view drop 1
+
+  def main(args: Array[String]): Unit = {
+    println(dropped.isEmpty)
+    println(dropped.force.isEmpty)
+  }
+}
diff --git a/test/files/run/t6632.check b/test/files/run/t6632.check
new file mode 100644
index 0000000000..1f084b1dac
--- /dev/null
+++ b/test/files/run/t6632.check
@@ -0,0 +1,3 @@
+java.lang.IndexOutOfBoundsException: -1
+java.lang.IndexOutOfBoundsException: -2
+java.lang.IndexOutOfBoundsException: -3
diff --git a/test/files/run/t6632.scala b/test/files/run/t6632.scala
new file mode 100644
index 0000000000..c1c8d4abe0
--- /dev/null
+++ b/test/files/run/t6632.scala
@@ -0,0 +1,29 @@
+object Test extends App {
+  import collection.mutable.ListBuffer
+  
+  def newLB = ListBuffer('a, 'b, 'c, 'd, 'e)
+
+  val lb0 = newLB
+
+  try {
+    lb0.insert(-1, 'x)
+  } catch {
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+
+  val lb1 = newLB
+
+  try {
+    lb1.insertAll(-2, Array('x, 'y, 'z))
+  } catch {
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+
+  val lb2 = newLB
+
+  try {
+    lb2.update(-3, 'u)
+  } catch {
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t6633.check b/test/files/run/t6633.check
new file mode 100644
index 0000000000..1ff8cdbc44
--- /dev/null
+++ b/test/files/run/t6633.check
@@ -0,0 +1,3 @@
+java.lang.IndexOutOfBoundsException: 9
+replStringOf OK
+length OK
diff --git a/test/files/run/t6633.scala b/test/files/run/t6633.scala
new file mode 100644
index 0000000000..bd993c8d88
--- /dev/null
+++ b/test/files/run/t6633.scala
@@ -0,0 +1,33 @@
+object Test extends App {
+  import collection.mutable.ListBuffer
+
+  def newLB = ListBuffer('a, 'b, 'c, 'd, 'e)
+
+  val lb0 = newLB
+
+  try {
+    lb0.insert(9, 'x)
+  } catch {
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+
+  val lb1 = newLB
+
+  try {
+    lb1.insert(9, 'x)
+  } catch {
+    case ex: IndexOutOfBoundsException =>
+  }
+
+  val replStr = scala.runtime.ScalaRunTime.replStringOf(lb1, 100)
+  if (replStr == "ListBuffer('a, 'b, 'c, 'd, 'e)\n")
+    println("replStringOf OK")
+  else
+    println("replStringOf FAILED: " + replStr)
+
+  val len = lb1.length
+  if (len == 5)
+    println("length OK")
+  else
+    println("length FAILED: " + len)
+}
\ No newline at end of file
diff --git a/test/files/run/t6634.check b/test/files/run/t6634.check
new file mode 100644
index 0000000000..f6cbb30c67
--- /dev/null
+++ b/test/files/run/t6634.check
@@ -0,0 +1,31 @@
+Trying lb0 ...
+Checking ...
+String OK.
+Length OK.
+
+Trying lb1 ...
+Checking ...
+String OK.
+Length OK.
+
+Trying lb2 ...
+Checking ...
+String OK.
+Length OK.
+
+Trying lb3 ...
+Checking ...
+String OK.
+Length OK.
+
+Trying lb4 ...
+Checking ...
+String OK.
+Length OK.
+
+Trying lb5 ...
+java.lang.IllegalArgumentException: removing negative number (-1) of elements
+Checking ...
+String OK.
+Length OK.
+
diff --git a/test/files/run/t6634.scala b/test/files/run/t6634.scala
new file mode 100644
index 0000000000..759e6d519d
--- /dev/null
+++ b/test/files/run/t6634.scala
@@ -0,0 +1,80 @@
+import collection.mutable.ListBuffer
+
+object Test extends App {
+  def newLB = ListBuffer('a, 'b, 'c, 'd, 'e)
+
+  val lb0 = newLB
+  println("Trying lb0 ...")
+  try {
+    lb0.remove(5, 0)
+  } catch {
+    // Not thrown in 2.10, will be thrown in 2.11
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+  checkNotCorrupted(lb0)
+
+  val lb1 = newLB
+  println("Trying lb1 ...")
+  try {
+    lb1.remove(6, 6)
+  } catch {
+    // Not thrown in 2.10, will be thrown in 2.11
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+  checkNotCorrupted(lb1)
+
+  val lb2 = newLB
+  println("Trying lb2 ...")
+  try {
+    lb2.remove(99, 6)
+  } catch {
+    // Not thrown in 2.10, will be thrown in 2.11
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+  checkNotCorrupted(lb2)
+
+  val lb3 = newLB
+  println("Trying lb3 ...")
+  try {
+    lb3.remove(1, 9)
+  } catch {
+    // Not thrown in 2.10, will be thrown in 2.11
+    case ex: IllegalArgumentException => println(ex)
+  }
+  checkNotCorrupted(lb3, "ListBuffer('a)", 1)
+
+  val lb4 = newLB
+  println("Trying lb4 ...")
+  try {
+    lb4.remove(-1, 1)
+  } catch {
+    // Not thrown in 2.10, will be thrown in 2.11
+    case ex: IndexOutOfBoundsException => println(ex)
+  }
+  checkNotCorrupted(lb4, "ListBuffer('b, 'c, 'd, 'e)", 4)
+
+  val lb5 = newLB
+  println("Trying lb5 ...")
+  try {
+    lb5.remove(1, -1)
+  } catch {
+    case ex: IllegalArgumentException => println(ex)
+  }
+  checkNotCorrupted(lb5)
+
+  // buffer should neither be changed nor corrupted after calling remove with invalid arguments
+  def checkNotCorrupted(
+    lb: ListBuffer[Symbol],
+    expectedString: String = "ListBuffer('a, 'b, 'c, 'd, 'e)",
+    expectedLength: Int = 5) = {
+    println("Checking ...")
+    val replStr = scala.runtime.ScalaRunTime.replStringOf(lb, 100)
+    if (replStr == expectedString + "\n") println("String OK.")
+    else println("!!! replStringOf FAILED: " + replStr)
+
+    val len = lb.length
+    if (len == expectedLength) println("Length OK.")
+    else println("!!! length FAILED: " + len)
+    println()
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t6663.check b/test/files/run/t6663.check
new file mode 100644
index 0000000000..d81cc0710e
--- /dev/null
+++ b/test/files/run/t6663.check
@@ -0,0 +1 @@
+42
diff --git a/test/files/run/t6663.scala b/test/files/run/t6663.scala
new file mode 100644
index 0000000000..6818d286d9
--- /dev/null
+++ b/test/files/run/t6663.scala
@@ -0,0 +1,17 @@
+import language.dynamics
+
+class C(v: Any) extends Dynamic {
+  def selectDynamic[T](n: String): Option[T] = Option(v.asInstanceOf[T])
+  def applyDynamic[T](n: String)(): Option[T] = Option(v.asInstanceOf[T])
+}
+
+object Test extends App {
+  // this should be converted to
+  // C(42).selectDynamic[Int]("foo").get
+  // but, before fixing SI-6663, became
+  // C(42).selectDynamic[Nothing]("foo").get
+  // leading to a ClassCastException
+  var v = new C(42).foo[Int].get
+  println(v)
+}
+
diff --git a/test/files/run/t6673.check b/test/files/run/t6673.check
new file mode 100644
index 0000000000..ef2aa551dc
--- /dev/null
+++ b/test/files/run/t6673.check
@@ -0,0 +1 @@
+List(x)
diff --git a/test/files/run/t6673.scala b/test/files/run/t6673.scala
new file mode 100644
index 0000000000..115bbdf234
--- /dev/null
+++ b/test/files/run/t6673.scala
@@ -0,0 +1,5 @@
+object Test extends App {
+  def foo(f: String => Array[String])(s: String) = f(s)
+  val test = foo(Array(_)) _
+  println(test("x").toList)
+}
\ No newline at end of file
diff --git a/test/files/run/t6695.scala b/test/files/run/t6695.scala
new file mode 100644
index 0000000000..b527238a51
--- /dev/null
+++ b/test/files/run/t6695.scala
@@ -0,0 +1,18 @@
+object Test extends App {
+	try {
+	  Array("a", "b", "c") match {
+	  	case Array("a", "x", "c") => println("x")
+	  	case Array("a", "b", "x") => println("a");
+	  	case Array("a", "d", _*) => println("wrongly positive")
+	  }
+	  assert(false, "match succeeded")
+	} catch {
+		case _: MatchError => // okay
+	}
+
+  Array("a", "b", "c") match {
+  	case Array("a", "x", "c") => println("x")
+  	case Array("a", "b", "x") => println("a");
+  	case Array("a", "b", _*) => // okay
+  }
+}
diff --git a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check
index 53df68cfc2..8c558ced60 100644
--- a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check
+++ b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check
@@ -1,3 +1,2 @@
-newSource1:9: error: could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int]
-      Library.foo[Int]
-                 ^
+
+pos: source-newSource1,line-9,offset=466 could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int] ERROR
diff --git a/test/files/run/typetags_without_scala_reflect_typetag_lookup.scala b/test/files/run/typetags_without_scala_reflect_typetag_lookup.scala
index e51ecdb180..1fbdc62a1e 100644
--- a/test/files/run/typetags_without_scala_reflect_typetag_lookup.scala
+++ b/test/files/run/typetags_without_scala_reflect_typetag_lookup.scala
@@ -1,6 +1,6 @@
 import scala.tools.partest._
 
-object Test extends DirectTest {
+object Test extends StoreReporterDirectTest {
   def code = ???
 
   def library = """
@@ -32,14 +32,12 @@ object Test extends DirectTest {
   }
 
   def show(): Unit = {
-    val prevErr = System.err
-    val baos = new java.io.ByteArrayOutputStream();
-    System.setErr(new java.io.PrintStream(baos));
     compileLibrary();
+    println(filteredInfos.mkString("\n"))
+    storeReporter.infos.clear()
     compileApp();
-    // we should get bad symbolic reference errors, because we're trying to call a method that can't be unpickled
+    // we should get bad symbolic reference errors, because we're trying to use an implicit that can't be unpickled
     // but we don't know the number of these errors and their order, so I just ignore them all
-    baos.toString.split("\n") filter (!_.startsWith("error: bad symbolic reference")) foreach println
-    System.setErr(prevErr)
+    println(filteredInfos.filterNot(_.msg.contains("bad symbolic reference")).mkString("\n"))
   }
-}
\ No newline at end of file
+}
diff --git a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check
index 729c0715df..acfecce628 100644
--- a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check
+++ b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check
@@ -1,3 +1,2 @@
-newSource1:9: error: No Manifest available for App.this.T.
-      manifest[T]
-              ^
+
+pos: source-newSource1,line-9,offset=479 No Manifest available for App.this.T. ERROR
diff --git a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.scala b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.scala
index e984127583..6804baa0c3 100644
--- a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.scala
+++ b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.scala
@@ -1,6 +1,7 @@
 import scala.tools.partest._
+import scala.tools.nsc.Settings
 
-object Test extends DirectTest {
+object Test extends StoreReporterDirectTest {
   def code = ???
 
   def library = """
@@ -29,18 +30,18 @@ object Test extends DirectTest {
   """
   def compileApp() = {
     val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
+    val global = newCompiler("-cp", classpath, "-d", testOutput.path)
     compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(app)
+    //global.reporter.ERROR.foreach(println)
   }
 
   def show(): Unit = {
-    val prevErr = System.err
-    val baos = new java.io.ByteArrayOutputStream();
-    System.setErr(new java.io.PrintStream(baos));
     compileLibrary();
+    println(filteredInfos.mkString("\n"))
+    storeReporter.infos.clear()
     compileApp();
     // we should get bad symbolic reference errors, because we're trying to use an implicit that can't be unpickled
     // but we don't know the number of these errors and their order, so I just ignore them all
-    baos.toString.split("\n") filter (!_.startsWith("error: bad symbolic reference")) foreach println
-    System.setErr(prevErr)
+    println(filteredInfos.filterNot (_.msg.contains("bad symbolic reference")).mkString("\n"))
   }
-}
\ No newline at end of file
+}