Mercurial > hg > graal-compiler

changeset 7110:9bd688f91d3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author Christian Haeubl <haeubl@ssw.jku.at>
date Thu, 29 Nov 2012 17:19:13 +0100
parents 37e75cc87c66
children e0fcf7802786
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java	Thu Nov 29 16:20:42 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java	Thu Nov 29 17:19:13 2012 +0100
@@ -435,7 +435,7 @@
                     } else {
                         compileQueue.execute(task);
                     }
-                    return task != null;
+                    return true;
                 } catch (RejectedExecutionException e) {
                     // The compile queue was already shut down.
                     return false;
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java	Thu Nov 29 16:20:42 2012 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/OptimisticOptimizations.java	Thu Nov 29 17:19:13 2012 +0100
@@ -48,7 +48,7 @@
 
         addOptimization(method, DeoptimizationReason.UnreachedCode, Optimization.RemoveNeverExecutedCode);
         addOptimization(method, DeoptimizationReason.TypeCheckedInliningViolated, Optimization.UseTypeCheckedInlining);
-        addOptimization(method, DeoptimizationReason.OptimizedTypeCheckViolated, Optimization.RemoveNeverExecutedCode);
+        addOptimization(method, DeoptimizationReason.OptimizedTypeCheckViolated, Optimization.UseTypeCheckHints);
         addOptimization(method, DeoptimizationReason.NotCompiledExceptionHandler, Optimization.UseExceptionProbability);
     }