changeset 932:5aeda537bf98

Fix: wrong subtyping implementation for disjunctive types. Wrong subtyping between disjunctive types caused errors in method resolution.
author mcimadamore
date Tue, 01 Mar 2011 17:48:13 +0000
parents 3240fef7f13e
children c80ead80fcfd
files src/share/classes/com/sun/tools/javac/code/Types.java src/share/classes/com/sun/tools/javac/comp/Check.java test/tools/javac/lambda/DisjunctiveTypeTest.java
diffstat 3 files changed, 55 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Mar 01 15:02:18 2011 +0000
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Tue Mar 01 17:48:13 2011 +0000
@@ -913,7 +913,10 @@
                     ((DisjunctiveType)s).alternatives :
                     List.of(s);
 
-                return chk.unhandled(t.alternatives, ss).isEmpty();
+                for (Type alternative : t.alternatives) {
+                    if (!chk.subset(alternative, ss)) return false;
+                }
+                return true;
             }
 
             @Override
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Mar 01 15:02:18 2011 +0000
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Mar 01 17:48:13 2011 +0000
@@ -1361,7 +1361,7 @@
 
     /** Is given type a subtype of some of the types in given list?
      */
-    boolean subset(Type t, List<Type> ts) {
+    public boolean subset(Type t, List<Type> ts) {
         for (List<Type> l = ts; l.nonEmpty(); l = l.tail)
             if (types.isSubtype(t, l.head)) return true;
         return false;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/DisjunctiveTypeTest.java	Tue Mar 01 17:48:13 2011 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2011, 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
+ * @summary check that subtyping between disjunctive and non disjunctive type works
+ * @author  Maurizio Cimadamore
+ * @compile DisjunctiveTypeTest.java
+ */
+
+class DisjunctiveTypeTest {
+
+    static class A extends IllegalArgumentException {
+       A(String a) { super(a); }
+    }
+
+    class B extends IllegalArgumentException {
+       B(String b) { super(b); }
+    }
+
+    void m() throws A,B {}
+
+    void test() {
+        try {
+            m();
+        } catch (A|B e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+}