Mercurial > hg > truffle

changeset 18126:12c6c5a5bd88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid lambdas in HotSpotGraalRuntime initialization path
author Doug Simon <doug.simon@oracle.com>
date Mon, 20 Oct 2014 23:09:46 +0200
parents 2a69cbe850a8
children 7cefdad149ad
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java	Mon Oct 20 19:07:20 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java	Mon Oct 20 23:09:46 2014 +0200
@@ -24,6 +24,8 @@
 
 import static com.oracle.graal.compiler.common.GraalOptions.*;
 
+import java.util.function.*;
+
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.hotspot.bridge.*;
 import com.oracle.graal.hotspot.phases.*;
@@ -36,7 +38,7 @@
 /**
  * HotSpot implementation of {@link SuitesProvider}.
  */
-public class HotSpotSuitesProvider implements SuitesProvider {
+public class HotSpotSuitesProvider implements SuitesProvider, Supplier<Suites> {
 
     protected final DerivedOptionValue<Suites> defaultSuites;
     protected final PhaseSuite<HighTierContext> defaultGraphBuilderSuite;
@@ -45,13 +47,17 @@
     public HotSpotSuitesProvider(HotSpotGraalRuntime runtime) {
         this.runtime = runtime;
         this.defaultGraphBuilderSuite = createGraphBuilderSuite();
-        this.defaultSuites = new DerivedOptionValue<>(this::createSuites);
+        this.defaultSuites = new DerivedOptionValue<>(this);
     }
 
     public Suites getDefaultSuites() {
         return defaultSuites.getValue();
     }
 
+    public Suites get() {
+        return createSuites();
+    }
+
     public PhaseSuite<HighTierContext> getDefaultGraphBuilderSuite() {
         return defaultGraphBuilderSuite;
     }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java	Mon Oct 20 19:07:20 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java	Mon Oct 20 23:09:46 2014 +0200
@@ -22,11 +22,13 @@
  */
 package com.oracle.graal.java;
 
+import java.util.function.*;
+
 import com.oracle.graal.options.*;
 import com.oracle.graal.phases.*;
 import com.oracle.graal.phases.tiers.*;
 
-public class DefaultSuitesProvider implements SuitesProvider {
+public class DefaultSuitesProvider implements SuitesProvider, Supplier<Suites> {
 
     private final DerivedOptionValue<Suites> defaultSuites;
     private final PhaseSuite<HighTierContext> defaultGraphBuilderSuite;
@@ -40,6 +42,10 @@
         return defaultSuites.getValue();
     }
 
+    public Suites get() {
+        return createSuites();
+    }
+
     public Suites createSuites() {
         return Suites.createDefaultSuites();
     }