changeset 10342:1a07e086ff28

Merge
author dholmes
date Tue, 21 May 2013 19:52:01 -0700
parents ccdecfece956 (diff) f54c85acc043 (current diff)
children 6bd680e9ea35
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp	Tue May 21 09:43:23 2013 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Tue May 21 19:52:01 2013 -0700
@@ -444,8 +444,8 @@
             break;
           case JVM_REF_invokeStatic:
           case JVM_REF_invokeSpecial:
-            check_property(
-               tag.is_method() || tag.is_interface_method(),
+            check_property(tag.is_method() ||
+                           ((_major_version >= JAVA_8_VERSION) && tag.is_interface_method()),
                "Invalid constant pool index %u in class file %s (not a method)",
                ref_index, CHECK_(nullHandle));
              break;