# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1441621061 -7200
# Node ID 46839f692ccd05ef1a51f9a7dd5c1d17d9567cb4
# Parent  bdf6b2a608d143c3d22c72b801ead7e8cfffe94d
adapted to removal of HotSpotVMConfig.useHeapProfiler

diff -r bdf6b2a608d1 -r 46839f692ccd graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java	Sat Sep 05 06:13:33 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java	Mon Sep 07 12:17:41 2015 +0200
@@ -93,7 +93,7 @@
         registerStableOptionPlugins(invocationPlugins, snippetReflection);
         registerAESPlugins(invocationPlugins, config);
         registerCRC32Plugins(invocationPlugins, config);
-        StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, invocationPlugins, !config.useHeapProfiler);
+        StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, invocationPlugins);
 
         return plugins;
     }
diff -r bdf6b2a608d1 -r 46839f692ccd graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java	Sat Sep 05 06:13:33 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java	Mon Sep 07 12:17:41 2015 +0200
@@ -22,18 +22,22 @@
  */
 package com.oracle.graal.hotspot.meta;
 
-import jdk.internal.jvmci.hotspot.*;
-import jdk.internal.jvmci.meta.*;
+import jdk.internal.jvmci.hotspot.HotSpotVMConfig;
+import jdk.internal.jvmci.meta.Kind;
+import jdk.internal.jvmci.meta.MetaAccessProvider;
+import jdk.internal.jvmci.meta.ResolvedJavaType;
 
-import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.graph.*;
-import com.oracle.graal.graph.iterators.*;
-import com.oracle.graal.graphbuilderconf.*;
-import com.oracle.graal.hotspot.phases.*;
-import com.oracle.graal.nodes.*;
-import com.oracle.graal.nodes.type.*;
-import com.oracle.graal.replacements.StandardGraphBuilderPlugins.BoxPlugin;
-import com.oracle.graal.replacements.nodes.*;
+import com.oracle.graal.compiler.common.GraalOptions;
+import com.oracle.graal.graph.Node;
+import com.oracle.graal.graph.iterators.NodeIterable;
+import com.oracle.graal.graphbuilderconf.GraphBuilderContext;
+import com.oracle.graal.graphbuilderconf.InvocationPlugin;
+import com.oracle.graal.graphbuilderconf.InvocationPlugins;
+import com.oracle.graal.hotspot.phases.AheadOfTimeVerificationPhase;
+import com.oracle.graal.nodes.ConstantNode;
+import com.oracle.graal.nodes.FrameState;
+import com.oracle.graal.nodes.type.StampTool;
+import com.oracle.graal.replacements.nodes.MacroNode;
 
 /**
  * Extension of {@link InvocationPlugins} that disables plugins based on runtime configuration.
@@ -54,13 +58,6 @@
                 return;
             }
         }
-        if (config.useHeapProfiler) {
-            if (plugin instanceof BoxPlugin) {
-                // The heap profiler wants to see all allocations related to boxing
-                return;
-            }
-        }
-
         super.register(plugin, declaringClass, name, argumentTypes);
     }
 
diff -r bdf6b2a608d1 -r 46839f692ccd graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Sat Sep 05 06:13:33 2015 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Mon Sep 07 12:17:41 2015 +0200
@@ -62,7 +62,7 @@
     }
     // @formatter:on
 
-    public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins, boolean useBoxingPlugins) {
+    public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) {
         registerObjectPlugins(plugins);
         registerClassPlugins(plugins);
         registerMathPlugins(plugins);
@@ -79,9 +79,7 @@
         registerUnsafePlugins(plugins);
         registerEdgesPlugins(metaAccess, plugins);
         registerGraalDirectivesPlugins(plugins);
-        if (useBoxingPlugins) {
-            registerBoxingPlugins(plugins);
-        }
+        registerBoxingPlugins(plugins);
         if (Options.UseBlackholeSubstitution.getValue()) {
             registerJMHBlackholePlugins(plugins);
         }
diff -r bdf6b2a608d1 -r 46839f692ccd mx.graal/suite.py
--- a/mx.graal/suite.py	Sat Sep 05 06:13:33 2015 +0200
+++ b/mx.graal/suite.py	Mon Sep 07 12:17:41 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "0251714a52feebddee33ffefa3bcc894352447ee",
+               "version" : "23db6926b163fbf0495d2cb0559326a123020ea2",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},