Mercurial > hg > graal-compiler

changeset 13876:54892f32714e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with Michael Haupt's changes pulled from him directly
author Christian Wirth <christian.wirth@oracle.com>
date Wed, 05 Feb 2014 11:44:10 +0100
parents c35d86f53ace (diff) 042a2d972174 (current diff)
children c6b1802ae32b
files
diffstat 4 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Wed Feb 05 11:40:13 2014 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java	Wed Feb 05 11:44:10 2014 +0100
@@ -639,6 +639,9 @@
         }
 
         private GuardingNode searchAnchor(ValueNode value, ResolvedJavaType type) {
+            if (!value.recordsUsages()) {
+                return null;
+            }
             for (Node n : value.usages()) {
                 if (n instanceof InstanceOfNode) {
                     InstanceOfNode instanceOfNode = (InstanceOfNode) n;
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/LoopCountReceiver.java	Wed Feb 05 11:40:13 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/LoopCountReceiver.java	Wed Feb 05 11:44:10 2014 +0100
@@ -24,6 +24,10 @@
  */
 package com.oracle.truffle.api;
 
+/**
+ * Accepts the execution count of a loop that is a child of this node. The optimization heuristics
+ * can use the loop count to guide compilation and inlining.
+ */
 public interface LoopCountReceiver {
 
     void reportLoopCount(int count);
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ReplaceObserver.java	Wed Feb 05 11:40:13 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ReplaceObserver.java	Wed Feb 05 11:44:10 2014 +0100
@@ -24,6 +24,9 @@
  */
 package com.oracle.truffle.api;
 
+/**
+ * An observer that is notified whenever a child node is replaced.
+ */
 public interface ReplaceObserver {
 
     void nodeReplaced();
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleOptions.java	Wed Feb 05 11:40:13 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleOptions.java	Wed Feb 05 11:44:10 2014 +0100
@@ -33,7 +33,7 @@
 public class TruffleOptions {
 
     /**
-     * Enables/disables the rewriting of traces in the truffle runtime to stdout.
+     * Enables/disables the rewriting of traces in the Truffle runtime to stdout.
      * <p>
      * Can be set with {@code -Dtruffle.TraceRewrites=true}.
      */