Add an empty slot map for cases where no slots exist.

mozilla · Jan 9, 2025 · 79c31a7 · 79c31a7
1 parent 316fe29
commit 79c31a7
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/rhino/src/main/java/org/mozilla/javascript/SlotMapContainer.java b/rhino/src/main/java/org/mozilla/javascript/SlotMapContainer.java
@@ -6,6 +6,7 @@
 
 package org.mozilla.javascript;
 
+import java.util.Collections;
 import java.util.Iterator;
 
 /**
@@ -23,14 +24,56 @@ class SlotMapContainer implements SlotMap {
 
     private static final int DEFAULT_SIZE = 10;
 
+    private static class EmptySlotMap implements SlotMap {
+
+        @Override
+        public Iterator<Slot> iterator() {
+            return Collections.emptyIterator();
+        }
+
+        @Override
+        public int size() {
+            return 0;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
+
+        @Override
+        public Slot modify(Object key, int index, int attributes) {
+            return null;
+        }
+
+        @Override
+        public Slot query(Object key, int index) {
+            return null;
+        }
+
+        @Override
+        public void add(Slot newSlot) {
+            throw new IllegalStateException();
+        }
+
+        @Override
+        public <S extends Slot> S compute(Object key, int index, SlotComputer<S> compute) {
+            throw new IllegalStateException();
+        }
+    }
+
+    private static EmptySlotMap EMPTY_SLOT_MAP = new EmptySlotMap();
+
     protected SlotMap map;
 
     SlotMapContainer() {
         this(DEFAULT_SIZE);
     }
 
     SlotMapContainer(int initialSize) {
-        if (initialSize > LARGE_HASH_SIZE) {
+        if (initialSize == 0) {
+            map = EMPTY_SLOT_MAP;
+        } else if (initialSize > LARGE_HASH_SIZE) {
             map = new HashSlotMap();
         } else {
             map = new EmbeddedSlotMap();
@@ -59,6 +102,7 @@ public Slot modify(Object key, int index, int attributes) {
 
     @Override
     public <S extends Slot> S compute(Object key, int index, SlotComputer<S> c) {
+        checkMapSize();
         return map.compute(key, index, c);
     }
 
@@ -92,7 +136,9 @@ public void unlockRead(long stamp) {
      * map to a HashMap that is more robust against large numbers of hash collisions.
      */
     protected void checkMapSize() {
-        if ((map instanceof EmbeddedSlotMap) && map.size() >= LARGE_HASH_SIZE) {
+        if (map == EMPTY_SLOT_MAP) {
+            map = new EmbeddedSlotMap();
+        } else if ((map instanceof EmbeddedSlotMap) && map.size() >= LARGE_HASH_SIZE) {
             SlotMap newMap = new HashSlotMap(map);
             map = newMap;
         }

diff --git a/rhino/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java b/rhino/src/main/java/org/mozilla/javascript/ThreadSafeSlotMapContainer.java
@@ -77,6 +77,7 @@ public Slot modify(Object key, int index, int attributes) {
     public <S extends Slot> S compute(Object key, int index, SlotComputer<S> c) {
         final long stamp = lock.writeLock();
         try {
+            checkMapSize();
             return map.compute(key, index, c);
         } finally {
             lock.unlockWrite(stamp);