stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Harold Seigel 2013-03-26 12:43:32 -07:00
commit a96ab956fa
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hotspot/src/share/vm/classfile/classFileParser.cpp
View File

@ -2196,8 +2196,7 @@ methodHandle ClassFileParser::parse_method(bool is_interface,
true, // is LVTT true, // is LVTT
CHECK_(nullHandle)); CHECK_(nullHandle));
lvtt_cnt++; lvtt_cnt++;
} else if (UseSplitVerifier && } else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION &&
_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION &&
_cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) { _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) {
// Stack map is only needed by the new verifier in JDK1.5. // Stack map is only needed by the new verifier in JDK1.5.
if (parsed_stackmap_attribute) { if (parsed_stackmap_attribute) {

3
hotspot/src/share/vm/classfile/verifier.cpp
View File

@ -127,8 +127,7 @@ bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, bool shoul
if (TraceClassInitialization) { if (TraceClassInitialization) {
tty->print_cr("Start class verification for: %s", klassName); tty->print_cr("Start class verification for: %s", klassName);
} }
if (UseSplitVerifier && if (klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) {
klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) {
ClassVerifier split_verifier(klass, THREAD); ClassVerifier split_verifier(klass, THREAD);
split_verifier.verify_class(THREAD); split_verifier.verify_class(THREAD);
exception_name = split_verifier.result(); exception_name = split_verifier.result();

1
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -260,6 +260,7 @@ static ObsoleteFlag obsolete_jvm_flags[] = {
{ "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) },
{ "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) },
{ "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) },
{ "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) },
#ifdef PRODUCT #ifdef PRODUCT
{ "DesiredMethodLimit", { "DesiredMethodLimit",
JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },

3
hotspot/src/share/vm/runtime/globals.hpp
View File

@ -679,9 +679,6 @@ class CommandLineFlags {
product(bool, UseCompilerSafepoints, true, \ product(bool, UseCompilerSafepoints, true, \
"Stop at safepoints in compiled code") \ "Stop at safepoints in compiled code") \
\ \
product(bool, UseSplitVerifier, true, \
"use split verifier with StackMapTable attributes") \
\
product(bool, FailOverToOldVerifier, true, \ product(bool, FailOverToOldVerifier, true, \
"fail over to old verifier when split verifier fails") \ "fail over to old verifier when split verifier fails") \
\ \