dfinity · crusso · Jan 16, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025
diff --git a/src/codegen/compile_enhanced.ml b/src/codegen/compile_enhanced.ml
@@ -12268,11 +12268,9 @@ and compile_prim_invocation (env : E.t) ae p es at =
 
   | ICStableRead ty, [] ->
     SR.Vanilla,
-    (*    IC.compile_static_print env ("ICStableRead" ^ Type.string_of_typ ty) ^^ *)
     Persistence.load env ty
   | ICStableWrite ty, [] ->
     SR.unit,
-    (*    IC.compile_static_print env ("ICStableWrite" ^ Type.string_of_typ ty) ^^ *)
     Persistence.save env ty
 
   (* Cycles *)

diff --git a/src/lowering/desugar.ml b/src/lowering/desugar.ml
@@ -569,11 +569,12 @@ and build_actor at ts (exp_opt : Ir.exp option) self_id es obj_typ =
           (dom_fields @
             (List.filter_map
               (fun tf ->
-                match T.lookup_val_field_opt tf.T.lab dom_fields with
-                | Some t ->
-                  (* ignore overriden *)
+                match T.lookup_val_field_opt tf.T.lab dom_fields,
+                      T.lookup_val_field_opt tf.T.lab rng_fields with
+                | Some _, _    (* ignore consumed (overridden) *)
+                | _, Some _ -> (* ignore produced (provided) *)
                   None
-                | None ->
+                | None, None ->
                   (* retain others *)
                   Some tf)
               stab_fields))

diff --git a/src/mo_frontend/typing.ml b/src/mo_frontend/typing.ml
@@ -2645,9 +2645,13 @@ and check_migration env (stab_tfs : T.field list) exp_opt =
       dom_tfs @
         (List.filter_map
            (fun tf ->
-             match T.lookup_val_field_opt tf.T.lab dom_tfs with
-             | Some _ -> None
-             | None -> Some tf)
+             match T.lookup_val_field_opt tf.T.lab dom_tfs, T.lookup_val_field_opt tf.T.lab rng_tfs with
+             | _, Some _  (* ignore consumed (overridden) *)
+             | Some _, _ -> (* ignore produced (provided) *)
+               None
+             | None, None ->
+               (* retain others *)
+               Some tf)
            stab_tfs)
    in
    (* Check for duplicates and hash collisions in pre-signature *)

diff --git a/test/cmp/files/version0.most b/test/cmp/files/version0.most
@@ -0,0 +1,6 @@
+// Version: 1.0.0
+actor {
+  stable var one : [var Nat];
+  stable var two : [var Text];
+  stable var zero : Nat
+};
diff --git a/test/cmp/files/version1.most b/test/cmp/files/version1.most
@@ -0,0 +1,9 @@
+// Version: 2.0.0
+actor ({
+  stable var one : [var Nat];
+  stable var two : [var Text];
+  stable var zero : Nat
+}, {
+  stable var three : [var (Nat, Text)];
+  stable var zero : Nat
+}) ;
diff --git a/test/cmp/files/version2.most b/test/cmp/files/version2.most
@@ -0,0 +1,8 @@
+// Version: 2.0.0
+actor ({
+  stable var three : [var (Nat, Text)];
+  stable var zero : Nat
+}, {
+  stable var four : [var (Nat, Text)];
+  stable var zero : Nat
+}) ;
diff --git a/test/cmp/files/version3.most b/test/cmp/files/version3.most
@@ -0,0 +1,8 @@
+// Version: 2.0.0
+actor ({
+  stable var four : [var (Nat, Text)];
+  stable var zero : Nat
+}, {
+  stable var four : [var (Text, Nat)];
+  stable var zero : Nat
+}) ;
diff --git a/test/cmp/files/version4.most b/test/cmp/files/version4.most
@@ -0,0 +1,8 @@
+// Version: 2.0.0
+actor ({
+  stable var four : [var (Text, Nat)];
+  stable var zero : Nat
+}, {
+  stable var four : [var (Text, Nat, Bool)];
+  stable var zero : Nat
+}) ;
diff --git a/test/cmp/files/version5.most b/test/cmp/files/version5.most
@@ -0,0 +1,5 @@
+// Version: 1.0.0
+actor {
+  stable var four : [var (Text, Nat, Bool)];
+  stable var zero : Nat
+};
diff --git a/test/cmp/neg-version4-3.cmp b/test/cmp/neg-version4-3.cmp
@@ -0,0 +1 @@
+files/version4.most files/version3.most
diff --git a/test/cmp/neg-version5-4.cmp b/test/cmp/neg-version5-4.cmp
@@ -0,0 +1 @@
+files/version5.most files/version4.most
diff --git a/test/cmp/ok/neg-version4-3.cmp.ok b/test/cmp/ok/neg-version4-3.cmp.ok
@@ -0,0 +1,5 @@
+(unknown location): Compatibility error [M0170], stable variable four of previous type
+  var [var (Text, Nat, Bool)]
+cannot be consumed at new type
+  var [var (Nat, Text)]
+FALSE
diff --git a/test/cmp/ok/neg-version5-4.cmp.ok b/test/cmp/ok/neg-version5-4.cmp.ok
@@ -0,0 +1,5 @@
+(unknown location): Compatibility error [M0170], stable variable four of previous type
+  var [var (Text, Nat, Bool)]
+cannot be consumed at new type
+  var [var (Text, Nat)]
+FALSE
diff --git a/test/cmp/ok/version0-1.cmp.ok b/test/cmp/ok/version0-1.cmp.ok
@@ -0,0 +1 @@
+TRUE
diff --git a/test/cmp/ok/version1-0.cmp.ok b/test/cmp/ok/version1-0.cmp.ok
@@ -0,0 +1,4 @@
+(unknown location): warning [M0169], stable variable three of previous type
+  var [var (Nat, Text)]
+ will be discarded. This may cause data loss. Are you sure?
+TRUE
diff --git a/test/cmp/ok/version1-2.cmp.ok b/test/cmp/ok/version1-2.cmp.ok
@@ -0,0 +1 @@
+TRUE
diff --git a/test/cmp/ok/version2-1.cmp.ok b/test/cmp/ok/version2-1.cmp.ok
@@ -0,0 +1,4 @@
+(unknown location): warning [M0169], stable variable four of previous type
+  var [var (Nat, Text)]
+ will be discarded. This may cause data loss. Are you sure?
+TRUE
diff --git a/test/cmp/ok/version2-3.cmp.ok b/test/cmp/ok/version2-3.cmp.ok
@@ -0,0 +1 @@
+TRUE
diff --git a/test/cmp/ok/version3-2.cmp.ok b/test/cmp/ok/version3-2.cmp.ok
@@ -0,0 +1,4 @@
+(unknown location): warning [M0169], stable variable four of previous type
+  var [var (Text, Nat)]
+ will be discarded. This may cause data loss. Are you sure?
+TRUE
diff --git a/test/cmp/ok/version3-4.cmp.ok b/test/cmp/ok/version3-4.cmp.ok
@@ -0,0 +1 @@
+TRUE
diff --git a/test/cmp/ok/version4-5.cmp.ok b/test/cmp/ok/version4-5.cmp.ok
@@ -0,0 +1 @@
+TRUE
diff --git a/test/cmp/version0-1.cmp b/test/cmp/version0-1.cmp
@@ -0,0 +1 @@
+files/version0.most files/version1.most
diff --git a/test/cmp/version1-0.cmp b/test/cmp/version1-0.cmp
@@ -0,0 +1 @@
+files/version1.most files/version0.most
diff --git a/test/cmp/version1-2.cmp b/test/cmp/version1-2.cmp
@@ -0,0 +1 @@
+files/version1.most files/version2.most
diff --git a/test/cmp/version2-1.cmp b/test/cmp/version2-1.cmp
@@ -0,0 +1 @@
+files/version2.most files/version1.most
diff --git a/test/cmp/version2-3.cmp b/test/cmp/version2-3.cmp
@@ -0,0 +1 @@
+files/version2.most files/version3.most
diff --git a/test/cmp/version3-2.cmp b/test/cmp/version3-2.cmp
@@ -0,0 +1 @@
+files/version3.most files/version2.most
diff --git a/test/cmp/version3-4.cmp b/test/cmp/version3-4.cmp
@@ -0,0 +1 @@
+files/version3.most files/version4.most
diff --git a/test/cmp/version4-5.cmp b/test/cmp/version4-5.cmp
@@ -0,0 +1 @@
+files/version4.most files/version5.most
diff --git a/test/run-drun/ok/upgrade-class-migration.drun.ok b/test/run-drun/ok/upgrade-class-migration.drun.ok
@@ -13,10 +13,6 @@ debug.print: Version 2
 ingress Completed: Reply: 0x4449444c0000
 debug.print: {four = [var (1, "1"), (2, "2"), (3, "3"), (4, "4")]; zero = 0}
 ingress Completed: Reply: 0x4449444c0000
-ingress Err: IC0503: Error from Canister rwlgt-iiaaa-aaaaa-aaaaa-cai: Canister called `ic0.trap` with message: stable variable `three` of type `var [var (Nat, Text)]` expected but not found.
-Consider gracefully handling failures from this canister or altering the canister to handle exceptions. See documentation: http://internetcomputer.org/docs/current/references/execution-errors#trapped-explicitly
-debug.print: {four = [var (1, "1"), (2, "2"), (3, "3"), (4, "4")]; zero = 0}
-ingress Completed: Reply: 0x4449444c0000
 debug.print: {migration = {new = {four = [var ("1", 1), ("2", 2), ("3", 3), ("4", 4)]}; old = {four = [var (1, "1"), (2, "2"), (3, "3"), (4, "4")]}}}
 debug.print: Version 3
 ingress Completed: Reply: 0x4449444c0000

diff --git a/test/run-drun/ok/upgrade-migration.drun.ok b/test/run-drun/ok/upgrade-migration.drun.ok
@@ -13,10 +13,6 @@ debug.print: Version 2
 ingress Completed: Reply: 0x4449444c0000
 debug.print: {four = [var (1, "1"), (2, "2"), (3, "3"), (4, "4")]; zero = 0}
 ingress Completed: Reply: 0x4449444c0000
-ingress Err: IC0503: Error from Canister rwlgt-iiaaa-aaaaa-aaaaa-cai: Canister called `ic0.trap` with message: stable variable `three` of type `var [var (Nat, Text)]` expected but not found.
-Consider gracefully handling failures from this canister or altering the canister to handle exceptions. See documentation: http://internetcomputer.org/docs/current/references/execution-errors#trapped-explicitly
-debug.print: {four = [var (1, "1"), (2, "2"), (3, "3"), (4, "4")]; zero = 0}
-ingress Completed: Reply: 0x4449444c0000
 debug.print: {migration = {new = {four = [var ("1", 1), ("2", 2), ("3", 3), ("4", 4)]}; old = {four = [var (1, "1"), (2, "2"), (3, "3"), (4, "4")]}}}
 debug.print: Version 3
 ingress Completed: Reply: 0x4449444c0000

diff --git a/test/run-drun/upgrade-class-migration.drun b/test/run-drun/upgrade-class-migration.drun
@@ -5,8 +5,6 @@ upgrade $ID upgrade-class-migration/version1.mo ""
 ingress $ID check "DIDL\x00\x00"
 upgrade $ID upgrade-class-migration/version2.mo ""
 ingress $ID check "DIDL\x00\x00"
-upgrade $ID upgrade-class-migration/version2.mo ""
-ingress $ID check "DIDL\x00\x00"
 upgrade $ID upgrade-class-migration/version3.mo ""
 ingress $ID check "DIDL\x00\x00"
 upgrade $ID upgrade-class-migration/version4.mo ""

diff --git a/test/run-drun/upgrade-migration.drun b/test/run-drun/upgrade-migration.drun
@@ -5,8 +5,6 @@ upgrade $ID upgrade-migration/version1.mo ""
 ingress $ID check "DIDL\x00\x00"
 upgrade $ID upgrade-migration/version2.mo ""
 ingress $ID check "DIDL\x00\x00"
-upgrade $ID upgrade-migration/version2.mo ""
-ingress $ID check "DIDL\x00\x00"
 upgrade $ID upgrade-migration/version3.mo ""
 ingress $ID check "DIDL\x00\x00"
 upgrade $ID upgrade-migration/version4.mo ""