Mercurial > hg > graal-compiler

changeset 9202:b6629b739a55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 22 Apr 2013 09:54:57 +0200
parents 59db04ec1598 (diff) 9be78aeab2e1 (current diff)
children f78437ffb8d3
files graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/ReadAfterCheckCast.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicConfiguration.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Sun Apr 21 21:41:09 2013 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Apr 22 09:54:57 2013 +0200
@@ -285,7 +285,7 @@
         ValueNode value;
         if (kind == Kind.Object) {
             value = frameState.xpop();
-            // astore and astore_<n> may be used to store a returnAddress (jsr) see JVMS par. 6.5.astore
+            // astore and astore_<n> may be used to store a returnAddress (jsr)
             assert value.kind() == Kind.Object || value.kind() == Kind.Int;
         } else {
             value = frameState.pop(kind);
@@ -1169,7 +1169,7 @@
         createInvokeNode(callTarget, resultType);
     }
 
-    protected Invoke createInvokeNode(MethodCallTargetNode callTarget, Kind resultType) {
+    protected Invoke createInvokeNode(CallTargetNode callTarget, Kind resultType) {
         // be conservative if information was not recorded (could result in endless recompiles
         // otherwise)
         if (graphBuilderConfig.omitAllExceptionEdges() || (optimisticOpts.useExceptionProbability() && profilingInfo.getExceptionSeen(bci()) == TriState.FALSE)) {