Minor refactoring.

Author: aardvark179

src/main/java/org/truffleruby/core/MarkingService.java

@@ -84,6 +84,7 @@ public ReferenceProcessingService<MarkerReference> service() {
     private final ThreadLocal<Deque<ArrayList<Object>>> stackPreservation = ThreadLocal.withInitial(() -> new ArrayDeque<>());
 
     private Object[] keptObjects;
+    @SuppressWarnings("unused")
     private Object[] oldKeptObjects = null;
 
     private int counter = 0;
@@ -94,25 +95,15 @@ public MarkingService(RubyContext context, ReferenceProcessor referenceProcessor
         keptObjects = new Object[cacheSize];
     }
 
-    public void keepObject(Object object) {
-        if (addToKeptObjects(object)) {
-            runAllMarkers();
-        }
-    }
-
-    private synchronized boolean addToKeptObjects(Object object) {
+    public synchronized void keepObject(Object object) {
         final ArrayList<Object> keepList = stackPreservation.get().peekFirst();
         if (keepList != null) {
             keepList.add(object);
         }
         keptObjects[counter++] = object;
         if (counter == cacheSize) {
-            counter = 0;
-            oldKeptObjects = keptObjects;
-            keptObjects = new Object[cacheSize];
-            return true;
+            runAllMarkers();
         }
-        return false;
     }
 
     @TruffleBoundary
@@ -125,13 +116,10 @@ public void popStackPreservationFrame() {
         stackPreservation.get().pop();
     }
 
-    public synchronized void runMarkersAndDropKeptList() {
+    public synchronized void runAllMarkers() {
+        counter = 0;
         oldKeptObjects = keptObjects;
         keptObjects = new Object[cacheSize];
-        runAllMarkers();
-    }
-
-    private synchronized void runAllMarkers() {
         MarkerReference currentMarker = getFirst();
         MarkerReference nextMarker;
         while (currentMarker != null) {

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -109,7 +109,7 @@ public static abstract class VMGCStartPrimitiveNode extends PrimitiveArrayArgume
         @TruffleBoundary
         @Specialization
         public DynamicObject vmGCStart() {
-            getContext().getMarkingService().runMarkersAndDropKeptList();
+            getContext().getMarkingService().runAllMarkers();
             System.gc();
             return nil();
         }

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

@@ -40,7 +40,7 @@ public static Set<DynamicObject> newRubyObjectSet() {
 
     @TruffleBoundary
     public static Set<DynamicObject> stopAndGetAllObjects(Node currentNode, final RubyContext context) {
-        context.getMarkingService().runMarkersAndDropKeptList();
+        context.getMarkingService().runAllMarkers();
         final Set<DynamicObject> visited = newRubyObjectSet();
 
         final Thread initiatingJavaThread = Thread.currentThread();
@@ -131,7 +131,7 @@ public static Set<DynamicObject> getAdjacentObjects(DynamicObject object) {
                 }
             } else if (propertyValue instanceof Object[]) {
                 for (Object element : (Object[]) propertyValue) {
-                    // Needed to get wrappers set by Truffle::Cext.set_mark_list_on_object.
+                    // Needed to get wrappers set by Truffle::CExt.set_mark_list_on_object.
                     if (element instanceof ValueWrapper) {
                         element = ((ValueWrapper) element).getObject();
                     }