8009552: test/vm/verifier/TestStaticIF.java failing with hs25.0-b

Remove support for verification of class files with version 52 and above from type inference verifier.

Reviewed-by: acorn, hseigel
This commit is contained in:
Bharadwaj Yadavalli 2013-03-25 09:36:15 -07:00
parent 41f0004e4f
commit 0e9d409036
2 changed files with 0 additions and 50 deletions

View file

@ -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 @@ void ClassVerifier::verify_invoke_instructions(
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;
}