Mercurial > hg > truffle

changeset 18643:3e71078c2efe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
converted use of '==' to .equals() to support replay compilation
author Doug Simon <doug.simon@oracle.com>
date Mon, 08 Dec 2014 14:33:05 +0100
parents 133d5a98c547
children 47263ffe47bd
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java	Mon Dec 08 14:32:21 2014 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java	Mon Dec 08 14:33:05 2014 +0100
@@ -534,8 +534,9 @@
         }
     }
 
-    private static final Object UNUSED_PARAMETER = "DEAD PARAMETER";
-    private static final Object CONSTANT_PARAMETER = "CONSTANT";
+    // These values must be compared with equals() not '==' to support replay compilation.
+    private static final Object UNUSED_PARAMETER = "UNUSED_PARAMETER";
+    private static final Object CONSTANT_PARAMETER = "CONSTANT_PARAMETER";
 
     /**
      * Determines if any parameter of a given method is annotated with {@link ConstantParameter}.
@@ -905,7 +906,7 @@
                     }
                 }
             } else {
-                assert parameter == CONSTANT_PARAMETER || parameter == UNUSED_PARAMETER : "unexpected entry for parameter: " + args.info.getParameterName(i) + " -> " + parameter;
+                assert parameter.equals(CONSTANT_PARAMETER) || parameter.equals(UNUSED_PARAMETER) : "unexpected entry for parameter: " + args.info.getParameterName(i) + " -> " + parameter;
             }
         }
         return replacements;
@@ -1298,9 +1299,9 @@
             sep = ", ";
             if (value == null) {
                 buf.append("<null> ").append(name);
-            } else if (value == UNUSED_PARAMETER) {
+            } else if (value.equals(UNUSED_PARAMETER)) {
                 buf.append("<unused> ").append(name);
-            } else if (value == CONSTANT_PARAMETER) {
+            } else if (value.equals(CONSTANT_PARAMETER)) {
                 buf.append("<constant> ").append(name);
             } else if (value instanceof ParameterNode) {
                 ParameterNode param = (ParameterNode) value;