--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java	Tue May 19 23:16:07 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntimeProvider.java	Fri May 22 23:26:20 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,11 +37,19 @@
  */
 public interface HotSpotGraalRuntimeProvider extends GraalRuntime, RuntimeProvider, StackIntrospection {
 
-    HotSpotVMConfig getConfig();
+    HotSpotJVMCIRuntimeProvider getJVMCIRuntime();
+
+    default HotSpotVMConfig getConfig() {
+        return getJVMCIRuntime().getConfig();
+    }
 
-    TargetDescription getTarget();
+    default TargetDescription getTarget() {
+        return getHostBackend().getTarget();
+    }
 
-    CompilerToVM getCompilerToVM();
+    default CompilerToVM getCompilerToVM() {
+        return getJVMCIRuntime().getCompilerToVM();
+    }
 
     /**
      * Converts a name to a Java type. This method attempts to resolve {@code name} to a
@@ -56,7 +64,9 @@
      * @throws LinkageError if {@code resolve == true} and the resolution failed
      * @throws NullPointerException if {@code accessingClass} is {@code null}
      */
-    JavaType lookupType(String name, HotSpotResolvedObjectType accessingType, boolean resolve);
+    default JavaType lookupType(String name, HotSpotResolvedObjectType accessingType, boolean resolve) {
+        return getJVMCIRuntime().lookupType(name, accessingType, resolve);
+    }
 
     HotSpotProviders getHostProviders();