Mercurial > hg > truffle
changeset 1562:dfe27f03244a
Merge
author | trims |
---|---|
date | Tue, 01 Jun 2010 11:48:33 -0700 |
parents | 573e8ea5fd68 (current diff) 3548f3198dca (diff) |
children | e9ff18c4ace7 |
files | src/share/vm/classfile/verifier.cpp |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp Tue Jun 01 11:28:04 2010 -0700 +++ b/src/share/vm/classfile/verifier.cpp Tue Jun 01 11:48:33 2010 -0700 @@ -25,6 +25,8 @@ # include "incls/_precompiled.incl" # include "incls/_verifier.cpp.incl" +#define NOFAILOVER_MAJOR_VERSION 51 + // Access to external entry for VerifyClassCodes - old byte code verifier extern "C" { @@ -91,7 +93,8 @@ klass, message_buffer, message_buffer_len, THREAD); split_verifier.verify_class(THREAD); exception_name = split_verifier.result(); - if (FailOverToOldVerifier && !HAS_PENDING_EXCEPTION && + if (klass->major_version() < NOFAILOVER_MAJOR_VERSION && + FailOverToOldVerifier && !HAS_PENDING_EXCEPTION && (exception_name == vmSymbols::java_lang_VerifyError() || exception_name == vmSymbols::java_lang_ClassFormatError())) { if (TraceClassInitialization) {