diff -r ebf79cbf5711 -r 97b6fa97b8dd test/tools/javac/generics/diamond/neg/Neg03.java
--- a/test/tools/javac/generics/diamond/neg/Neg03.java	Thu Apr 22 16:54:44 2010 -0700
+++ b/test/tools/javac/generics/diamond/neg/Neg03.java	Thu Apr 29 14:10:24 2010 -0700
@@ -1,10 +1,10 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 6840638
+ * @bug 6939620
  *
- * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @summary  Switch to 'complex' diamond inference scheme
  * @author mcimadamore
- * @compile/fail/ref=Neg03.out Neg03.java -source 1.7 -XDrawDiagnostics
+ * @compile/fail/ref=Neg03.out Neg03.java -XDrawDiagnostics
  *
  */
 
@@ -16,68 +16,68 @@
     }
 
     void testSimple() {
-        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
-        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
-        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
-        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
+        Foo<String> f1 = new Foo<>("");
+        Foo<? extends String> f2 = new Foo<>("");
+        Foo<?> f3 = new Foo<>("");
+        Foo<? super String> f4 = new Foo<>("");
 
-        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
-        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
-        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
-        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
+        Foo<String> f5 = new Foo<>(""){};
+        Foo<? extends String> f6 = new Foo<>(""){};
+        Foo<?> f7 = new Foo<>(""){};
+        Foo<? super String> f8 = new Foo<>(""){};
 
-        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
-        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
-        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
-        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
+        Foo<String> f9 = new Foo<>("", "");
+        Foo<? extends String> f10 = new Foo<>("", "");
+        Foo<?> f11 = new Foo<>("", "");
+        Foo<? super String> f12 = new Foo<>("", "");
 
-        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
-        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
+        Foo<String> f13 = new Foo<>("", ""){};
+        Foo<? extends String> f14 = new Foo<>("", ""){};
+        Foo<?> f15 = new Foo<>("", ""){};
+        Foo<? super String> f16 = new Foo<>("", ""){};
     }
 
     void testQualified_1() {
-        Foo<String> f1 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
-        Foo<? extends String> f2 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
-        Foo<?> f3 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
-        Foo<? super String> f4 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
+        Foo<String> f1 = new Neg03<U>.Foo<>("");
+        Foo<? extends String> f2 = new Neg03<U>.Foo<>("");
+        Foo<?> f3 = new Neg03<U>.Foo<>("");
+        Foo<? super String> f4 = new Neg03<U>.Foo<>("");
 
-        Foo<String> f5 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
-        Foo<? extends String> f6 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
-        Foo<?> f7 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
-        Foo<? super String> f8 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
+        Foo<String> f5 = new Neg03<U>.Foo<>(""){};
+        Foo<? extends String> f6 = new Neg03<U>.Foo<>(""){};
+        Foo<?> f7 = new Neg03<U>.Foo<>(""){};
+        Foo<? super String> f8 = new Neg03<U>.Foo<>(""){};
 
-        Foo<String> f9 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
-        Foo<? extends String> f10 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
-        Foo<?> f11 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
-        Foo<? super String> f12 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
+        Foo<String> f9 = new Neg03<U>.Foo<>("", "");
+        Foo<? extends String> f10 = new Neg03<U>.Foo<>("", "");
+        Foo<?> f11 = new Neg03<U>.Foo<>("", "");
+        Foo<? super String> f12 = new Neg03<U>.Foo<>("", "");
 
-        Foo<String> f13 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<? extends String> f14 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<?> f15 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
-        Foo<? super String> f16 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
+        Foo<String> f13 = new Neg03<U>.Foo<>("", ""){};
+        Foo<? extends String> f14 = new Neg03<U>.Foo<>("", ""){};
+        Foo<?> f15 = new Neg03<U>.Foo<>("", ""){};
+        Foo<? super String> f16 = new Neg03<U>.Foo<>("", ""){};
     }
 
     void testQualified_2(Neg03<U> n) {
-        Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
-        Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
-        Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
-        Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
+        Foo<String> f1 = n.new Foo<>("");
+        Foo<? extends String> f2 = n.new Foo<>("");
+        Foo<?> f3 = n.new Foo<>("");
+        Foo<? super String> f4 = n.new Foo<>("");
 
-        Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
-        Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
-        Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
-        Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Foo<String> f5 = n.new Foo<>(""){};
+        Foo<? extends String> f6 = n.new Foo<>(""){};
+        Foo<?> f7 = n.new Foo<>(""){};
+        Foo<? super String> f8 = n.new Foo<>(""){};
 
-        Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
-        Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
-        Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
-        Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Foo<String> f9 = n.new Foo<>("", "");
+        Foo<? extends String> f10 = n.new Foo<>("", "");
+        Foo<?> f11 = n.new Foo<>("", "");
+        Foo<? super String> f12 = n.new Foo<>("", "");
 
-        Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<String> f13 = n.new Foo<>("", ""){};
+        Foo<? extends String> f14 = n.new Foo<>("", ""){};
+        Foo<?> f15 = n.new Foo<>("", ""){};
+        Foo<? super String> f16 = n.new Foo<>("", ""){};
     }
 }