[js] Fix serialization and deserialization of boot int/str arrays

Raku · Jun 13, 2019 · 9b64eca · 9b64eca
1 parent 9af6015
commit 9b64eca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/vm/js/nqp-runtime/BOOT.js b/src/vm/js/nqp-runtime/BOOT.js
@@ -7,3 +7,7 @@ module.exports.createArray = function(array) {
 module.exports.createIntArray = function(array) {
   return exports.IntArray.$$STable.REPR.allocateFromArray(exports.IntArray.$$STable, array);
 };
+
+module.exports.createStrArray = function(array) {
+  return exports.StrArray.$$STable.REPR.allocateFromArray(exports.StrArray.$$STable, array);
+};
diff --git a/src/vm/js/nqp-runtime/deserialization.js b/src/vm/js/nqp-runtime/deserialization.js
@@ -157,13 +157,13 @@ class BinaryCursor {
   * @param {Function} readElem - a callback that reads in a single element
   * @return {Object} bootArray containing the elements
   */
-  array(readElem) {
+  array(readElem, create) {
     const elems = this.varint();
     const array = [];
     for (let i = 0; i < elems; i++) {
       array.push(readElem(this));
     }
-    const bootArray = BOOT.createArray(array);
+    const bootArray = create(array);
     if (this.sc.currentObject) {
       bootArray.$$SC = this.sc;
       this.sc.ownedObjects.set(bootArray, this.sc.currentObject);
@@ -326,11 +326,11 @@ class BinaryCursor {
       case REFVAR_VM_STR:
         return new NQPStr(this.str());
       case REFVAR_VM_ARR_VAR:
-        return this.array(cursor => cursor.variant());
+        return this.array(cursor => cursor.variant(), array => BOOT.createArray(array));
       case REFVAR_VM_ARR_STR:
-        return this.array(cursor => cursor.str());
+        return this.array(cursor => cursor.str(), array => BOOT.createStrArray(array));
       case REFVAR_VM_ARR_INT:
-        return this.array(cursor => cursor.varint());
+        return this.array(cursor => cursor.varint(), array => BOOT.createIntArray(array));
       case REFVAR_VM_HASH_STR_VAR:
         return this.hashOfVariants(this);
       case REFVAR_STATIC_CODEREF:

diff --git a/src/vm/js/nqp-runtime/serialization.js b/src/vm/js/nqp-runtime/serialization.js
@@ -262,6 +262,10 @@ class BinaryWriteCursor {
       discrim = REFVAR_VM_STR;
     } else if (ref.$$STable === BOOT.Array.$$STable) {
       discrim = REFVAR_VM_ARR_VAR;
+    } else if (ref.$$STable === BOOT.IntArray.$$STable) {
+      discrim = REFVAR_VM_ARR_INT;
+    } else if (ref.$$STable === BOOT.StrArray.$$STable) {
+      discrim = REFVAR_VM_ARR_STR;
     } else if (ref instanceof Hash) {
       discrim = REFVAR_VM_HASH_STR_VAR;
     } else if (ref instanceof CodeRef || typeof ref == 'function') {