--- a/langtools/test/tools/javac/generics/diamond/neg/Neg04.java	Thu Apr 22 16:54:44 2010 -0700
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg04.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=Neg04.out Neg04.java -source 1.7 -XDrawDiagnostics
+ * @compile/fail/ref=Neg04.out Neg04.java -XDrawDiagnostics
  *
  */
 
@@ -15,24 +15,24 @@
             Foo(V x) {}
             <Z> Foo(V x, Z z) {}
         }
-        Foo<String> n1 = new Foo<>(""); //new Foo<Integer> created
-        Foo<? extends String> n2 = new Foo<>(""); //new Foo<Integer> created
-        Foo<?> n3 = new Foo<>(""); //new Foo<Object> created
-        Foo<? super String> n4 = new Foo<>(""); //new Foo<Object> created
+        Foo<String> n1 = new Foo<>("");
+        Foo<? extends String> n2 = new Foo<>("");
+        Foo<?> n3 = new Foo<>("");
+        Foo<? super String> n4 = new Foo<>("");
 
-        Foo<String> n5 = new Foo<>(""){}; //new Foo<Integer> created
-        Foo<? extends String> n6 = new Foo<>(""){}; //new Foo<Integer> created
-        Foo<?> n7 = new Foo<>(""){}; //new Foo<Object> created
-        Foo<? super String> n8 = new Foo<>(""){}; //new Foo<Object> created
+        Foo<String> n5 = new Foo<>(""){};
+        Foo<? extends String> n6 = new Foo<>(""){};
+        Foo<?> n7 = new Foo<>(""){};
+        Foo<? super String> n8 = new Foo<>(""){};
 
-        Foo<String> n9 = new Foo<>("", ""); //new Foo<Integer> created
-        Foo<? extends String> n10 = new Foo<>("", ""); //new Foo<Integer> created
-        Foo<?> n11 = new Foo<>("", ""); //new Foo<Object> created
-        Foo<? super String> n12 = new Foo<>("", ""); //new Foo<Object> created
+        Foo<String> n9 = new Foo<>("", "");
+        Foo<? extends String> n10 = new Foo<>("", "");
+        Foo<?> n11 = new Foo<>("", "");
+        Foo<? super String> n12 = new Foo<>("", "");
 
-        Foo<String> n13 = new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<? extends String> n14 = new Foo<>("", ""){}; //new Foo<Integer> created
-        Foo<?> n15 = new Foo<>("", ""){}; //new Foo<Object> created
-        Foo<? super String> n16 = new Foo<>("", ""){}; //new Foo<Object> created
+        Foo<String> n13 = new Foo<>("", ""){};
+        Foo<? extends String> n14 = new Foo<>("", ""){};
+        Foo<?> n15 = new Foo<>("", ""){};
+        Foo<? super String> n16 = new Foo<>("", ""){};
     }
 }