Mercurial > hg > truffle

changeset 19414:5b93a11c535c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed equality test to use .equals() instead of ==
author Doug Simon <doug.simon@oracle.com>
date Mon, 16 Feb 2015 20:53:21 +0100
parents 91ffbc349e91
children fcb426a54eed
files graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Feb 16 15:36:32 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Feb 16 20:53:21 2015 +0100
@@ -860,7 +860,7 @@
                 }
 
                 if (tryInvocationPlugin(args, targetMethod, resultType)) {
-                    if (GraalOptions.TraceInlineDuringParsing.getValue()) {
+                    if (TraceInlineDuringParsing.getValue()) {
                         for (int i = 0; i < this.currentDepth; ++i) {
                             TTY.print(' ');
                         }
@@ -926,12 +926,12 @@
                 if (inlinedMethod != null) {
                     if (inlinedMethod != null) {
                         assert inlinedMethod.hasBytecodes();
-                        if (GraalOptions.TraceInlineDuringParsing.getValue()) {
+                        if (TraceInlineDuringParsing.getValue()) {
                             int bci = this.bci();
                             StackTraceElement ste = this.method.asStackTraceElement(bci);
                             TTY.println(format("%s%s (%s:%d) inlining call to %s", nSpaces(currentDepth), method.getName(), ste.getFileName(), ste.getLineNumber(), inlinedMethod.format("%h.%n(%p)")));
                         }
-                        parseAndInlineCallee(inlinedMethod, args, parsingReplacement || inlinedMethod != targetMethod);
+                        parseAndInlineCallee(inlinedMethod, args, parsingReplacement || !inlinedMethod.equals(targetMethod));
                         plugin.postInline(inlinedMethod);
                     }
                     return true;
@@ -1254,7 +1254,7 @@
                                 // time mark the context loop begin as hit during the current
                                 // iteration.
                                 context.targetPeelIteration = nextPeelIteration++;
-                                if (nextPeelIteration > GraalOptions.MaximumLoopExplosionCount.getValue()) {
+                                if (nextPeelIteration > MaximumLoopExplosionCount.getValue()) {
                                     throw new BailoutException("too many loop explosion interations - does the explosion not terminate?");
                                 }
                             }