add type param list for struct in dump

aptos-labs · Oct 3, 2024 · 8a317b8 · 8a317b8
1 parent 9221375
commit 8a317b8
Show file tree

Hide file tree

Showing 43 changed files with 136 additions and 114 deletions.
diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/bug_14471_receiver_inference.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/bug_14471_receiver_inference.exp
@@ -3,7 +3,7 @@ module 0x815::m {
     struct MyMap {
         table: m::Table<address, m::ValueWrap>,
     }
-    struct Table {
+    struct Table<T1,T2> {
         x: T1,
         y: T2,
     }

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/fields.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/fields.exp
@@ -3,7 +3,7 @@ module 0x42::fields {
     struct T {
         h: u64,
     }
-    struct G {
+    struct G<X> {
         f: X,
     }
     struct S {

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_ok.exp
@@ -39,7 +39,7 @@ module 0xc0ffee::m {
             y: u64,
         }
     }
-    enum Option {
+    enum Option<A> {
         None,
         Some {
             value: A,

diff --git a/third_party/move/move-compiler-v2/tests/checking/abilities/v1/ability_constraints.exp b/third_party/move/move-compiler-v2/tests/checking/abilities/v1/ability_constraints.exp
@@ -1,9 +1,9 @@
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct Box {
+    struct Box<T> {
         f: T,
     }
-    struct Pair {
+    struct Pair<T1,T2> {
         f1: T1,
         f2: T2,
     }
@@ -13,22 +13,22 @@ module 0x42::M {
     struct S {
         dummy_field: bool,
     }
-    struct Sc {
+    struct Sc<T> {
         dummy_field: bool,
     }
-    struct Scds {
+    struct Scds<T> {
         dummy_field: bool,
     }
-    struct Sd {
+    struct Sd<T> {
         dummy_field: bool,
     }
-    struct Sk {
+    struct Sk<T> {
         dummy_field: bool,
     }
-    struct Ss {
+    struct Ss<T> {
         dummy_field: bool,
     }
-    struct Ssk {
+    struct Ssk<T> {
         dummy_field: bool,
     }
     private fun c<T>() {

diff --git a/third_party/move/move-compiler-v2/tests/checking/abilities/v1/phantom_param_op_abilities.exp b/third_party/move/move-compiler-v2/tests/checking/abilities/v1/phantom_param_op_abilities.exp
@@ -1,21 +1,21 @@
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct HasCopy {
+    struct HasCopy<T1,T2> {
         a: T2,
     }
-    struct HasDrop {
+    struct HasDrop<T1,T2> {
         a: T2,
     }
-    struct HasKey {
+    struct HasKey<T1,T2> {
         a: T2,
     }
-    struct HasStore {
+    struct HasStore<T1,T2> {
         a: T2,
     }
     struct NoAbilities {
         dummy_field: bool,
     }
-    struct RequireStore {
+    struct RequireStore<T> {
         a: T,
     }
     private fun f1(ref: &mut M::HasDrop<M::NoAbilities, u64>) {

diff --git a/...move/move-compiler-v2/tests/checking/abilities/v1/phantom_params_constraint_abilities.exp b/...move/move-compiler-v2/tests/checking/abilities/v1/phantom_params_constraint_abilities.exp
@@ -1,30 +1,30 @@
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct HasAbilities {
+    struct HasAbilities<T1,T2> {
         a: T2,
     }
-    struct HasCopy {
+    struct HasCopy<T1,T2> {
         a: T2,
     }
-    struct HasDrop {
+    struct HasDrop<T1,T2> {
         a: T2,
     }
-    struct HasKey {
+    struct HasKey<T1,T2> {
         a: T2,
     }
-    struct HasStore {
+    struct HasStore<T1,T2> {
         a: T2,
     }
     struct NoAbilities {
         a: bool,
     }
-    struct S1 {
+    struct S1<T> {
         a: T,
     }
     struct S2 {
         a: M::S1<M::HasAbilities<M::NoAbilities, u64>>,
     }
-    struct S3 {
+    struct S3<T1,T2,T3,T4> {
         a: T1,
         b: T2,
         c: T3,

diff --git a/...arty/move/move-compiler-v2/tests/checking/abilities/v1/phantom_params_field_abilities.exp b/...arty/move/move-compiler-v2/tests/checking/abilities/v1/phantom_params_field_abilities.exp
@@ -1,15 +1,15 @@
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct HasCopy {
+    struct HasCopy<T1,T2> {
         a: T2,
     }
-    struct HasDrop {
+    struct HasDrop<T1,T2> {
         a: T2,
     }
-    struct HasKey {
+    struct HasKey<T1,T2> {
         a: T2,
     }
-    struct HasStore {
+    struct HasStore<T1,T2> {
         a: T2,
     }
     struct NoAbilities {

diff --git a/third_party/move/move-compiler-v2/tests/checking/access_specifiers/access_ok.exp b/third_party/move/move-compiler-v2/tests/checking/access_specifiers/access_ok.exp
@@ -23,7 +23,7 @@ module 0x42::m {
     struct T {
         dummy_field: bool,
     }
-    struct G {
+    struct G<T> {
         dummy_field: bool,
     }
     struct R {

diff --git a/third_party/move/move-compiler-v2/tests/checking/access_specifiers/acquires_list_generic.exp b/third_party/move/move-compiler-v2/tests/checking/access_specifiers/acquires_list_generic.exp
@@ -1,9 +1,9 @@
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct B {
+    struct B<T> {
         dummy_field: bool,
     }
-    struct CupC {
+    struct CupC<T> {
         dummy_field: bool,
     }
     struct R {

diff --git a/third_party/move/move-compiler-v2/tests/checking/dotdot/dotdot_valid.exp b/third_party/move/move-compiler-v2/tests/checking/dotdot/dotdot_valid.exp
@@ -27,15 +27,15 @@ module 0x42::test {
         x: bool,
         y: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: T,
         y: test::S3,
     }
-    struct S5 {
+    struct S5<T,U> {
         0: T,
         1: U,
     }
-    struct S6 {
+    struct S6<T,U> {
         x: T,
         y: U,
     }

diff --git a/third_party/move/move-compiler-v2/tests/checking/inlining/resources_valid.exp b/third_party/move/move-compiler-v2/tests/checking/inlining/resources_valid.exp
@@ -1,6 +1,6 @@
 // -- Model dump before bytecode pipeline
 module 0x42::objects {
-    struct ReaderRef {
+    struct ReaderRef<T> {
         addr: address,
     }
     public fun get_addr<T>(ref: &objects::ReaderRef<#0>): address {

diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/unused_type_parameter_struct.exp b/third_party/move/move-compiler-v2/tests/checking/naming/unused_type_parameter_struct.exp
@@ -42,22 +42,22 @@ warning: unused type parameter
 
 // -- Model dump before bytecode pipeline
 module 0x42::test {
-    struct S0 {
+    struct S0<T> {
         dummy_field: bool,
     }
-    struct S1 {
+    struct S1<T1,T2> {
         dummy_field: bool,
     }
-    struct S2 {
+    struct S2<T1,T2> {
         f: test::S3<T2>,
     }
-    struct S3 {
+    struct S3<T> {
         dummy_field: bool,
     }
-    struct S4 {
+    struct S4<T,U> {
         f: vector<T>,
     }
-    struct S5 {
+    struct S5<T,U> {
         f: vector<T>,
         g: vector<U>,
     }

diff --git a/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.exp b/third_party/move/move-compiler-v2/tests/checking/naming/warning_dependency.exp
@@ -11,22 +11,22 @@ module 0x42::dependency {
     use 0x42::test::{S0};
 } // end 0x42::dependency
 module 0x42::test {
-    struct S0 {
+    struct S0<T> {
         dummy_field: bool,
     }
-    struct S1 {
+    struct S1<T1,T2> {
         dummy_field: bool,
     }
-    struct S2 {
+    struct S2<T1,T2> {
         f: test::S3<T2>,
     }
-    struct S3 {
+    struct S3<T> {
         dummy_field: bool,
     }
-    struct S4 {
+    struct S4<T,U> {
         f: vector<T>,
     }
-    struct S5 {
+    struct S5<T,U> {
         f: vector<T>,
         g: vector<U>,
     }

diff --git a/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.exp b/third_party/move/move-compiler-v2/tests/checking/positional_fields/decl_ok.exp
@@ -15,7 +15,7 @@ module 0x42::test {
         0: u8,
         1: bool,
     }
-    struct S3 {
+    struct S3<T1,T2> {
         0: T2,
         1: u8,
         2: T1,

diff --git a/...ty/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.exp b/...ty/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_ability_decl_ok.exp
@@ -6,23 +6,23 @@ module 0x42::test {
     struct S1 {
         0: u8,
     }
-    struct S2 {
+    struct S2<T> {
         0: T,
         1: u8,
     }
-    struct S3 {
+    struct S3<T> {
         0: T,
         1: u8,
     }
-    struct S4 {
+    struct S4<T> {
         x: u8,
         y: T,
     }
-    struct S5 {
+    struct S5<T> {
         0: T,
         1: test::S3<T>,
     }
-    struct S6 {
+    struct S6<T> {
         dummy_field: bool,
     }
 } // end 0x42::test
diff --git a/...party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.exp b/...party/move/move-compiler-v2/tests/checking/positional_fields/named_tuple_construct_ok.exp
@@ -18,14 +18,14 @@ module 0x42::test {
         0: u8,
         1: bool,
     }
-    struct S3 {
+    struct S3<T> {
         0: T,
         1: u8,
     }
     struct S4 {
         dummy_field: bool,
     }
-    struct S5 {
+    struct S5<T> {
         x: T,
         y: u8,
     }

diff --git a/..._party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.exp b/..._party/move/move-compiler-v2/tests/checking/positional_fields/variant_ability_decl_ok.exp
@@ -1,6 +1,6 @@
 // -- Model dump before bytecode pipeline
 module 0x42::test {
-    enum Bar {
+    enum Bar<T> {
         A {
             0: T,
         }
@@ -9,7 +9,7 @@ module 0x42::test {
             1: bool,
         }
     }
-    enum Foo {
+    enum Foo<T> {
         A {
             0: T,
         }

diff --git a/third_party/move/move-compiler-v2/tests/checking/receiver/decl_errors.exp b/third_party/move/move-compiler-v2/tests/checking/receiver/decl_errors.exp
@@ -38,7 +38,7 @@ module 0x42::n {
 } // end 0x42::n
 module 0x42::m {
     use 0x42::n::{T}; // resolved as: 0x42::n
-    struct G {
+    struct G<T,R> {
         x: T,
         y: R,
     }

diff --git a/third_party/move/move-compiler-v2/tests/checking/receiver/generic_calls.exp b/third_party/move/move-compiler-v2/tests/checking/receiver/generic_calls.exp
@@ -1,6 +1,6 @@
 // -- Model dump before bytecode pipeline
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {

diff --git a/third_party/move/move-compiler-v2/tests/checking/receiver/generic_calls_typed.exp b/third_party/move/move-compiler-v2/tests/checking/receiver/generic_calls_typed.exp
@@ -1,6 +1,6 @@
 // -- Model dump before bytecode pipeline
 module 0x42::m {
-    struct S {
+    struct S<T> {
         x: T,
     }
     private fun id<T>(self: m::S<#0>): m::S<#0> {

diff --git a/third_party/move/move-compiler-v2/tests/checking/specs/intrinsic_decl_ok.exp b/third_party/move/move-compiler-v2/tests/checking/specs/intrinsic_decl_ok.exp
@@ -1,12 +1,12 @@
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct MyTable1 {
+    struct MyTable1<K,V> {
         dummy_field: bool,
     }
     spec {
     }
 
-    struct MyTable2 {
+    struct MyTable2<K,V> {
         dummy_field: bool,
     }
     spec {

diff --git a/third_party/move/move-compiler-v2/tests/checking/specs/schemas_ok.exp b/third_party/move/move-compiler-v2/tests/checking/specs/schemas_ok.exp
@@ -52,7 +52,7 @@ note: unused schema M::SchemaExp
 
 // -- Model dump before bytecode pipeline
 module 0x42::M {
-    struct S {
+    struct S<X> {
         x: X,
     }
     private fun add(x: u64): u64 {

diff --git a/third_party/move/move-compiler-v2/tests/checking/specs/structs_ok.exp b/third_party/move/move-compiler-v2/tests/checking/specs/structs_ok.exp
@@ -3,7 +3,7 @@ module 0x42::M {
     struct T {
         x: u64,
     }
-    struct G {
+    struct G<T> {
         x: T,
         y: bool,
     }

diff --git a/third_party/move/move-compiler-v2/tests/checking/typing/eq.exp b/third_party/move/move-compiler-v2/tests/checking/typing/eq.exp
@@ -1,6 +1,6 @@
 // -- Model dump before bytecode pipeline
 module 0x8675309::M {
-    struct G {
+    struct G<T> {
         f: T,
     }
     struct R {