comparison src/share/vm/runtime/java.hpp @ 176:6b648fefb395

6705523: Fix for 6695506 will violate spec when used in JDK6 Summary: Make max classfile version number dependent on JDK version Reviewed-by: acorn, never
author kamg
date Thu, 22 May 2008 13:03:52 -0400
parents a61af66fc99e
children d1605aabd0a1 8d852b81e775
comparison
equal deleted inserted replaced
148:7a0a921a1a8c 176:6b648fefb395
66 static bool is_pre_jdk16_version() { return _pre_jdk16_version; } 66 static bool is_pre_jdk16_version() { return _pre_jdk16_version; }
67 static bool is_jdk12x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 2; } 67 static bool is_jdk12x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 2; }
68 static bool is_jdk13x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 3; } 68 static bool is_jdk13x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 3; }
69 static bool is_jdk14x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 4; } 69 static bool is_jdk14x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 4; }
70 static bool is_jdk15x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 5; } 70 static bool is_jdk15x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 5; }
71 static bool is_jdk16x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 6; } 71
72 static bool is_jdk17x_version() { assert(is_jdk_version_initialized(), "must have been initialized"); return _jdk_version == 7; } 72 static bool is_jdk16x_version() {
73 if (is_jdk_version_initialized()) {
74 return _jdk_version == 6;
75 } else {
76 assert(is_pre_jdk16_version(), "must have been initialized");
77 return false;
78 }
79 }
80
81 static bool is_jdk17x_version() {
82 if (is_jdk_version_initialized()) {
83 return _jdk_version == 7;
84 } else {
85 assert(is_pre_jdk16_version(), "must have been initialized");
86 return false;
87 }
88 }
73 89
74 static bool supports_thread_park_blocker() { return _version_info.thread_park_blocker; } 90 static bool supports_thread_park_blocker() { return _version_info.thread_park_blocker; }
75 91
76 static bool is_gte_jdk14x_version() { 92 static bool is_gte_jdk14x_version() {
77 // Keep the semantics of this that the version number is >= 1.4 93 // Keep the semantics of this that the version number is >= 1.4
83 assert(is_jdk_version_initialized(), "Not initialized"); 99 assert(is_jdk_version_initialized(), "Not initialized");
84 return _jdk_version >= 5; 100 return _jdk_version >= 5;
85 } 101 }
86 static bool is_gte_jdk16x_version() { 102 static bool is_gte_jdk16x_version() {
87 // Keep the semantics of this that the version number is >= 1.6 103 // Keep the semantics of this that the version number is >= 1.6
88 assert(is_jdk_version_initialized(), "Not initialized"); 104 if (is_jdk_version_initialized()) {
89 return _jdk_version >= 6; 105 return _jdk_version >= 6;
106 } else {
107 assert(is_pre_jdk16_version(), "Not initialized");
108 return false;
109 }
90 } 110 }
91 111
92 static bool is_gte_jdk17x_version() { 112 static bool is_gte_jdk17x_version() {
93 // Keep the semantics of this that the version number is >= 1.7 113 // Keep the semantics of this that the version number is >= 1.7
94 assert(is_jdk_version_initialized(), "Not initialized"); 114 if (is_jdk_version_initialized()) {
95 return _jdk_version >= 7; 115 return _jdk_version >= 7;
116 } else {
117 assert(is_pre_jdk16_version(), "Not initialized");
118 return false;
119 }
96 } 120 }
97 121
98 static bool is_jdk_version_initialized() { 122 static bool is_jdk_version_initialized() {
99 return _jdk_version > 0; 123 return _jdk_version > 0;
100 } 124 }