--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Thu Aug 06 08:33:18 2015 +0200
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Thu Aug 06 17:22:35 2015 +0200
@@ -402,7 +402,8 @@
                 if (failed[0] != null) {
                     throw new IllegalStateException(failed[0]);
                 }
-                SLContext fillIn = getContext();
+                Node n = createFindContextNode();
+                SLContext fillIn = findContext(n, null);
                 final SLFunctionRegistry functionRegistry = fillIn.getFunctionRegistry();
                 for (SLFunction f : c.getFunctionRegistry().getFunctions()) {
                     RootCallTarget callTarget = f.getCallTarget();
@@ -491,8 +492,8 @@
         }
     }
 
-    public SLContext getContext() {
-        return findContext();
+    public Node createFindContextNode0() {
+        return createFindContextNode();
     }
 
     private final class SLDebugProvider implements DebugSupportProvider {