Mercurial > hg > truffle
diff src/share/vm/classfile/classFileParser.cpp @ 179:1f809e010142
Merge
author | kamg |
---|---|
date | Fri, 06 Jun 2008 13:43:36 -0400 |
parents | 437d03ea40b1 6b648fefb395 |
children | d1605aabd0a1 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Tue Jun 03 15:38:31 2008 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Fri Jun 06 13:43:36 2008 -0400 @@ -44,6 +44,7 @@ // Used for backward compatibility reasons: // - to check for javac bug fixes that happened after 1.5 +// - also used as the max version when running in jdk6 #define JAVA_6_VERSION 50 @@ -3507,9 +3508,11 @@ } bool ClassFileParser::is_supported_version(u2 major, u2 minor) { + u2 max_version = JDK_Version::is_gte_jdk17x_version() ? + JAVA_MAX_SUPPORTED_VERSION : JAVA_6_VERSION; return (major >= JAVA_MIN_SUPPORTED_VERSION) && - (major <= JAVA_MAX_SUPPORTED_VERSION) && - ((major != JAVA_MAX_SUPPORTED_VERSION) || + (major <= max_version) && + ((major != max_version) || (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION)); }