Merge pull request #227 from kennytm/top-level-pack-with-repl

Fix bug with PackWithReplacements when replacing top-level object with complex values.
mozart · Sep 26, 2014 · 76914ec · 76914ec
2 parents bdeaf6c + 6a3936f
commit 76914ec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/platform-test/base/pickle.oz b/platform-test/base/pickle.oz
@@ -26,7 +26,6 @@ import
    %BootPickle(pack:Pack unpack:Unpack) at 'x-oz://boot/Pickle'
    Pickle(pack:Pack unpack:Unpack packWithReplacements:PackWithReplacements)
    BootName(newUnique:NewUniqueName newNamed:NewNamedName) at 'x-oz://boot/Name'
-   System
 export
    Return
 define
@@ -140,5 +139,16 @@ define
                    true = (A \= B)
                end
            )
+
+           packWithReplacementsTopLevel(
+               proc {$}
+                   A = {NewCell 1}
+                   VBS = {PackWithReplacements A [A#(a(b))]}
+                   U = {Unpack VBS}
+               in
+                   true = {IsCell A}
+                   U = a(b)
+               end
+           )
           ])
 end
diff --git a/vm/vm/main/pickler.cc b/vm/vm/main/pickler.cc
@@ -75,10 +75,6 @@ void Pickler::pickle(RichNode value, RichNode temporaryReplacement) {
   auto typesRecord = RichNode(*vm->getPickleTypesRecord()).as<Record>();
   auto statelessTypes = RichNode(*typesRecord.getArity()).as<Arity>();
 
-  SerializationCallback cb(vm);
-  UnstableNode topLevelIndex = OptVar::build(vm);
-  cb.copy(topLevelIndex, value);
-
   bool futures = false;
   nativeint count = 0;
   VMAllocatedList<NodeBackup> nodeBackups;
@@ -104,10 +100,15 @@ void Pickler::pickle(RichNode value, RichNode temporaryReplacement) {
       nodeReplacementBackups.push_front(vm, replacement.first.makeBackup());
       replacement.first.reinit(vm, replacement.second);
     }
+    value.update();
 
     replacements.clear(vm);
   }
 
+  SerializationCallback cb(vm);
+  UnstableNode topLevelIndex = OptVar::build(vm);
+  cb.copy(topLevelIndex, value);
+
   // Replace serialized nodes by Serialized(index)
   // and add them to the nodes list
   while (!cb.todoFrom.empty()) {