# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1441411323 25200
# Node ID 8750eddf726f79f378971fa8b6a0f2c2e8409255
# Parent  0251714a52feebddee33ffefa3bcc894352447ee
Remove JVMCIHProfEnabled.

diff -r 0251714a52fe -r 8750eddf726f jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java
--- a/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java	Wed Sep 02 13:57:44 2015 -1000
+++ b/jvmci/jdk.internal.jvmci.hotspot/src/jdk/internal/jvmci/hotspot/HotSpotVMConfig.java	Fri Sep 04 17:02:03 2015 -0700
@@ -745,7 +745,6 @@
     }
 
     @HotSpotVMFlag(name = "ReduceInitialCardMarks") @Stable public boolean useDeferredInitBarriers;
-    @HotSpotVMFlag(name = "JVMCIHProfEnabled") @Stable public boolean useHeapProfiler;
 
     // Compressed Oops related values.
     @HotSpotVMFlag(name = "UseCompressedOops") @Stable public boolean useCompressedOops;
diff -r 0251714a52fe -r 8750eddf726f src/share/vm/jvmci/jvmci_globals.hpp
--- a/src/share/vm/jvmci/jvmci_globals.hpp	Wed Sep 02 13:57:44 2015 -1000
+++ b/src/share/vm/jvmci/jvmci_globals.hpp	Fri Sep 04 17:02:03 2015 -0700
@@ -88,9 +88,6 @@
   product(bool, JVMCICountersExcludeCompiler, true,                         \
           "Exclude JVMCI compiler threads from benchmark counters")         \
                                                                             \
-  product(bool, JVMCIHProfEnabled, false,                                   \
-          "Is Heap  Profiler enabled")                                      \
-                                                                            \
   product(bool, JVMCICompileWithC1Only, true,                               \
           "Only compile JVMCI classes with C1")                             \
                                                                             \
diff -r 0251714a52fe -r 8750eddf726f src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed Sep 02 13:57:44 2015 -1000
+++ b/src/share/vm/runtime/arguments.cpp	Fri Sep 04 17:02:03 2015 -0700
@@ -2759,11 +2759,6 @@
           return JNI_ERR;
         }
 #endif // !INCLUDE_JVMTI
-#if INCLUDE_JVMCI
-        if (strcmp(name, "hprof") == 0) {
-          FLAG_SET_CMDLINE(bool, JVMCIHProfEnabled, true);
-        }
-#endif
         add_init_library(name, options);
       }
     // -agentlib and -agentpath
@@ -2786,12 +2781,6 @@
           return JNI_ERR;
         }
 #endif // !INCLUDE_JVMTI
-#if INCLUDE_JVMCI
-        if (valid_hprof_or_jdwp_agent(name, is_absolute_path)) {
-          FLAG_SET_CMDLINE(bool, JVMCIHProfEnabled, true);
-        }
-#endif
-
         add_init_agent(name, options, is_absolute_path);
       }
     // -javaagent