[GR-36530] Backport: Do not attempt to write a regular member when the writing of a hash entry succeeded.

PullRequest: js/2358

Author: iamstolis

graal-js/src/com.oracle.truffle.js.test/js/github_graaljs_522.js

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+// Tests writing of hash/map entries. It used to throw TypeError
+// in strict mode, see https://github.com/oracle/graaljs/issues/522
+
+load('assert.js');
+
+assertSame(42, (function() {
+    var map = new java.util.HashMap();
+    map.x = 42;
+    return map.x;
+})());
+
+assertSame(43, (function() {
+    var map = new java.util.HashMap();
+    map['x'] = 43;
+    return map['x'];
+})());
+
+assertSame(44, (function() {
+    "use strict";
+    var map = new java.util.HashMap();
+    map.x = 44;
+    return map.x;
+})());
+
+assertSame(45, (function() {
+    "use strict";
+    var map = new java.util.HashMap();
+    map['x'] = 45;
+    return map['x'];
+})());

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/PropertySetNode.java

@@ -1097,10 +1097,13 @@ private boolean performWriteMember(Object truffleObject, Object value, PropertyS
             if (context.getContextOptions().hasForeignHashProperties() && interop.hasHashEntries(truffleObject)) {
                 try {
                     interop.writeHashEntry(truffleObject, stringKey, value);
+                    return true;
                 } catch (UnknownKeyException | UnsupportedMessageException | UnsupportedTypeException e) {
                     if (root.isStrict) {
                         errorBranch.enter();
                         throw Errors.createTypeErrorInteropException(truffleObject, e, "writeHashEntry", this);
+                    } else {
+                        return false;
                     }
                 }
             }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/WriteElementNode.java

@@ -1858,6 +1858,7 @@ protected void executeWithTargetAndIndexUnguarded(Object target, Object index, O
             if (root.context.getContextOptions().hasForeignHashProperties() && interop.hasHashEntries(truffleObject)) {
                 try {
                     interop.writeHashEntry(truffleObject, propertyKey, exportedValue);
+                    return;
                 } catch (UnknownKeyException | UnsupportedMessageException | UnsupportedTypeException e) {
                     if (root.isStrict) {
                         errorBranch.enter();