diff src/share/vm/classfile/verifier.cpp @ 8817:b8deb3205b51

8009552: test/vm/verifier/TestStaticIF.java failing with hs25.0-b Summary: Remove support for verification of class files with version 52 and above from type inference verifier. Reviewed-by: acorn, hseigel
author bharadwaj
date Mon, 25 Mar 2013 09:36:15 -0700
parents 729be16a470b
children 36376b540a98
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Mon Mar 25 08:37:28 2013 -0400
+++ b/src/share/vm/classfile/verifier.cpp	Mon Mar 25 09:36:15 2013 -0700
@@ -63,7 +63,6 @@
 
 #define NOFAILOVER_MAJOR_VERSION                       51
 #define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION  51
-#define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION       52
 
 // Access to external entry for VerifyClassCodes - old byte code verifier
 
@@ -2322,11 +2321,6 @@
       types = (1 << JVM_CONSTANT_InterfaceMethodref) |
               (1 << JVM_CONSTANT_Methodref);
       break;
-    case Bytecodes::_invokestatic:
-      types = (_klass->major_version() < STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION) ?
-        (1 << JVM_CONSTANT_Methodref) :
-        ((1 << JVM_CONSTANT_InterfaceMethodref) | (1 << JVM_CONSTANT_Methodref));
-      break;
     default:
       types = 1 << JVM_CONSTANT_Methodref;
   }