Renovate heap system not to pollute object

Author: kateinoigakukun

Diff for: Runtime/src/index.ts

@@ -32,7 +32,9 @@ enum JavaScriptValueKind {
 }
 
 class SwiftRuntimeHeap {
-    private _heapValues: Map<number, any>;
+    private _heapValueById: Map<number, any>;
+    private _heapIdByValue: Map<any, number>;
+    private _heapRcByValue: Map<any, number>;
     private _heapNextKey: number;
 
     constructor() {
@@ -42,43 +44,54 @@ class SwiftRuntimeHeap {
         } else if (typeof global !== "undefined") {
             _global = global
         }
-        this._heapValues = new Map();
-        this._heapValues.set(0, _global);
+        this._heapValueById = new Map();
+        this._heapValueById.set(0, _global);
+
+        this._heapIdByValue = new Map();
+        this._heapValueById.set(_global, 0);
+
+        this._heapRcByValue = new Map();
+
         // Note: 0 is preserved for global
         this._heapNextKey = 1;
     }
 
     allocHeap(value: any) {
-        const isObject = typeof value == "object"
-        if (isObject && value.swjs_heap_id) {
-            value.swjs_heap_rc++;
-            return value.swjs_heap_id
+        const isObject = typeof value == "object";
+        const heapId = this._heapIdByValue.get(value); 
+        if (isObject && heapId) {
+            const rc = this._heapRcByValue.get(value)!;
+            this._heapRcByValue.set(value, rc + 1);
+            return heapId
         }
         const id = this._heapNextKey++;
-        this._heapValues.set(id, value)
+        this._heapValueById.set(id, value)
         if (isObject) {
-            Reflect.set(value, "swjs_heap_id", id);
-            Reflect.set(value, "swjs_heap_rc", 1);
+            this._heapIdByValue.set(value, id);
+            this._heapRcByValue.set(value, 1);
         }
         return id
     }
 
     freeHeap(ref: ref) {
-        const value = this._heapValues.get(ref);
+        const value = this._heapValueById.get(ref);
         const isObject = typeof value == "object"
         if (isObject) {
-            const rc = --value.swjs_heap_rc;
-            if (rc != 0) return;
-            delete value.swjs_heap_id;
-            delete value.swjs_heap_rc;
-            this._heapValues.delete(ref)
+            const rc = this._heapRcByValue.get(value)!;
+            const newRc = rc - 1
+            this._heapRcByValue.set(value, newRc);
+            if (newRc != 0) return;
+
+            this._heapIdByValue.delete(value);
+            this._heapRcByValue.delete(value);
+            this._heapValueById.delete(ref)
         } else {
-            this._heapValues.delete(ref)
+            this._heapValueById.delete(ref)
         }
     }
 
     referenceHeap(ref: ref) {
-        return this._heapValues.get(ref)
+        return this._heapValueById.get(ref)
     }
 }