Merge pull request #655 from Raku/nqp-js-S23

Serialization format 23 for nqp-JS
Raku · Aug 20, 2020 · dc1839b · dc1839b
2 parents c852175 + daf8df6
commit dc1839b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/vm/js/nqp-runtime/deserialization.js b/src/vm/js/nqp-runtime/deserialization.js
@@ -480,10 +480,11 @@ class BinaryCursor {
       const objectIndex = this.int32();
       entry.codeObj = this.sc.deps[objectScId].rootObjects[objectIndex];
     } else {
-      // we're packed along a 24-byte alignment
+      // we're packed along a 28-byte alignment
       this.int32();
       this.int32();
     }
+    entry.name = this.str32();
     return entry;
   }
 
@@ -540,7 +541,7 @@ class BinaryCursor {
 
     this.sc = sc;
 
-    if (version != 22) {
+    if (version != 23) {
       throw 'Unsupported serialization format version: ' + version;
     }
 

diff --git a/src/vm/js/nqp-runtime/serialization.js b/src/vm/js/nqp-runtime/serialization.js
@@ -25,7 +25,7 @@ const globalContext = require('./global-context.js');
 const op = {};
 exports.op = op;
 
-const CURRENT_VERSION = 22;
+const CURRENT_VERSION = 23;
 const OBJECTS_TABLE_ENTRY_SC_IDX_MAX = 0x000FFFFF;
 const OBJECTS_TABLE_ENTRY_SC_MAX = 0x7FE;
 const OBJECTS_TABLE_ENTRY_SC_SHIFT = 20;
@@ -758,6 +758,7 @@ class SerializationWriter {
       this.closures.int32(0);
       this.closures.int32(0);
     }
+    this.closures.str32(this.name);
 
     /* Increment count of closures in the table. */
     this.numClosures++;