finishing bulk operations

dylibso · Apr 18, 2024 · a4a63cd · a4a63cd
1 parent 1987f09
commit a4a63cd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -130,9 +130,6 @@
             start.wast,
             ref_is_null.wast</orderedWastToProcess>
           <excludedTests>
-            <!-- Init Active/Passive segments -->
-            SpecV1BulkTest.test79, SpecV1BulkTest.test81, SpecV1BulkTest.test83,
-            SpecV1BulkTest.test85,
             <!-- Invalid and Malformed failures, can be ignored for now -->
             SpecV1AddressTest.test75, SpecV1AddressTest.test76,
             SpecV1AddressTest.test77, SpecV1AddressTest.test78, SpecV1AddressTest.test79,

diff --git a/runtime/src/main/java/com/dylibso/chicory/runtime/Machine.java b/runtime/src/main/java/com/dylibso/chicory/runtime/Machine.java
@@ -1597,13 +1597,23 @@ private static void TABLE_INIT(MStack stack, Instance instance, long[] operands)
 
         var table = instance.table(tableidx);
 
-        if (size < 0
-                || elementidx > instance.elementCount()
-                || instance.element(elementidx) == null
-                || !(instance.element(elementidx) instanceof PassiveElement)
-                || elemidx + size > instance.element(elementidx).elementCount()
-                || end > table.size()) {
+        var elementCount = instance.elementCount();
+        var currentElement = instance.element(elementidx);
+        var currentElementCount =
+                (currentElement instanceof PassiveElement) ? currentElement.elementCount() : 0;
+        boolean isOutOfBounds =
+                (size < 0
+                        || elementidx > elementCount
+                        || (size > 0
+                                && (currentElement == null
+                                        || !(currentElement instanceof PassiveElement)))
+                        || elemidx + size > currentElementCount
+                        || end > table.size());
+
+        if (isOutOfBounds) {
             throw new WASMRuntimeException("out of bounds table access");
+        } else if (size == 0) {
+            return;
         }
 
         for (int i = offset; i < end; i++) {