archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8037385: constant pool errors with -target 1.7 and static default methods

Browse source 
Add error check for static interface methods invoked from -source 7

Reviewed-by: vromero, mcimadamore
This commit is contained in:
Dan Smith 2014-06-10 12:41:39 -06:00
parent 07f1246919
commit 6e1ae5955e
3 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
View file

@ -135,6 +135,7 @@ public class Attr extends JCTree.Visitor {
allowTypeAnnos = source.allowTypeAnnotations(); allowTypeAnnos = source.allowTypeAnnotations();
allowLambda = source.allowLambda(); allowLambda = source.allowLambda();
allowDefaultMethods = source.allowDefaultMethods(); allowDefaultMethods = source.allowDefaultMethods();
allowStaticInterfaceMethods = source.allowStaticInterfaceMethods();
sourceName = source.name; sourceName = source.name;
relax = (options.isSet("-retrofit") || relax = (options.isSet("-retrofit") ||
options.isSet("-relax")); options.isSet("-relax"));
@ -192,6 +193,10 @@ public class Attr extends JCTree.Visitor {
*/ */
boolean allowDefaultMethods; boolean allowDefaultMethods;
/** Switch: static interface methods enabled?
*/
boolean allowStaticInterfaceMethods;
/** Switch: allow references to surrounding object from anonymous /** Switch: allow references to surrounding object from anonymous
* objects during constructor call? * objects during constructor call?
*/ */
@ -3518,6 +3523,10 @@ public class Attr extends JCTree.Visitor {
tree.pos(), site, sym.name, true); tree.pos(), site, sym.name, true);
} }
} }
if (!allowStaticInterfaceMethods && sitesym.isInterface() &&
sym.isStatic() && sym.kind == MTH) {
log.error(tree.pos(), "static.intf.method.invoke.not.supported.in.source", sourceName);
}
} else if (sym.kind != ERR && (sym.flags() & STATIC) != 0 && sym.name != names._class) { } else if (sym.kind != ERR && (sym.flags() & STATIC) != 0 && sym.name != names._class) {
// If the qualified item is not a type and the selected item is static, report // If the qualified item is not a type and the selected item is static, report
// a warning. Make allowance for the class of an array type e.g. Object[].class) // a warning. Make allowance for the class of an array type e.g. Object[].class)

5
langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
View file

@ -2404,6 +2404,11 @@ compiler.err.static.intf.methods.not.supported.in.source=\
static interface methods are not supported in -source {0}\n\ static interface methods are not supported in -source {0}\n\
(use -source 8 or higher to enable static interface methods) (use -source 8 or higher to enable static interface methods)
# 0: string
compiler.err.static.intf.method.invoke.not.supported.in.source=\
static interface method invocations are not supported in -source {0}\n\
(use -source 8 or higher to enable static interface method invocations)
######################################## ########################################
# Diagnostics for verbose resolution # Diagnostics for verbose resolution
# used by Resolve (debug only) # used by Resolve (debug only)

32
langtools/test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java Normal file
View file

@ -0,0 +1,32 @@
/*
* Copyright (c) 2014, 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.
*/
// key: compiler.err.static.intf.method.invoke.not.supported.in.source
// options: -source 7 -Xlint:-options
import java.util.stream.Stream;
class StaticIntfMethodInvokeNotSupported {
void test() {
Stream.empty();
}
}