changeset 11892:153bd3fefb24

Merge
author dnsimon
date Mon, 22 Aug 2016 20:30:37 +0000
parents 8eab4734c758 d92ba4bc628e
children 2629b100a7e3
files
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmci_globals.cpp	Mon Aug 22 11:47:15 2016 -0700
+++ b/src/share/vm/jvmci/jvmci_globals.cpp	Mon Aug 22 20:30:37 2016 +0000
@@ -84,6 +84,7 @@
   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
--- a/src/share/vm/jvmci/jvmci_globals.hpp	Mon Aug 22 11:47:15 2016 -0700
+++ b/src/share/vm/jvmci/jvmci_globals.hpp	Mon Aug 22 20:30:37 2016 +0000
@@ -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")
 
--- a/src/share/vm/oops/methodData.hpp	Mon Aug 22 11:47:15 2016 -0700
+++ b/src/share/vm/oops/methodData.hpp	Mon Aug 22 20:30:37 2016 +0000
@@ -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;
--- a/src/share/vm/runtime/globals.hpp	Mon Aug 22 11:47:15 2016 -0700
+++ b/src/share/vm/runtime/globals.hpp	Mon Aug 22 20:30:37 2016 +0000
@@ -3027,9 +3027,6 @@
           "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")                \
                                                                             \