fix: tolerate symbols as property names (#2094)

Agoric · Dec 17, 2020 · 15022fe · 15022fe
1 parent 83c6c33
commit 15022fe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/packages/SwingSet/src/kernel/deviceSlots.js b/packages/SwingSet/src/kernel/deviceSlots.js
@@ -104,8 +104,8 @@ export function makeDeviceSlots(
   function PresenceHandler(importSlot) {
     return {
       get(target, prop) {
-        lsdebug(`PreH proxy.get(${prop})`);
-        if (prop !== `${prop}`) {
+        lsdebug(`PreH proxy.get(${String(prop)})`);
+        if (typeof prop !== 'string' && typeof prop !== 'symbol') {
           return undefined;
         }
         const p = (...args) => {

diff --git a/packages/SwingSet/src/kernel/kdebug.js b/packages/SwingSet/src/kernel/kdebug.js
@@ -47,7 +47,7 @@ export function legibilizeValue(val, slots) {
         if (result.length !== 1) {
           result += ', ';
         }
-        result += `${prop}: ${legibilizeValue(val[prop], slots)}`;
+        result += `${String(prop)}: ${legibilizeValue(val[prop], slots)}`;
       }
       result += '}';
       return result;

diff --git a/packages/SwingSet/src/kernel/liveSlots.js b/packages/SwingSet/src/kernel/liveSlots.js
@@ -307,7 +307,9 @@ function build(syscall, forVatID, cacheSize, vatPowers, vatParameters) {
     const p = makeImportedPromise(resultVPID);
 
     lsdebug(
-      `ls.qm send(${JSON.stringify(targetSlot)}, ${prop}) -> ${resultVPID}`,
+      `ls.qm send(${JSON.stringify(targetSlot)}, ${String(
+        prop,
+      )}) -> ${resultVPID}`,
     );
     syscall.send(targetSlot, prop, serArgs, resultVPID);
 
@@ -342,7 +344,7 @@ function build(syscall, forVatID, cacheSize, vatPowers, vatParameters) {
   function DeviceHandler(slot) {
     return {
       get(target, prop) {
-        if (prop !== `${prop}`) {
+        if (typeof prop !== 'string' && typeof prop !== 'symbol') {
           return undefined;
         }
         return (...args) => {

diff --git a/packages/SwingSet/src/kernel/virtualObjectManager.js b/packages/SwingSet/src/kernel/virtualObjectManager.js
@@ -449,7 +449,7 @@ export function makeVirtualObjectManager(
         try {
           rawData[prop] = m.serialize(initialData[prop]);
         } catch (e) {
-          console.error(`state property ${prop} is not serializable`);
+          console.error(`state property ${String(prop)} is not serializable`);
           throw e;
         }
       }

diff --git a/packages/swingset-runner/src/slogulator.js b/packages/swingset-runner/src/slogulator.js
@@ -254,7 +254,7 @@ export function main() {
           if (result.length !== 1) {
             result += ', ';
           }
-          result += `${prop}: ${legibilizeValue(val[prop], slots)}`;
+          result += `${String(prop)}: ${legibilizeValue(val[prop], slots)}`;
         }
         result += '}';
       }