Mercurial > hg > openjdk > jigsaw > jdk
changeset 7017:1405ad6afb1e
8007736: VerifyError for use of static method in interface
Reviewed-by: mchung
author | bharadwaj |
---|---|
date | Thu, 14 Feb 2013 11:09:07 -0800 |
parents | e57019d2f34a |
children | 1ce1a307cded |
files | src/share/native/common/check_code.c test/vm/verifier/TestStaticIF.java |
diffstat | 2 files changed, 64 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/common/check_code.c Wed Feb 13 14:50:14 2013 -0800 +++ b/src/share/native/common/check_code.c Thu Feb 14 11:09:07 2013 -0800 @@ -206,6 +206,8 @@ #define LDC_METHOD_HANDLE_MAJOR_VERSION 51 +#define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION 52 + #define ALLOC_STACK_SIZE 16 /* big enough */ typedef struct alloc_stack_type { @@ -1246,11 +1248,24 @@ jclass cb = context->class; fullinfo_type clazz_info; int is_constructor, is_internal, is_invokedynamic; - int kind = (opcode == JVM_OPC_invokeinterface - ? 1 << JVM_CONSTANT_InterfaceMethodref - : opcode == JVM_OPC_invokedynamic - ? 1 << JVM_CONSTANT_NameAndType - : 1 << JVM_CONSTANT_Methodref); + int kind; + + switch (opcode ) { + case JVM_OPC_invokestatic: + kind = ((context->major_version < STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION) + ? (1 << JVM_CONSTANT_Methodref) + : ((1 << JVM_CONSTANT_InterfaceMethodref) | (1 << JVM_CONSTANT_Methodref))); + break; + case JVM_OPC_invokedynamic: + kind = 1 << JVM_CONSTANT_NameAndType; + break; + case JVM_OPC_invokeinterface: + kind = 1 << JVM_CONSTANT_InterfaceMethodref; + break; + default: + kind = 1 << JVM_CONSTANT_Methodref; + } + is_invokedynamic = opcode == JVM_OPC_invokedynamic; /* Make sure the constant pool item is the right type. */ verify_constant_pool_type(context, key, kind);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/vm/verifier/TestStaticIF.java Thu Feb 14 11:09:07 2013 -0800 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2013, 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 8007736 + * @summary Test static interface method. + * @run main/othervm -Xverify:all -XX:-UseSplitVerifier TestStaticIF + */ + +public class TestStaticIF implements StaticMethodInInterface { + + public static void main(String[] args) { + System.out.printf("main: %s%n", StaticMethodInInterface.get()); + } +} + +interface StaticMethodInInterface { + + public static String get() { + return "Hello from StaticMethodInInterface.get()"; + } +}