diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-11-15 15:39:13 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-11-18 09:29:33 +0000 |
| commit | 4efd46f20fcf44af31c81f62f562cecb50653451 (patch) | |
| tree | 3385f25e14803ab09044c5d481a0ca3a9125d7c6 /pkg/compiler/testdata | |
| parent | cfe3a04a188eb9a2c407783d8d6e6f55a4b30886 (diff) | |
pkg/compiler: allow recursion via arrays
Permit structs to recursively contain itself in arrays.
This is needed for netlink. Amusingly several netlink policies contain itself.
Diffstat (limited to 'pkg/compiler/testdata')
| -rw-r--r-- | pkg/compiler/testdata/all.txt | 19 | ||||
| -rw-r--r-- | pkg/compiler/testdata/errors2.txt | 23 |
2 files changed, 33 insertions, 9 deletions
diff --git a/pkg/compiler/testdata/all.txt b/pkg/compiler/testdata/all.txt index 098da4604..b19b85980 100644 --- a/pkg/compiler/testdata/all.txt +++ b/pkg/compiler/testdata/all.txt @@ -373,3 +373,22 @@ union$conditional3 [ ] conditional(a ptr[in, struct$conditional]) + +# Struct recusrion via arrays. + +recursive_struct_call(a ptr[in, recursive_struct], b ptr[in, recursive_struct3]) + +recursive_struct { + f0 array[recursive_struct] + f1 recursive_struct2 + f2 array[recursive_struct2] +} [packed] + +recursive_struct2 { + f0 int32 + f1 array[recursive_struct] +} + +recursive_struct3 { + f0 array[recursive_struct3] +} diff --git a/pkg/compiler/testdata/errors2.txt b/pkg/compiler/testdata/errors2.txt index 71e2aa5ad..9bdccb8fe 100644 --- a/pkg/compiler/testdata/errors2.txt +++ b/pkg/compiler/testdata/errors2.txt @@ -16,7 +16,7 @@ foo$1(a0 r0, a1 r1, a2 r2) # Recursive structs/unions. sr1 { - f1 sr1 ### recursive declaration: sr1.f1 -> sr1 (mark some pointers as opt) + f1 sr1 ### recursive declaration: sr1.f1 -> sr1 (mark some pointers as opt, or use variable-length arrays) } sr2 { @@ -25,12 +25,12 @@ sr2 { } sr3 { - f1 ptr[in, sr3] ### recursive declaration: sr3.f1 -> sr3 (mark some pointers as opt) + f1 ptr[in, sr3] ### recursive declaration: sr3.f1 -> sr3 (mark some pointers as opt, or use variable-length arrays) } sr4 { f1 ptr[in, sr3] - f2 array[ptr[in, sr5], 4] ### recursive declaration: sr4.f2 -> sr5.f2 -> sr6.f1 -> sr4 (mark some pointers as opt) + f2 array[ptr[in, sr5], 4] ### recursive declaration: sr4.f2 -> sr5.f2 -> sr6.f1 -> sr4 (mark some pointers as opt, or use variable-length arrays) } sr5 [ @@ -51,26 +51,31 @@ type templ_sr[T] { } sr8 { - f templ_sr[sr8] ### recursive declaration: sr8.f -> templ_sr[sr8].f -> sr8 (mark some pointers as opt) + f templ_sr[sr8] ### recursive declaration: sr8.f -> templ_sr[sr8].f -> sr8 (mark some pointers as opt, or use variable-length arrays) } sr9 { - f templ_sr[ptr[in, sr9]] ### recursive declaration: sr9.f -> templ_sr[ptr[in, sr9]].f -> sr9 (mark some pointers as opt) + f templ_sr[ptr[in, sr9]] ### recursive declaration: sr9.f -> templ_sr[ptr[in, sr9]].f -> sr9 (mark some pointers as opt, or use variable-length arrays) +} + +sr10 { + f0 array[sr10, 10] ### recursive declaration: sr10.f0 -> sr10 (mark some pointers as opt, or use variable-length arrays) } use_sr { u2 u2 - u3 u3 + u3 u3 s3 s3 s4 s4 s6 s6 s8 s8 - sr1 sr1 + sr1 sr1 sr2 sr2 sr5 sr5 sr7 sr7 - sr8 sr8 - sr9 sr9 + sr8 sr8 + sr9 sr9 + sr10 sr10 s400 s400 s401 s401 u400 u400 |