Added missing handling of NumberFormatExceptions in DebugPrimitiveValue.

Corrected documentation.
DebugArrayDisplayValue and DebugObjectDisplayValue now share ExportMessage implementation.

Author: flohuemer

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/parser/DebugData.java

@@ -131,8 +131,8 @@ public int asI32OrDefault(int attribute) {
      * Converts the underlying attribute value to an integer. Interprets byte and short encodings as
      * unsigned integer values.
      * 
-     * @return the integer value or {@link DebugUtil#DEFAULT_I32}, if the attribute does not exist
-     *         or the value does not fit into an integer.
+     * @return the integer value or the given default value, if the attribute does not exist or the
+     *         value does not fit into an integer.
      */
     public int asU32OrDefault(int attribute, int defaultValue) {
         final int index = attributeIndex(attribute);

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/representation/DebugArrayDisplayValue.java

@@ -108,6 +108,7 @@ public long getArraySize() {
     }
 
     @ExportMessage
+    @ExportMessage(name = "isArrayElementModifiable")
     @TruffleBoundary
     public boolean isArrayElementReadable(long index) {
         // TODO Limit the number of displayed values to 255 until GR-62691 is implemented
@@ -129,12 +130,6 @@ public Object readArrayElement(long index) throws InvalidArrayIndexException {
         return resolveDebugObject(object, context, location);
     }
 
-    @ExportMessage
-    @TruffleBoundary
-    public boolean isArrayElementModifiable(long index) {
-        return isArrayElementReadable(index);
-    }
-
     @ExportMessage
     @TruffleBoundary
     public boolean isArrayElementInsertable(@SuppressWarnings("unused") long index) {
@@ -144,7 +139,7 @@ public boolean isArrayElementInsertable(@SuppressWarnings("unused") long index)
     @ExportMessage(limit = "5")
     @TruffleBoundary
     public void writeArrayElement(long index, Object value, @CachedLibrary("value") InteropLibrary lib) throws InvalidArrayIndexException {
-        if (!isArrayElementModifiable(index)) {
+        if (!isArrayElementReadable(index)) {
             throw InvalidArrayIndexException.create(index);
         }
         final int offset = indexOffset + (int) index;

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/representation/DebugObjectDisplayValue.java

@@ -139,21 +139,16 @@ Object getMembers(@SuppressWarnings("unused") boolean includeInternal) {
     }
 
     @ExportMessage
+    @ExportMessage(name = "isMemberModifiable")
     @TruffleBoundary
     boolean isMemberReadable(String member) {
         return members.containsKey(member);
     }
 
-    @ExportMessage
-    @TruffleBoundary
-    boolean isMemberModifiable(String member) {
-        return members.containsKey(member);
-    }
-
     @ExportMessage(limit = "5")
     @TruffleBoundary
     void writeMember(String member, Object value, @CachedLibrary("value") InteropLibrary lib) throws UnknownIdentifierException {
-        if (!isMemberModifiable(member)) {
+        if (!isMemberReadable(member)) {
             throw UnknownIdentifierException.create(member);
         }
         final DebugObject memberObject = members.get(member);

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/debugging/representation/DebugPrimitiveValue.java

@@ -46,6 +46,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
@@ -97,7 +98,11 @@ public boolean fitsInByte() {
     @TruffleBoundary
     @ExportMessage
     public byte asByte() {
-        return Byte.parseByte(expression);
+        try {
+            return Byte.parseByte(expression);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
     }
 
     @TruffleBoundary
@@ -114,7 +119,11 @@ public boolean fitsInShort() {
     @TruffleBoundary
     @ExportMessage
     public short asShort() {
-        return Short.parseShort(expression);
+        try {
+            return Short.parseShort(expression);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
     }
 
     @TruffleBoundary
@@ -131,7 +140,11 @@ public boolean fitsInInt() {
     @TruffleBoundary
     @ExportMessage
     public int asInt() {
-        return Integer.parseInt(expression);
+        try {
+            return Integer.parseInt(expression);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
     }
 
     @TruffleBoundary
@@ -148,7 +161,11 @@ public boolean fitsInLong() {
     @TruffleBoundary
     @ExportMessage
     public long asLong() {
-        return Long.parseLong(expression);
+        try {
+            return Long.parseLong(expression);
+        } catch (NumberFormatException e) {
+            return 0L;
+        }
     }
 
     @TruffleBoundary
@@ -165,7 +182,11 @@ public boolean fitsInFloat() {
     @TruffleBoundary
     @ExportMessage
     public float asFloat() {
-        return Float.parseFloat(expression);
+        try {
+            return Float.parseFloat(expression);
+        } catch (NumberFormatException e) {
+            return 0f;
+        }
     }
 
     @TruffleBoundary
@@ -182,7 +203,11 @@ public boolean fitsInDouble() {
     @TruffleBoundary
     @ExportMessage
     public double asDouble() {
-        return Double.parseDouble(expression);
+        try {
+            return Double.parseDouble(expression);
+        } catch (NumberFormatException e) {
+            return 0d;
+        }
     }
 
     @TruffleBoundary
@@ -193,8 +218,8 @@ public boolean fitsInBigInteger() {
 
     @TruffleBoundary
     @ExportMessage
-    public BigInteger asBigInteger() {
-        throw new UnsupportedOperationException();
+    public BigInteger asBigInteger() throws UnsupportedMessageException {
+        throw UnsupportedMessageException.create();
     }
 
     @TruffleBoundary

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmFunctionBaseNode.java

@@ -47,7 +47,7 @@
 
 /**
  * Intermediate node to support instrumentation. Due to caching, instrumented nodes cannot replace
- * themselves at {@link WasmFixedMemoryImplFunctionNode}. Therefore, this intermediate not is
+ * themselves at {@link WasmFixedMemoryImplFunctionNode}. Therefore, this intermediate node is
  * needed.
  */
 public final class WasmFunctionBaseNode extends Node {