jruby · Feb 11, 2016 · Feb 11, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/RubyContext.java
@@ -111,10 +111,6 @@ public class RubyContext extends ExecutionContext {
     private final SourceCache sourceCache;
     private final CallGraph callGraph;
 
-    private final AtomicLong nextObjectID = new AtomicLong(ObjectIDOperations.FIRST_OBJECT_ID);
-
-    private final boolean runningOnWindows;
-
     private final PrintStream debugStandardOut;
 
     private final Map<String, TruffleObject> exported = new HashMap<>();
@@ -199,8 +195,6 @@ public RubyContext(Ruby runtime, TruffleLanguage.Env env) {
             instrumentationServerManager = null;
         }
 
-        runningOnWindows = Platform.getPlatform().getOS() == OS_TYPE.WINDOWS;
-
         attachmentsManager = new AttachmentsManager(this);
         sourceCache = new SourceCache(new SourceLoader(this));
 
@@ -352,10 +346,6 @@ public static String checkClassVariableName(RubyContext context, String name, No
         return name;
     }
 
-    public boolean isRunningOnWindows() {
-        return runningOnWindows;
-    }
-
     public void loadFile(String fileName, Node currentNode) throws IOException {
         loadFileAbsolute(fileName, currentNode);
     }
@@ -437,18 +427,6 @@ private Object execute(ParserContext parserContext, DeclarationContext declarati
         return callTarget.call(RubyArguments.pack(parentFrame, null, method, declarationContext, null, self, null, new Object[]{}));
     }
 
-    public long getNextObjectID() {
-        final long id = nextObjectID.getAndAdd(2);
-
-        if (id < 0) {
-            CompilerDirectives.transferToInterpreter();
-            nextObjectID.set(Long.MIN_VALUE);
-            throw new RuntimeException("Object IDs exhausted");
-        }
-
-        return id;
-    }
-
     public Object makeTuple(VirtualFrame frame, CallDispatchHeadNode newTupleNode, Object... values) {
         return newTupleNode.call(frame, getCoreLibrary().getTupleClass(), "create", null, values);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceManager.java b/truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceManager.java
@@ -18,10 +18,12 @@
 import org.jruby.truffle.core.thread.ThreadManager;
 import org.jruby.truffle.core.thread.ThreadNodes;
 import org.jruby.truffle.language.control.RaiseException;
+import org.jruby.truffle.language.objects.ObjectIDOperations;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Supports the Ruby {@code ObjectSpace} module. Object IDs are lazily allocated {@code long}
@@ -63,6 +65,8 @@ public void clearFinalizers() {
     private int tracingAssumptionActivations = 0;
     private boolean tracingPaused = false;
 
+    private final AtomicLong nextObjectID = new AtomicLong(ObjectIDOperations.FIRST_OBJECT_ID);
+
     public ObjectSpaceManager(RubyContext context) {
         this.context = context;
     }
@@ -183,4 +187,15 @@ public boolean isTracing() {
         return isTracing;
     }
 
+    public long getNextObjectID() {
+        final long id = nextObjectID.getAndAdd(2);
+
+        if (id < 0) {
+            CompilerDirectives.transferToInterpreter();
+            throw new RuntimeException("Object IDs exhausted");
+        }
+
+        return id;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/ObjectPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/ObjectPrimitiveNodes.java
@@ -81,7 +81,7 @@ public long objectID(DynamicObject object,
             final long id = (long) readObjectIdNode.execute(object);
 
             if (id == 0) {
-                final long newId = getContext().getNextObjectID();
+                final long newId = getContext().getObjectSpaceManager().getNextObjectID();
                 writeObjectIdNode.execute(object, newId);
                 return newId;
             }

diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
@@ -183,19 +183,8 @@ public boolean isAbsolutePath(String path) {
     }
 
     public static String expandPath(RubyContext context, String fileName) {
-        // TODO (nirvdrum 11-Feb-15) This needs to work on Windows without calling into non-Truffle JRuby.
-        if (context.isRunningOnWindows()) {
-            final org.jruby.RubyString path = context.toJRubyString(StringOperations.createString(context, StringOperations.encodeRope(fileName, UTF8Encoding.INSTANCE)));
-            final org.jruby.RubyString expanded = (org.jruby.RubyString) org.jruby.RubyFile.expand_path19(
-                    context.getRuntime().getCurrentContext(),
-                    null,
-                    new org.jruby.runtime.builtin.IRubyObject[]{ path });
-
-            return expanded.asJavaString();
-        } else {
-            String dir = new File(fileName).isAbsolute() ? null : context.getRuntime().getCurrentDirectory();
-            return expandPath(fileName, dir);
-        }
+        String dir = new File(fileName).isAbsolute() ? null : context.getRuntime().getCurrentDirectory();
+        return expandPath(fileName, dir);
     }
 
     private static String expandPath(String fileName, String dir) {

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java b/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java
@@ -118,7 +118,7 @@ public static long verySlowGetObjectID(RubyContext context, DynamicObject object
             return (long) property.get(object, false);
         }
 
-        final long objectID = context.getNextObjectID();
+        final long objectID = context.getObjectSpaceManager().getNextObjectID();
         object.define(Layouts.OBJECT_ID_IDENTIFIER, objectID, 0);
         return objectID;
     }