Mercurial > hg > truffle
changeset 8820:a8016373a893
Merge
author | hseigel |
---|---|
date | Tue, 26 Mar 2013 12:43:32 -0700 |
parents | 1916ca1dec2f (current diff) 36376b540a98 (diff) |
children | 23f2d309e855 |
files | |
diffstat | 4 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Tue Mar 26 15:00:34 2013 +0100 +++ b/src/share/vm/classfile/classFileParser.cpp Tue Mar 26 12:43:32 2013 -0700 @@ -2196,8 +2196,7 @@ true, // is LVTT CHECK_(nullHandle)); lvtt_cnt++; - } else if (UseSplitVerifier && - _major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION && + } else if (_major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION && _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) { // Stack map is only needed by the new verifier in JDK1.5. if (parsed_stackmap_attribute) {
--- a/src/share/vm/classfile/verifier.cpp Tue Mar 26 15:00:34 2013 +0100 +++ b/src/share/vm/classfile/verifier.cpp Tue Mar 26 12:43:32 2013 -0700 @@ -127,8 +127,7 @@ if (TraceClassInitialization) { tty->print_cr("Start class verification for: %s", klassName); } - if (UseSplitVerifier && - klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) { + if (klass->major_version() >= STACKMAP_ATTRIBUTE_MAJOR_VERSION) { ClassVerifier split_verifier(klass, THREAD); split_verifier.verify_class(THREAD); exception_name = split_verifier.result();
--- a/src/share/vm/runtime/arguments.cpp Tue Mar 26 15:00:34 2013 +0100 +++ b/src/share/vm/runtime/arguments.cpp Tue Mar 26 12:43:32 2013 -0700 @@ -260,6 +260,7 @@ { "CMSRevisitStackSize", 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) }, + { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, #ifdef PRODUCT { "DesiredMethodLimit", JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
--- a/src/share/vm/runtime/globals.hpp Tue Mar 26 15:00:34 2013 +0100 +++ b/src/share/vm/runtime/globals.hpp Tue Mar 26 12:43:32 2013 -0700 @@ -679,9 +679,6 @@ product(bool, UseCompilerSafepoints, true, \ "Stop at safepoints in compiled code") \ \ - product(bool, UseSplitVerifier, true, \ - "use split verifier with StackMapTable attributes") \ - \ product(bool, FailOverToOldVerifier, true, \ "fail over to old verifier when split verifier fails") \ \