infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-06 14:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Doug Simon 2016-08-22 20:30:37 +00:00
commit 976dd96a1e
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/share/vm/jvmci/jvmci_globals.cpp
View File

@ -84,6 +84,7 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
CHECK_NOT_SET(JVMCICountersExcludeCompiler, EnableJVMCI)
CHECK_NOT_SET(JVMCIUseFastLocking, EnableJVMCI)
CHECK_NOT_SET(JVMCINMethodSizeLimit, EnableJVMCI)
CHECK_NOT_SET(MethodProfileWidth, EnableJVMCI)
CHECK_NOT_SET(TraceUncollectedSpeculations, EnableJVMCI)
#ifndef PRODUCT

3
hotspot/src/share/vm/jvmci/jvmci_globals.hpp
View File

@ -88,6 +88,9 @@
experimental(intx, JVMCINMethodSizeLimit, (80*K)*wordSize, \
"Maximum size of a compiled method.") \
\
experimental(intx, MethodProfileWidth, 0, \
"Number of methods to record in call profile") \
\
develop(bool, TraceUncollectedSpeculations, false, \
"Print message when a failed speculation was not collected")

3
hotspot/src/share/vm/oops/methodData.hpp
View File

@ -30,6 +30,9 @@
#include "oops/method.hpp"
#include "oops/oop.hpp"
#include "runtime/orderAccess.hpp"
#if INCLUDE_JVMCI
#include "jvmci/jvmci_globals.hpp"
#endif
class BytecodeStream;
class KlassSizeStats;

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

@ -3027,9 +3027,6 @@ public:
"Number of receiver types to record in call/cast profile") \
range(0, 8) \
\
experimental(intx, MethodProfileWidth, 0, \
"Number of methods to record in call profile") \
\
develop(intx, BciProfileWidth, 2, \
"Number of return bci's to record in ret profile") \
\