Wed, 02 Jul 2014 15:47:26 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jun 30 14:52:43 2014 -0700 1.2 +++ b/.hgtags Wed Jul 02 15:47:26 2014 -0700 1.3 @@ -283,6 +283,7 @@ 1.4 51cade4632608a6c0b8da33f420bd546aecf6faf jdk8u11-b10 1.5 dc0d952b4199dc1cbc534c9afd535c78d21ed519 jdk8u11-b11 1.6 0a79fea6f9cf713012211e933655175d52c6bc36 jdk8u11-b12 1.7 +16995a2b970df6be039cdaaedb5ade6099ffad8c jdk8u11-b31 1.8 26b33a6ea08810853af37e81c9b435465b289c98 jdk8u20-b02 1.9 a07271bca831cf1bab35a2ffbcebd8e060b2734b jdk8u20-b03 1.10 613c1d9930c9f650e3fc6926215931a85b679c66 jdk8u20-b04 1.11 @@ -305,6 +306,7 @@ 1.12 a550336d045faa63ac4439d4901d9f36e0b634bf jdk8u20-b18 1.13 c04d99e00268ed87cfbdf76beb1a0ea08abd9a9c jdk8u20-b19 1.14 e92effa22ecee1cb9965c278e45e2b1a6fbe0766 jdk8u20-b20 1.15 +7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21 1.16 f491f1581f196950c2cb858508dd06601968c417 jdk8u25-b00 1.17 5bc865e0a2e3c59c1c8bc41e731509e1737ddea1 jdk8u25-b01 1.18 4dec0c684a9ead80ea2bca6b042682367c1abf90 jdk8u25-b02
2.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java Mon Jun 30 14:52:43 2014 -0700 2.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Wed Jul 02 15:47:26 2014 -0700 2.3 @@ -3218,6 +3218,7 @@ 2.4 return tvar.rank_field; 2.5 } 2.6 case ERROR: 2.7 + case NONE: 2.8 return 0; 2.9 default: 2.10 throw new AssertionError();
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/tools/javac/missingSuperRecovery/MissingInterfaceTest.java Wed Jul 02 15:47:26 2014 -0700 3.3 @@ -0,0 +1,15 @@ 3.4 +/* 3.5 + * @test /nodynamiccopyright/ 3.6 + * @bug 8036007 3.7 + * @summary javac crashes when encountering an unresolvable interface 3.8 + * @build MissingInterfaceTestDep 3.9 + * @clean Closeable 3.10 + * @compile/fail/ref=MissingInterfaceTest.out -XDrawDiagnostics MissingInterfaceTest.java 3.11 + */ 3.12 + 3.13 +public class MissingInterfaceTest { 3.14 + void test(MissingInterfaceTestDep s) { 3.15 + s.call(); 3.16 + s.another(); 3.17 + } 3.18 +}
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/test/tools/javac/missingSuperRecovery/MissingInterfaceTest.out Wed Jul 02 15:47:26 2014 -0700 4.3 @@ -0,0 +1,3 @@ 4.4 +MissingInterfaceTest.java:12:10: compiler.err.cant.access: Closeable, (compiler.misc.class.file.not.found: Closeable) 4.5 +MissingInterfaceTest.java:13:10: compiler.err.cant.resolve.location.args: kindname.method, another, , , (compiler.misc.location.1: kindname.variable, s, MissingInterfaceTestDep) 4.6 +2 errors
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/test/tools/javac/missingSuperRecovery/MissingInterfaceTestDep.java Wed Jul 02 15:47:26 2014 -0700 5.3 @@ -0,0 +1,26 @@ 5.4 +/* 5.5 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.7 + * 5.8 + * This code is free software; you can redistribute it and/or modify it 5.9 + * under the terms of the GNU General Public License version 2 only, as 5.10 + * published by the Free Software Foundation. 5.11 + * 5.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 5.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.15 + * version 2 for more details (a copy is included in the LICENSE file that 5.16 + * accompanied this code). 5.17 + * 5.18 + * You should have received a copy of the GNU General Public License version 5.19 + * 2 along with this work; if not, write to the Free Software Foundation, 5.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.21 + * 5.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.23 + * or visit www.oracle.com if you need additional information or have any 5.24 + * questions. 5.25 + */ 5.26 + 5.27 +public class MissingInterfaceTestDep implements Intermediate {} 5.28 +interface Intermediate extends Closeable { } 5.29 +interface Closeable {}