Change keepalive code to preserve individual VALUEWrapper objects

Author: aardvark179

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

@@ -227,9 +227,6 @@ private HandleBlock() {
         public HandleBlock(RubyContext context, RubyLanguage language, ValueWrapperManager manager) {
             HandleBlockAllocator allocator = language.handleBlockAllocator;
             long base = allocator.getFreeBlock();
-            if (context != null && context.getOptions().CEXTS_KEEP_HANDLES_ALIVE) {
-                keepAlive(this);
-            }
             this.base = base;
             this.wrappers = new ValueWrapperWeakReference[BLOCK_SIZE];
             this.count = 0;
@@ -243,11 +240,6 @@ private static Runnable makeCleaner(ValueWrapperManager manager, long base, Hand
             };
         }
 
-        @TruffleBoundary
-        private static void keepAlive(HandleBlock block) {
-            keepAlive.add(block);
-        }
-
         public long getBase() {
             return base;
         }
@@ -298,10 +290,15 @@ public static class HandleBlockHolder {
     @GenerateUncached
     public abstract static class AllocateHandleNode extends RubyBaseNode {
 
+        private static final Set<ValueWrapper> keepAlive = ConcurrentHashMap.newKeySet();
+
         public abstract long execute(ValueWrapper wrapper);
 
         @Specialization(guards = "!isSharedObject(wrapper)")
         protected long allocateHandleOnKnownThread(ValueWrapper wrapper) {
+            if (getContext().getOptions().CEXTS_KEEP_HANDLES_ALIVE) {
+                keepAlive(wrapper);
+            }
             return allocateHandle(
                     wrapper,
                     getContext(),
@@ -312,6 +309,9 @@ protected long allocateHandleOnKnownThread(ValueWrapper wrapper) {
 
         @Specialization(guards = "isSharedObject(wrapper)")
         protected long allocateSharedHandleOnKnownThread(ValueWrapper wrapper) {
+            if (getContext().getOptions().CEXTS_KEEP_HANDLES_ALIVE) {
+                keepAlive(wrapper);
+            }
             return allocateHandle(
                     wrapper,
                     getContext(),
@@ -320,6 +320,11 @@ protected long allocateSharedHandleOnKnownThread(ValueWrapper wrapper) {
                     true);
         }
 
+        @TruffleBoundary
+        protected static void keepAlive(ValueWrapper wrapper) {
+            keepAlive.add(wrapper);
+        }
+
         protected long allocateHandle(ValueWrapper wrapper, RubyContext context, RubyLanguage language,
                 HandleBlockHolder holder, boolean shared) {
             HandleBlock block;