[GR-31370] Wasm: Memory allocation failure should not be an internal error.

PullRequest: graal/8940

Author: iamstolis

wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java

@@ -81,6 +81,7 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.ExceptionType;
@@ -779,6 +780,20 @@ public void testTableImport() throws IOException, InterruptedException {
         });
     }
 
+    @Test
+    public void testMemoryAllocationFailure() {
+        // Memory allocation should either succeed or throw an interop
+        // exception (not an internal error like OutOfMemoryError).
+        try {
+            Object[] memories = new Object[5];
+            for (int i = 0; i < memories.length; i++) {
+                memories[i] = Memory.create(new MemoryDescriptor(32767, 32767));
+            }
+        } catch (AbstractTruffleException ex) {
+            Assert.assertTrue("Should throw interop exception", InteropLibrary.getUncached(ex).isException(ex));
+        }
+    }
+
     private static void runTest(Consumer<WasmContext> testCase) throws IOException {
         final Context.Builder contextBuilder = Context.newBuilder("wasm");
         contextBuilder.option("wasm.Builtins", "testutil:testutil");

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/exception/Failure.java

@@ -122,6 +122,7 @@ public enum Failure {
     MEMORY_INSTANCE_SIZE_LIMIT_EXCEEDED(Type.TRAP, "memory instance size exceeds limit"),
 
     CALL_STACK_EXHAUSTED(Type.EXHAUSTION, "call stack exhausted"),
+    MEMORY_ALLOCATION_FAILED(Type.EXHAUSTION, "could not allocate memory"),
 
     // TODO(mbovel): replace UNSPECIFIED_INTERNAL usages with assertInternal/shouldNotReachHere.
     UNSPECIFIED_INTERNAL(Type.INTERNAL, "unspecified");

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java

@@ -89,7 +89,11 @@ private ByteArrayWasmMemory(int declaredMinSize, int declaredMaxSize, int initia
         this.declaredMinSize = declaredMinSize;
         this.declaredMaxSize = declaredMaxSize;
         this.maxAllowedSize = maxAllowedSize;
-        this.buffer = new byte[initialSize * MEMORY_PAGE_SIZE];
+        try {
+            this.buffer = new byte[initialSize * MEMORY_PAGE_SIZE];
+        } catch (OutOfMemoryError error) {
+            throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
+        }
     }
 
     public ByteArrayWasmMemory(int declaredMinSize, int declaredMaxSize, int maxAllowedSize) {
@@ -139,13 +143,17 @@ public synchronized boolean grow(int extraPageSize) {
         if (extraPageSize == 0) {
             return true;
         } else if (compareUnsigned(extraPageSize, maxAllowedSize) <= 0 && compareUnsigned(size() + extraPageSize, maxAllowedSize) <= 0) {
-            // Condition above and limit on maxPageSize (see ModuleLimits#MAX_MEMORY_SIZE) ensure
-            // computation of targetByteSize does not overflow.
-            final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
-            final byte[] newBuffer = new byte[targetByteSize];
-            System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
-            buffer = newBuffer;
-            return true;
+            try {
+                // Condition above and limit on maxPageSize (see ModuleLimits#MAX_MEMORY_SIZE)
+                // ensure computation of targetByteSize does not overflow.
+                final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
+                final byte[] newBuffer = new byte[targetByteSize];
+                System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+                buffer = newBuffer;
+                return true;
+            } catch (OutOfMemoryError error) {
+                throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
+            }
         } else {
             return false;
         }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java

@@ -102,7 +102,11 @@ private UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int initialSi
         this.size = declaredMinSize;
         this.maxAllowedSize = maxAllowedSize;
         final long byteSize = byteSize();
-        this.startAddress = unsafe.allocateMemory(byteSize);
+        try {
+            this.startAddress = unsafe.allocateMemory(byteSize);
+        } catch (OutOfMemoryError error) {
+            throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
+        }
         unsafe.setMemory(startAddress, byteSize, (byte) 0);
     }
 
@@ -165,13 +169,17 @@ public boolean grow(int extraPageSize) {
             // Condition above and limit on maxPageSize (see ModuleLimits#MAX_MEMORY_SIZE) ensure
             // computation of targetByteSize does not overflow.
             final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
-            final long updatedStartAddress = unsafe.allocateMemory(targetByteSize);
-            unsafe.copyMemory(startAddress, updatedStartAddress, byteSize());
-            unsafe.setMemory(updatedStartAddress + byteSize(), targetByteSize - byteSize(), (byte) 0);
-            unsafe.freeMemory(startAddress);
-            startAddress = updatedStartAddress;
-            size += extraPageSize;
-            return true;
+            try {
+                final long updatedStartAddress = unsafe.allocateMemory(targetByteSize);
+                unsafe.copyMemory(startAddress, updatedStartAddress, byteSize());
+                unsafe.setMemory(updatedStartAddress + byteSize(), targetByteSize - byteSize(), (byte) 0);
+                unsafe.freeMemory(startAddress);
+                startAddress = updatedStartAddress;
+                size += extraPageSize;
+                return true;
+            } catch (OutOfMemoryError error) {
+                throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
+            }
         } else {
             return false;
         }