1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8138588: VerifyMergedCPBytecodes option cleanup needed

Browse Source 
Reviewed-by: hseigel, dcubed, sspitsyn
This commit is contained in:
Coleen Phillimore 2020-11-10 20:38:25 +00:00
parent a7f46919ff
commit 7d4e86be3b
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/prims/jvmtiRedefineClasses.cpp
View File

@ -1452,7 +1452,8 @@ jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {
}
}
if (VerifyMergedCPBytecodes) {
#ifdef ASSERT
{
// verify what we have done during constant pool merging
{
RedefineVerifyMark rvm(the_class, scratch_class, state);
@ -1472,6 +1473,7 @@ jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {
}
}
}
#endif // ASSERT
Rewriter::rewrite(scratch_class, THREAD);
if (!HAS_PENDING_EXCEPTION) {

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

@ -556,6 +556,7 @@ static SpecialFlag const special_jvm_flags[] = {
{ "InsertMemBarAfterArraycopy", JDK_Version::undefined(), JDK_Version::jdk(16), JDK_Version::jdk(17) },
{ "Debugging", JDK_Version::undefined(), JDK_Version::jdk(16), JDK_Version::jdk(17) },
{ "UseRDPCForConstantTableBase", JDK_Version::undefined(), JDK_Version::jdk(16), JDK_Version::jdk(17) },
{ "VerifyMergedCPBytecodes", JDK_Version::undefined(), JDK_Version::jdk(16), JDK_Version::jdk(17) },
#ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
// These entries will generate build errors. Their purpose is to test the macros.

4
src/hotspot/share/runtime/globals.hpp
View File

@ -872,10 +872,6 @@ const intx ObjectAlignmentInBytes = 8;
product(bool, StressLdcRewrite, false, \
"Force ldc -> ldc_w rewrite during RedefineClasses") \
\
/* change to false by default sometime after Mustang */ \
product(bool, VerifyMergedCPBytecodes, true, \
"Verify bytecodes after RedefineClasses constant pool merging") \
\
product(bool, AllowRedefinitionToAddDeleteMethods, false, \
"(Deprecated) Allow redefinition to add and delete private " \
"static or final methods for compatibility with old releases") \

1
test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
View File

@ -65,7 +65,6 @@ public class ClhsdbFlags {
"UnlockDiagnosticVMOptions = true",
"MaxFDLimit = false",
"MaxJavaStackTraceDepth = 1024",
"VerifyMergedCPBytecodes",
"ConcGCThreads", "UseThreadPriorities",
"ShowHiddenFrames"));
expStrMap.put("flags -nd", List.of(