Mercurial > hg > graal-compiler
changeset 5108:b07ead3a3c2c
fixed case when exception probability should not be used
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Tue, 13 Mar 2012 12:01:24 -0700 |
parents | 85a47e2a415d |
children | 6766253384bf |
files | graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java |
diffstat | 2 files changed, 5 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Tue Mar 13 10:41:13 2012 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Tue Mar 13 12:01:24 2012 -0700 @@ -380,7 +380,7 @@ case SALOAD: case PUTFIELD: case GETFIELD: { - if (GraalOptions.AllowExplicitExceptionChecks && profilingInfo.getExceptionSeen(bci) != RiExceptionSeen.FALSE) { + if (GraalOptions.AllowExplicitExceptionChecks && (!GraalOptions.UseExceptionProbability || profilingInfo.getExceptionSeen(bci) != RiExceptionSeen.FALSE)) { canTrap.set(bci); } }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java Tue Mar 13 10:41:13 2012 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderConfiguration.java Tue Mar 13 12:01:24 2012 -0700 @@ -22,9 +22,8 @@ */ package com.oracle.graal.java; +import com.oracle.graal.compiler.phases.*; import com.oracle.max.cri.ri.*; -import com.oracle.graal.compiler.*; -import com.oracle.graal.compiler.phases.*; public class GraphBuilderConfiguration { @@ -32,21 +31,15 @@ Default, EagerForSnippets, Eager, } - private final boolean useBranchPrediction; private final ResolvePolicy resolving; private final PhasePlan plan; private RiResolvedType[] skippedExceptionTypes; - public GraphBuilderConfiguration(boolean useBranchPrediction, ResolvePolicy resolving, PhasePlan plan) { - this.useBranchPrediction = useBranchPrediction; + public GraphBuilderConfiguration(ResolvePolicy resolving, PhasePlan plan) { this.resolving = resolving; this.plan = plan; } - public boolean useBranchPrediction() { - return useBranchPrediction; - } - public void setSkippedExceptionTypes(RiResolvedType[] skippedExceptionTypes) { this.skippedExceptionTypes = skippedExceptionTypes; } @@ -72,7 +65,7 @@ } public static GraphBuilderConfiguration getDefault(PhasePlan plan) { - return new GraphBuilderConfiguration(true, ResolvePolicy.Default, plan); + return new GraphBuilderConfiguration(ResolvePolicy.Default, plan); } public static GraphBuilderConfiguration getSnippetDefault() { @@ -80,6 +73,6 @@ } public static GraphBuilderConfiguration getSnippetDefault(PhasePlan plan) { - return new GraphBuilderConfiguration(false, ResolvePolicy.EagerForSnippets, plan); + return new GraphBuilderConfiguration(ResolvePolicy.EagerForSnippets, plan); } }