diff -r 396b117c1743 -r 9d9d08922405 test/tools/javac/generics/diamond/neg/Neg05.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/diamond/neg/Neg05.java	Wed Apr 14 12:31:55 2010 +0100
@@ -0,0 +1,61 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6939620
+ *
+ * @summary  Switch to 'complex' diamond inference scheme
+ * @author mcimadamore
+ * @compile/fail/ref=Neg05.out Neg05.java -XDrawDiagnostics
+ *
+ */
+
+class Neg05<U> {
+
+    class Foo<V> {
+        Foo(V x) {}
+        <Z> Foo(V x, Z z) {}
+    }
+
+    void testRare_1() {
+        Neg05<?>.Foo<String> f1 = new Neg05.Foo<>("");
+        Neg05<?>.Foo<? extends String> f2 = new Neg05.Foo<>("");
+        Neg05<?>.Foo<?> f3 = new Neg05.Foo<>("");
+        Neg05<?>.Foo<? super String> f4 = new Neg05.Foo<>("");
+
+        Neg05<?>.Foo<String> f5 = new Neg05.Foo<>(""){};
+        Neg05<?>.Foo<? extends String> f6 = new Neg05.Foo<>(""){};
+        Neg05<?>.Foo<?> f7 = new Neg05.Foo<>(""){};
+        Neg05<?>.Foo<? super String> f8 = new Neg05.Foo<>(""){};
+
+        Neg05<?>.Foo<String> f9 = new Neg05.Foo<>("", "");
+        Neg05<?>.Foo<? extends String> f10 = new Neg05.Foo<>("", "");
+        Neg05<?>.Foo<?> f11 = new Neg05.Foo<>("", "");
+        Neg05<?>.Foo<? super String> f12 = new Neg05.Foo<>("", "");
+
+        Neg05<?>.Foo<String> f13 = new Neg05.Foo<>("", ""){};
+        Neg05<?>.Foo<? extends String> f14 = new Neg05.Foo<>("", ""){};
+        Neg05<?>.Foo<?> f15 = new Neg05.Foo<>("", ""){};
+        Neg05<?>.Foo<? super String> f16 = new Neg05.Foo<>("", ""){};
+    }
+
+    void testRare_2(Neg05 n) {
+        Neg05<?>.Foo<String> f1 = n.new Foo<>("");
+        Neg05<?>.Foo<? extends String> f2 = n.new Foo<>("");
+        Neg05<?>.Foo<?> f3 = n.new Foo<>("");
+        Neg05<?>.Foo<? super String> f4 = n.new Foo<>("");
+
+        Neg05<?>.Foo<String> f5 = n.new Foo<>(""){};
+        Neg05<?>.Foo<? extends String> f6 = n.new Foo<>(""){};
+        Neg05<?>.Foo<?> f7 = n.new Foo<>(""){};
+        Neg05<?>.Foo<? super String> f8 = n.new Foo<>(""){};
+
+        Neg05<?>.Foo<String> f9 = n.new Foo<>("", "");
+        Neg05<?>.Foo<? extends String> f10 = n.new Foo<>("", "");
+        Neg05<?>.Foo<?> f11 = n.new Foo<>("", "");
+        Neg05<?>.Foo<? super String> f12 = n.new Foo<>("", "");
+
+        Neg05<?>.Foo<String> f13 = n.new Foo<>("", ""){};
+        Neg05<?>.Foo<? extends String> f14 = n.new Foo<>("", ""){};
+        Neg05<?>.Foo<?> f15 = n.new Foo<>("", ""){};
+        Neg05<?>.Foo<? super String> f16 = n.new Foo<>("", ""){};
+    }
+}