jruby · May 9, 2015 · May 9, 2015 · May 9, 2015
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -45,7 +45,6 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.SafePropertyAccessor;
-import org.jruby.util.cli.Options;
 import org.jruby.util.cli.OutputStrings;
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
@@ -401,7 +400,7 @@ private Status doRunFromMain(Ruby runtime, InputStream in, String filename) {
 
             runtime.runFromMain(in, filename);
 
-            runtime.shutdownTruffleBridge();
+            runtime.shutdownTruffleContext();
 
         } catch (RaiseException rj) {
             return new Status(handleRaiseException(rj));

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -849,7 +849,8 @@ public IRubyObject runScriptBody(Script script) {
     public IRubyObject runInterpreter(ThreadContext context, ParseResult parseResult, IRubyObject self) {
        if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
            assert parseResult instanceof RootNode;
-           getTruffleBridge().execute(getTruffleBridge().toTruffle(self), (RootNode) parseResult);
+           assert self == getTopSelf();
+           getTruffleContext().execute((RootNode) parseResult);
            return getNil();
        } else {
            try {
@@ -865,7 +866,8 @@ public IRubyObject runInterpreter(ThreadContext context, Node rootNode, IRubyObj
 
         if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
             assert rootNode instanceof RootNode;
-            getTruffleBridge().execute(getTruffleBridge().toTruffle(self), (RootNode) rootNode);
+            assert self == getTopSelf();
+            getTruffleContext().execute((RootNode) rootNode);
             return getNil();
         } else {
             try {
@@ -909,42 +911,40 @@ public JITCompiler getJITCompiler() {
         return jitCompiler;
     }
 
-    public TruffleBridge getTruffleBridge() {
-        synchronized (truffleBridgeMutex) {
-            if (truffleBridge == null) {
-                truffleBridge = loadTruffleBridge();
+    public TruffleContextInterface getTruffleContext() {
+        synchronized (truffleContextMonitor) {
+            if (truffleContext == null) {
+                truffleContext = loadTruffleContext();
             }
-            return truffleBridge;
+            return truffleContext;
         }
     }
 
-    private TruffleBridge loadTruffleBridge() {
+    private TruffleContextInterface loadTruffleContext() {
         final Class<?> clazz;
 
         try {
-            clazz = getJRubyClassLoader().loadClass("org.jruby.truffle.TruffleBridgeImpl");
+            clazz = getJRubyClassLoader().loadClass("org.jruby.truffle.runtime.RubyContext");
         } catch (Exception e) {
             throw new UnsupportedOperationException("Truffle classes not available", e);
         }
 
-        final TruffleBridge truffleBridge;
+        final TruffleContextInterface truffleBridge;
 
         try {
             Constructor<?> con = clazz.getConstructor(Ruby.class);
-            truffleBridge = (TruffleBridge) con.newInstance(this);
+            truffleBridge = (TruffleContextInterface) con.newInstance(this);
         } catch (Exception e) {
             throw new UnsupportedOperationException("Error while calling the constructor of TruffleBridgeImpl", e);
         }
 
-        truffleBridge.init();
-
         return truffleBridge;
     }
 
-    public void shutdownTruffleBridge() {
-        synchronized (truffleBridgeMutex) {
-            if (truffleBridge != null) {
-                truffleBridge.shutdown();
+    public void shutdownTruffleContext() {
+        synchronized (truffleContextMonitor) {
+            if (truffleContext != null) {
+                truffleContext.shutdown();
             }
         }
     }
@@ -4926,8 +4926,8 @@ public FilenoUtil getFilenoUtil() {
     // Compilation
     private final JITCompiler jitCompiler;
 
-    private TruffleBridge truffleBridge;
-    private final Object truffleBridgeMutex = new Object();
+    private TruffleContextInterface truffleContext;
+    private final Object truffleContextMonitor = new Object();
 
     // Note: this field and the following static initializer
     // must be located be in this order!

diff --git a/...rc/main/java/org/jruby/TruffleBridge.java → ...va/org/jruby/TruffleContextInterface.java b/...rc/main/java/org/jruby/TruffleBridge.java → ...va/org/jruby/TruffleContextInterface.java
@@ -9,22 +9,15 @@
  */
 package org.jruby;
 
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.ByteList;
-
-public interface TruffleBridge {
+public interface TruffleContextInterface {
 
     enum BacktraceFormatter {
         MRI,
         DEBUG,
         IMPL_DEBUG
     }
 
-    void init();
-
-    Object execute(Object self, org.jruby.ast.RootNode rootNode);
-
-    Object toTruffle(IRubyObject object);
+    Object execute(org.jruby.ast.RootNode rootNode);
 
     void shutdown();
 

diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -36,7 +36,7 @@
 import java.util.HashSet;
 
 import com.headius.options.Option;
-import org.jruby.TruffleBridge;
+import org.jruby.TruffleContextInterface;
 import org.jruby.runtime.Constants;
 import org.jruby.util.KCode;
 import org.jruby.util.SafePropertyAccessor;
@@ -155,10 +155,10 @@ public class Options {
     public static final Option<Boolean> TRUFFLE_RANDOMIZE_STORAGE_ARRAY = bool(TRUFFLE, "truffle.randomize_storage.array", false, "Randomize Array storage strategy.");
     public static final Option<Integer> TRUFFLE_RANDOMIZE_SEED = integer(TRUFFLE, "truffle.randomize.seed", 0, "Seed for any randomization.");
 
-    public static final Option<TruffleBridge.BacktraceFormatter> TRUFFLE_BACKTRACE_DISPLAY_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.display_format", TruffleBridge.BacktraceFormatter.class, TruffleBridge.BacktraceFormatter.MRI, "How to format backtraces displayed to the user.");
-    public static final Option<TruffleBridge.BacktraceFormatter> TRUFFLE_BACKTRACE_DEBUG_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.debug_format", TruffleBridge.BacktraceFormatter.class, TruffleBridge.BacktraceFormatter.DEBUG, "How to format backtraces displayed using TruffleDebug.dump_call_stack.");
-    public static final Option<TruffleBridge.BacktraceFormatter> TRUFFLE_BACKTRACE_EXCEPTION_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.exception_format", TruffleBridge.BacktraceFormatter.class, TruffleBridge.BacktraceFormatter.MRI, "How to format backtraces in Exception objects.");
-    public static final Option<TruffleBridge.BacktraceFormatter> TRUFFLE_BACKTRACE_PANIC_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.panic_format", TruffleBridge.BacktraceFormatter.class, TruffleBridge.BacktraceFormatter.IMPL_DEBUG, "How to format backtraces in panics.");
+    public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_DISPLAY_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.display_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.MRI, "How to format backtraces displayed to the user.");
+    public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_DEBUG_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.debug_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.DEBUG, "How to format backtraces displayed using TruffleDebug.dump_call_stack.");
+    public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_EXCEPTION_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.exception_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.MRI, "How to format backtraces in Exception objects.");
+    public static final Option<TruffleContextInterface.BacktraceFormatter> TRUFFLE_BACKTRACE_PANIC_FORMAT = enumeration(TRUFFLE, "truffle.backtrace.panic_format", TruffleContextInterface.BacktraceFormatter.class, TruffleContextInterface.BacktraceFormatter.IMPL_DEBUG, "How to format backtraces in panics.");
     public static final Option<Integer> TRUFFLE_BACKTRACE_MAX_VALUE_LENGTH = integer(TRUFFLE, "truffle.backtrace.max_value_length", 20, "Max length for values when displayed in a backtrace.");
     public static final Option<Boolean> TRUFFLE_BACKTRACE_GENERATE = bool(TRUFFLE, "truffle.backtrace.generate", true, "Generate backtraces on exceptions.");
 

diff --git a/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java b/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java