[GR-59866] Add ObjectSpace::WeakMap#delete

PullRequest: truffleruby/4443

CHANGELOG.md

@@ -44,6 +44,7 @@ Compatibility:
 * Support `symbolize_names` argument to `MatchData#named_captures` (#3681, @rwstauner).
 * Support `Proc#initialize_{dup,copy}` for subclasses (#3681, @rwstauner).
 * Remove deprecated `Encoding#replicate` method (#3681, @rwstauner).
+* Add `ObjectSpace::WeakMap#delete` (#3681, @andrykonchin).
 
 Performance:
 

src/main/java/org/truffleruby/collections/WeakValueCache.java

@@ -120,6 +120,13 @@ public int size() {
         return size;
     }
 
+    @TruffleBoundary
+    public Value remove(Key key) {
+        removeStaleEntries();
+        final KeyedReference<Key, Value> reference = map.remove(key);
+        return reference == null ? null : reference.get();
+    }
+
     @TruffleBoundary
     public Collection<Key> keys() {
         removeStaleEntries();

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

@@ -10,6 +10,7 @@
 package org.truffleruby.core.objectspace;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.RubyContext;
 import org.truffleruby.annotations.CoreMethod;
 import org.truffleruby.annotations.CoreModule;
@@ -105,6 +106,35 @@ RubyArray getValues(RubyWeakMap map) {
         }
     }
 
+    @CoreMethod(names = "delete", required = 1, needsBlock = true)
+    public abstract static class DeleteNode extends CoreMethodArrayArgumentsNode {
+
+        @Specialization
+        Object delete(RubyWeakMap map, Object key, RubyProc block,
+                @Cached InlinedConditionProfile isContainedProfile,
+                @Cached CallBlockNode yieldNode) {
+            Object value = map.storage.remove(new CompareByRubyIdentityWrapper(key));
+
+            if (isContainedProfile.profile(this, value != null)) {
+                return value;
+            } else {
+                return yieldNode.yield(this, block, key);
+            }
+        }
+
+        @Specialization
+        Object delete(RubyWeakMap map, Object key, Nil block,
+                @Cached InlinedConditionProfile isContainedProfile) {
+            Object value = map.storage.remove(new CompareByRubyIdentityWrapper(key));
+
+            if (isContainedProfile.profile(this, value != null)) {
+                return value;
+            } else {
+                return nil;
+            }
+        }
+    }
+
     @CoreMethod(names = { "each_key" }, needsBlock = true)
     public abstract static class EachKeyNode extends CoreMethodArrayArgumentsNode {