diff -r 000000000000 -r 959103a6100f test/tools/javac/generics/odersky/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/generics/odersky/Test.java	Wed Apr 27 01:34:52 2016 +0800
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4736963
+ * @summary Positive regression test from odersky
+ * @author odersky
+ *
+ * @compile  Test.java
+ */
+
+class Test {
+
+    static <B> List<B> nil() { return new List<B>(); }
+    static <A> List<A> cons(A x, List<A> xs) { return xs.prepend(x); }
+    static <A> Cell<A> makeCell(A x) { return new Cell<A>(x); }
+    static <A> A id(A x) { return x; }
+
+    public static void main(String[] args) {
+        List<String> xs = nil();
+        List<String> ys = cons("abc", Test.<String>nil());
+        List<String> zs = Test.<String>nil().prepend("abc");
+
+        System.out.println(nil());
+        System.out.println(nil().length());
+
+        System.out.println(cons("abc", nil()));
+        System.out.println(nil().prepend("abc"));
+        System.out.println(nil().prepend(makeCell(null)));
+        System.out.println(cons(makeCell(null), nil()));
+
+        System.out.println(id(nil()));
+        System.out.println(id(nil()).length());
+
+        System.out.println(cons("abc", id(nil())));
+        System.out.println(id(nil()).prepend("abc"));
+        System.out.println(id(nil()).prepend(makeCell(null)));
+        System.out.println(cons(makeCell(null), id(nil())));
+
+        List<String> a =
+            args.length == 1 ? Test.<String>nil() : Test.<String>nil();
+        a = (List<String>) Test.<String>nil();
+    }
+
+}