NativeProxy: fix set trap not passing receiver object

Author: duonglaiquang

rhino/src/main/java/org/mozilla/javascript/NativeProxy.java

@@ -569,7 +569,7 @@ public void put(String name, Scriptable start, Object value) {
         Function trap = getTrap(TRAP_SET);
         if (trap != null) {
             boolean booleanTrapResult =
-                    ScriptRuntime.toBoolean(callTrap(trap, new Object[] {target, name, value}));
+                    ScriptRuntime.toBoolean(callTrap(trap, new Object[] {target, name, value, this}));
             if (!booleanTrapResult) {
                 return; // false
             }
@@ -631,7 +631,7 @@ public void put(int index, Scriptable start, Object value) {
                     ScriptRuntime.toBoolean(
                             callTrap(
                                     trap,
-                                    new Object[] {target, ScriptRuntime.toString(index), value}));
+                                    new Object[] {target, ScriptRuntime.toString(index), value, this}));
             if (!booleanTrapResult) {
                 return; // false
             }
@@ -691,7 +691,7 @@ public void put(Symbol key, Scriptable start, Object value) {
         Function trap = getTrap(TRAP_SET);
         if (trap != null) {
             boolean booleanTrapResult =
-                    ScriptRuntime.toBoolean(callTrap(trap, new Object[] {target, key, value}));
+                    ScriptRuntime.toBoolean(callTrap(trap, new Object[] {target, key, value, this}));
             if (!booleanTrapResult) {
                 return; // false
             }

tests/src/test/java/org/mozilla/javascript/tests/es6/NativeProxyTest.java

@@ -954,4 +954,56 @@ public void keysPreventExtensions() {
 
         Utils.assertWithAllModes_ES6(true, js);
     }
+
+    @Test
+    public void setTrapReceivesReceiver() {
+        String js =
+                "var _receiver;\n"
+                        + "var target = {};\n"
+                        + "var proxy = new Proxy(target, {\n"
+                        + "  set: function(t, prop, value, receiver) {\n"
+                        + "    _receiver = receiver;\n"
+                        + "    t[prop] = value;\n"
+                        + "    return true;\n"
+                        + "  }\n"
+                        + "});\n"
+                        + "proxy.x = 1;\n"
+                        + "'' + (_receiver === proxy) + ' ' + target.x";
+        Utils.assertWithAllModes_ES6("true 1", js);
+    }
+
+    @Test
+    public void setTrapReceiverWithIndexProperty() {
+        String js =
+                "var _receiver;\n"
+                        + "var target = [10, 20, 30];\n"
+                        + "var proxy = new Proxy(target, {\n"
+                        + "  set: function(t, prop, value, receiver) {\n"
+                        + "    _receiver = receiver;\n"
+                        + "    t[prop] = value;\n"
+                        + "    return true;\n"
+                        + "  }\n"
+                        + "});\n"
+                        + "proxy[1] = 99;\n"
+                        + "'' + (_receiver === proxy) + ' ' + target[1]";
+        Utils.assertWithAllModes_ES6("true 99", js);
+    }
+
+    @Test
+    public void setTrapReceiverWithSymbolProperty() {
+        String js =
+                "var _receiver;\n"
+                        + "var sym = Symbol('test');\n"
+                        + "var target = {};\n"
+                        + "var proxy = new Proxy(target, {\n"
+                        + "  set: function(t, prop, value, receiver) {\n"
+                        + "    _receiver = receiver;\n"
+                        + "    t[prop] = value;\n"
+                        + "    return true;\n"
+                        + "  }\n"
+                        + "});\n"
+                        + "proxy[sym] = 'hello';\n"
+                        + "'' + (_receiver === proxy) + ' ' + target[sym]";
+        Utils.assertWithAllModes_ES6("true hello", js);
+    }
 }