Mercurial > hg > graal-compiler

changeset 19970:30ad420c16fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed Receiver.isNullConstant() since InvocationPlugins will never be applied if the receiver is the null constant
author Doug Simon <doug.simon@oracle.com>
date Fri, 20 Mar 2015 16:05:24 +0100
parents dba496fc044a
children 46dde3e92715
files graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java
diffstat 4 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java	Fri Mar 20 10:11:07 2015 +0100
+++ b/graal/com.oracle.graal.graphbuilderconf/src/com/oracle/graal/graphbuilderconf/InvocationPlugins.java	Fri Mar 20 16:05:24 2015 +0100
@@ -59,11 +59,6 @@
          * Determines if the receiver is constant.
          */
         boolean isConstant();
-
-        /**
-         * Determines if the receiver is the null constant.
-         */
-        boolean isNullConstant();
     }
 
     /**
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java	Fri Mar 20 10:11:07 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java	Fri Mar 20 16:05:24 2015 +0100
@@ -141,7 +141,7 @@
         Registration r = new Registration(plugins, StableOptionValue.class);
         r.register1("getValue", Receiver.class, new InvocationPlugin() {
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                if (receiver.isConstant() && !receiver.isNullConstant()) {
+                if (receiver.isConstant()) {
                     Object object = ((HotSpotObjectConstantImpl) receiver.get().asConstant()).object();
                     StableOptionValue<?> option = (StableOptionValue<?>) object;
                     ConstantNode value = b.append(ConstantNode.forConstant(HotSpotObjectConstantImpl.forObject(option.getValue()), b.getMetaAccess()));
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Fri Mar 20 10:11:07 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Fri Mar 20 16:05:24 2015 +0100
@@ -261,11 +261,6 @@
                 return args[0].isConstant();
             }
 
-            @Override
-            public boolean isNullConstant() {
-                return args[0].isNullConstant();
-            }
-
             InvocationPluginReceiver init(ResolvedJavaMethod targetMethod, ValueNode[] newArgs) {
                 if (!targetMethod.isStatic()) {
                     this.args = newArgs;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Fri Mar 20 10:11:07 2015 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Fri Mar 20 16:05:24 2015 +0100
@@ -385,7 +385,7 @@
         });
         r.register2("cast", Receiver.class, Object.class, new InvocationPlugin() {
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode object) {
-                if (receiver.isConstant() && !receiver.isNullConstant()) {
+                if (receiver.isConstant()) {
                     ResolvedJavaType type = b.getConstantReflection().asJavaType(receiver.get().asConstant());
                     if (type != null && !type.isPrimitive()) {
                         b.push(Kind.Object, b.append(CheckCastNode.create(type, object, null, false, b.getAssumptions())));