Skip to content

Commit

Permalink
Merging origin/master HEAD into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
adoptopenjdk-github-bot committed Oct 11, 2020
2 parents 0164f19 + 77c7762 commit 59e3baa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 25 deletions.
1 change: 0 additions & 1 deletion src/hotspot/share/runtime/arguments.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3232,7 +3232,6 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
}

UNSUPPORTED_OPTION(ProfileInterpreter);
NOT_PRODUCT(UNSUPPORTED_OPTION(TraceProfileInterpreter));
#endif


Expand Down
22 changes: 1 addition & 21 deletions src/hotspot/share/runtime/globals.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,6 @@ const intx ObjectAlignmentInBytes = 8;
"Make all non code cache addresses to be unreachable by " \
"forcing use of 64bit literal fixups") \
\
notproduct(bool, StressDerivedPointers, false, \
"Force scavenge when a derived pointer is detected on stack " \
"after rtm call") \
\
develop(bool, TraceDerivedPointers, false, \
"Trace traversal of derived pointers on stack") \
\
Expand Down Expand Up @@ -477,9 +473,6 @@ const intx ObjectAlignmentInBytes = 8;
develop(bool, ZapFillerObjects, trueInDebug, \
"Zap filler objects with 0xDEAFBABE") \
\
develop(bool, PrintVMMessages, true, \
"Print VM messages on console") \
\
notproduct(uintx, ErrorHandlerTest, 0, \
"If > 0, provokes an error after VM initialization; the value " \
"determines which error to provoke. See test_error_handler() " \
Expand Down Expand Up @@ -1328,11 +1321,6 @@ const intx ObjectAlignmentInBytes = 8;
product_pd(bool, ProfileInterpreter, \
"Profile at the bytecode level during interpretation") \
\
develop(bool, TraceProfileInterpreter, false, \
"Trace profiling at the bytecode level during interpretation. " \
"This outputs the profiling information collected to improve " \
"jit compilation.") \
\
develop_pd(bool, ProfileTraps, \
"Profile deoptimization traps at the bytecode level") \
\
Expand All @@ -1347,10 +1335,6 @@ const intx ObjectAlignmentInBytes = 8;
develop(bool, VerifyDataPointer, trueInDebug, \
"Verify the method data pointer during interpreter profiling") \
\
develop(bool, VerifyCompiledCode, false, \
"Include miscellaneous runtime verifications in nmethod code; " \
"default off because it disturbs nmethod size heuristics") \
\
notproduct(bool, CrashGCForDumpingJavaThread, false, \
"Manually make GC thread crash then dump java stack trace; " \
"Test only") \
Expand Down Expand Up @@ -1558,10 +1542,6 @@ const intx ObjectAlignmentInBytes = 8;
"Force inlining of throwing methods smaller than this") \
range(0, max_jint) \
\
develop(intx, ProfilerNodeSize, 1024, \
"Size in K to allocate for the Profile Nodes of each thread") \
range(0, 1024) \
\
product_pd(size_t, MetaspaceSize, \
"Initial threshold (in bytes) at which a garbage collection " \
"is done to reduce Metaspace usage") \
Expand Down Expand Up @@ -1803,7 +1783,7 @@ const intx ObjectAlignmentInBytes = 8;
"File containing compilation replay information" \
"[default: ./replay_pid%p.log] (%p replaced with pid)") \
\
product(ccstr, InlineDataFile, NULL, \
product(ccstr, InlineDataFile, NULL, \
"File containing inlining replay information" \
"[default: ./inline_pid%p.log] (%p replaced with pid)") \
\
Expand Down
5 changes: 2 additions & 3 deletions src/hotspot/share/utilities/debug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,7 @@ extern "C" void verify() {

extern "C" void pp(void* p) {
Command c("pp");
FlagSetting fl(PrintVMMessages, true);
FlagSetting f2(DisplayVMOutput, true);
FlagSetting fl(DisplayVMOutput, true);
if (Universe::heap()->is_in(p)) {
oop obj = oop(p);
obj->print();
Expand Down Expand Up @@ -558,7 +557,7 @@ extern "C" void pss() { // print all stacks
extern "C" void debug() { // to set things up for compiler debugging
Command c("debug");
WizardMode = true;
PrintVMMessages = PrintCompilation = true;
PrintCompilation = true;
PrintInlining = PrintAssembly = true;
tty->flush();
}
Expand Down

0 comments on commit 59e3baa

Please sign in to comment.