diff -r 1985e35e97b2 -r 7873d37f5b37 test/tools/javac/generics/inference/6315770/T6315770.out
--- a/test/tools/javac/generics/inference/6315770/T6315770.out	Mon Jan 21 11:16:28 2013 -0800
+++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Mon Jan 21 20:13:56 2013 +0000
@@ -1,3 +1,3 @@
-T6315770.java:16:42: compiler.err.prob.found.req: (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
-T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer&java.lang.Runnable, java.lang.String)
+T6315770.java:16:42: compiler.err.prob.found.req: (compiler.misc.incompatible.upper.bounds: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
+T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.String, java.lang.Integer,java.lang.Runnable)
 2 errors