1 files changed, 49 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/debug/Object-setProperty-non-primitive-key.js b/js/src/jit-test/tests/debug/Object-setProperty-non-primitive-key.js
new file mode 100644
index 0000000000..e6aaa138a4
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Object-setProperty-non-primitive-key.js
@@ -0,0 +1,49 @@
+var g = newGlobal({newCompartment: true});
+var dbg = new Debugger(g);
+var gw = dbg.addDebuggee(g);
+
+g.eval(`
+  var obj = {
+    p: 0,
+    [Symbol.iterator]: 0,
+  };
+`);
+
+// Return |key| as an object.
+function toObject(key) {
+  return {
+    [Symbol.toPrimitive]() {
+      return key;
+    }
+  };
+}
+
+let obj = gw.getProperty("obj").return;
+
+for (let key of obj.getOwnPropertyNames()) {
+  let keyObject = toObject(key);
+
+  g.obj[key] = 1;
+  assertEq(g.obj[key], 1);
+  assertEq(obj.setProperty(key, 2).return, true);
+  assertEq(g.obj[key], 2);
+
+  g.obj[key] = 1;
+  assertEq(g.obj[key], 1);
+  assertEq(obj.setProperty(keyObject, 2).return, true);
+  assertEq(g.obj[key], 2);
+}
+
+for (let key of obj.getOwnPropertySymbols()) {
+  let keyObject = toObject(key);
+
+  g.obj[key] = 1;
+  assertEq(g.obj[key], 1);
+  assertEq(obj.setProperty(key, 2).return, true);
+  assertEq(g.obj[key], 2);
+
+  g.obj[key] = 1;
+  assertEq(g.obj[key], 1);
+  assertEq(obj.setProperty(keyObject, 2).return, true);
+  assertEq(g.obj[key], 2);
+}