Changes based on review.

Author: aardvark179

src/main/java/org/truffleruby/cext/UnwrapNode.java

@@ -9,12 +9,9 @@
  */
 package org.truffleruby.cext;
 
-import static org.truffleruby.cext.ValueWrapperManager.TAG_MASK;
 import static org.truffleruby.cext.ValueWrapperManager.TRUE_HANDLE;
 import static org.truffleruby.cext.ValueWrapperManager.UNDEF_HANDLE;
-import static org.truffleruby.cext.ValueWrapperManager.LONG_TAG;
 import static org.truffleruby.cext.ValueWrapperManager.NIL_HANDLE;
-import static org.truffleruby.cext.ValueWrapperManager.OBJECT_TAG;
 import static org.truffleruby.cext.ValueWrapperManager.FALSE_HANDLE;
 
 import org.truffleruby.cext.UnwrapNodeGen.NativeToWrapperNodeGen;
@@ -35,7 +32,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-@ImportStatic(Message.class)
+@ImportStatic({ Message.class, ValueWrapperManager.class })
 public abstract class UnwrapNode extends RubyBaseNode {
 
     @ImportStatic(ValueWrapperManager.class)
@@ -73,14 +70,6 @@ public Object unwrapTaggedObject(long handle) {
             return getContext().getValueWrapperManager().getFromHandleMap(handle);
         }
 
-        public boolean isTaggedLong(long handle) {
-            return (handle & LONG_TAG) == LONG_TAG;
-        }
-
-        public boolean isTaggedObject(long handle) {
-            return handle != FALSE_HANDLE && (handle & TAG_MASK) == OBJECT_TAG;
-        }
-
         public static UnwrapNativeNode create() {
             return UnwrapNativeNodeGen.create();
         }
@@ -121,20 +110,12 @@ public ValueWrapper unwrapTaggedObject(long handle) {
             return getContext().getValueWrapperManager().getWrapperFromHandleMap(handle);
         }
 
-        public boolean isTaggedLong(long handle) {
-            return (handle & LONG_TAG) == LONG_TAG;
-        }
-
-        public boolean isTaggedObject(long handle) {
-            return handle != FALSE_HANDLE && (handle & TAG_MASK) == OBJECT_TAG;
-        }
-
         public static NativeToWrapperNode create() {
             return NativeToWrapperNodeGen.create();
         }
     }
 
-    @ImportStatic(Message.class)
+    @ImportStatic({ Message.class, ValueWrapperManager.class })
     public static abstract class ToWrapperNode extends RubyBaseNode {
 
         public abstract ValueWrapper execute(Object value);
@@ -166,10 +147,6 @@ public ValueWrapper unwrapTypeCastObject(TruffleObject value,
             }
         }
 
-        public static boolean isWrapper(TruffleObject value) {
-            return value instanceof ValueWrapper;
-        }
-
         public static ToWrapperNode create() {
             return ToWrapperNodeGen.create();
         }
@@ -203,8 +180,4 @@ public Object unwrapTypeCastObject(TruffleObject value,
             throw new RaiseException(getContext(), coreExceptions().argumentError("Not a handle or a pointer", this));
         }
     }
-
-    public static boolean isWrapper(TruffleObject value) {
-        return value instanceof ValueWrapper;
-    }
 }

src/main/java/org/truffleruby/cext/ValueWrapperManager.java

@@ -14,7 +14,9 @@
 import org.truffleruby.RubyContext;
 import org.truffleruby.collections.LongHashMap;
 import org.truffleruby.extra.ffi.Pointer;
+
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.interop.TruffleObject;
 
 public class ValueWrapperManager {
 
@@ -49,8 +51,7 @@ public ValueWrapperManager(RubyContext context) {
      * We keep a map of long wrappers that have been generated because various C extensions assume
      * that any given fixnum will translate to a given VALUE.
      */
-    @TruffleBoundary
-    public synchronized ValueWrapper longWrapper(long value) {
+    public ValueWrapper longWrapper(long value) {
         return new ValueWrapper(value, UNSET_HANDLE);
     }
 
@@ -121,4 +122,16 @@ private Runnable createFinalizer(Pointer handle) {
         };
 
     }
+
+    public static boolean isTaggedLong(long handle) {
+        return (handle & LONG_TAG) == LONG_TAG;
+    }
+
+    public static boolean isTaggedObject(long handle) {
+        return handle != FALSE_HANDLE && (handle & TAG_MASK) == OBJECT_TAG;
+    }
+
+    public static boolean isWrapper(TruffleObject value) {
+        return value instanceof ValueWrapper;
+    }
 }

src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java

@@ -110,7 +110,6 @@ public abstract static class EachObjectNode extends YieldingCoreMethodNode {
         public int eachObject(NotProvided ofClass, DynamicObject block) {
             int count = 0;
 
-            getContext().getMarkingService().runMarkersAndDropKeptList();
             for (DynamicObject object : ObjectGraph.stopAndGetAllObjects(this, getContext())) {
                 if (!isHidden(object)) {
                     yield(block, object);
@@ -127,7 +126,6 @@ public int eachObject(DynamicObject ofClass, DynamicObject block,
                 @Cached("create()") IsANode isANode) {
             int count = 0;
 
-            getContext().getMarkingService().runMarkersAndDropKeptList();
             for (DynamicObject object : ObjectGraph.stopAndGetAllObjects(this, getContext())) {
                 if (!isHidden(object) && isANode.executeIsA(object, ofClass)) {
                     yield(block, object);

src/main/java/org/truffleruby/language/objects/ObjectGraph.java

@@ -40,6 +40,7 @@ public static Set<DynamicObject> newRubyObjectSet() {
 
     @TruffleBoundary
     public static Set<DynamicObject> stopAndGetAllObjects(Node currentNode, final RubyContext context) {
+        context.getMarkingService().runMarkersAndDropKeptList();
         final Set<DynamicObject> visited = newRubyObjectSet();
 
         final Thread initiatingJavaThread = Thread.currentThread();

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

@@ -618,7 +618,7 @@ public class OptionsCatalog {
             new String[]{});
     public static final IntegerOptionDescription CEXTS_MARKING_CACHE = new IntegerOptionDescription(
             "ruby.cexts.marking.cache",
-            "Number of objects converted to native handles before the marker is run",
+            "Number of objects converted to native handles before the marking service is run",
             null,
             100);
     public static final BooleanOptionDescription LOG_DYNAMIC_CONSTANT_LOOKUP = new BooleanOptionDescription(

tool/options.yml

@@ -136,7 +136,7 @@ CEXTS: [cexts, boolean, true, Enable use of C extensions]
 CEXTS_LOG_LOAD: [cexts.log.load, boolean, false, Log loading of cexts]
 CEXTS_LOG_WARNINGS: [cexts.log.warnings, boolean, false, Log cexts warnings]
 CEXTS_LIBRARY_REMAP: [cexts.remap, string-array, [], 'Remap the name of native libraries, written in the form libexample.so:/path/to/actual/libexample.so']
-CEXTS_MARKING_CACHE: [cexts.marking.cache, integer, 100, 'Number of objects converted to native handles before the marker is run']
+CEXTS_MARKING_CACHE: [cexts.marking.cache, integer, 100, 'Number of objects converted to native handles before the marking service is run']
 
 LOG_DYNAMIC_CONSTANT_LOOKUP: [constant.dynamic_lookup.log, boolean, false, Log source code positions where dynamic constant lookup is performed]