Mercurial > hg > truffle
changeset 19255:131fb3dd493b
removed unnecessary use of an Assumptions object
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 11 Feb 2015 13:49:08 +0100 |
parents | 835e950b38b9 |
children | 56419bb2250a |
files | graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java |
diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java Wed Feb 11 13:39:33 2015 +0100 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java Wed Feb 11 13:49:08 2015 +0100 @@ -385,7 +385,7 @@ /** * Gets a copy of the assumptions recorded in this object as an array. */ - public Assumption[] getAssumptionsCopy() { + public Assumption[] toArray() { return assumptions.toArray(new Assumption[assumptions.size()]); }
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Wed Feb 11 13:39:33 2015 +0100 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Wed Feb 11 13:49:08 2015 +0100 @@ -607,8 +607,8 @@ this.entryBCI = entryBCI; } - public void setAssumptions(Assumptions assumptions) { - this.assumptions = assumptions.getAssumptionsCopy(); + public void setAssumptions(Assumption[] assumptions) { + this.assumptions = assumptions; } /**
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Feb 11 13:39:33 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Feb 11 13:49:08 2015 +0100 @@ -370,7 +370,7 @@ backend.emitCode(crb, lirGenRes.getLIR(), installedCodeOwner); crb.finish(); if (!assumptions.isEmpty()) { - compilationResult.setAssumptions(assumptions); + compilationResult.setAssumptions(assumptions.toArray()); } if (Debug.isMeterEnabled()) {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Wed Feb 11 13:39:33 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Wed Feb 11 13:49:08 2015 +0100 @@ -167,7 +167,7 @@ compilationNotify.notifyCompilationGraalTierFinished((OptimizedCallTarget) predefinedInstalledCode, graph); List<AssumptionValidAssumption> validAssumptions = new ArrayList<>(); - Assumptions newAssumptions = new Assumptions(true); + Set<Assumption> newAssumptions = new HashSet<>(); for (Assumption assumption : graph.getAssumptions()) { processAssumption(newAssumptions, assumption, validAssumptions); } @@ -178,7 +178,7 @@ } } - result.setAssumptions(newAssumptions); + result.setAssumptions(newAssumptions.toArray(new Assumption[newAssumptions.size()])); InstalledCode installedCode; try (Scope s = Debug.scope("CodeInstall", providers.getCodeCache()); TimerCloseable a = CodeInstallationTime.start(); Closeable c = CodeInstallationMemUse.start()) { @@ -217,13 +217,13 @@ return new GraphBuilderSuiteInfo(suite, plugins); } - public void processAssumption(Assumptions newAssumptions, Assumption assumption, List<AssumptionValidAssumption> manual) { + public void processAssumption(Set<Assumption> newAssumptions, Assumption assumption, List<AssumptionValidAssumption> manual) { if (assumption != null) { if (assumption instanceof AssumptionValidAssumption) { AssumptionValidAssumption assumptionValidAssumption = (AssumptionValidAssumption) assumption; manual.add(assumptionValidAssumption); } else { - newAssumptions.record(assumption); + newAssumptions.add(assumption); } } }