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