internal/core/adt: fix stack overflow with comprehensions

The issue was that evaluating an arc in the source of a comprehension resulted in infinite recursion. The call to unify that is removed can be removed, as it is already called in the block above when it is necessary. This is not a full fix, but is something that will be easier to fix in the new evaluator. Fixes #2367 Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: Ibcab74235097180094284f249750c3c0ec5d2845 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/557011 TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Daniel Martí <[email protected]> Unity-Result: CUE porcuepine <[email protected]>
cue-lang · Jul 28, 2023 · 33071c0 · 33071c0
1 parent 538eb9c
commit 33071c0
Show file tree

Hide file tree

Showing 43 changed files with 171 additions and 171 deletions.
diff --git a/cue/testdata/benchmarks/issue2176.txtar b/cue/testdata/benchmarks/issue2176.txtar
@@ -59,15 +59,15 @@ output: {
 	"2": (datastream & {marker: length: 14}).marker.position
 }
 -- out/eval/stats --
-Leaks:  214
-Freed:  5799
-Reused: 5795
-Allocs: 218
-Retain: 1911
+Leaks:  90
+Freed:  4079
+Reused: 4074
+Allocs: 95
+Retain: 1359
 
-Unifications: 6005
-Conjuncts:    14507
-Disjuncts:    6864
+Unifications: 4161
+Conjuncts:    9489
+Disjuncts:    4804
 -- out/eval --
 (struct){
   #Datastream: (#struct){

diff --git a/cue/testdata/comprehensions/015_list_comprehension.txtar b/cue/testdata/comprehensions/015_list_comprehension.txtar
@@ -83,12 +83,12 @@ d:
 -- out/eval/stats --
 Leaks:  0
 Freed:  19
-Reused: 11
-Allocs: 8
-Retain: 14
+Reused: 12
+Allocs: 7
+Retain: 10
 
 Unifications: 19
-Conjuncts:    35
+Conjuncts:    36
 Disjuncts:    23
 -- out/eval --
 (struct){

diff --git a/cue/testdata/comprehensions/045_comprehension_and_skipped_field.txtar b/cue/testdata/comprehensions/045_comprehension_and_skipped_field.txtar
@@ -54,11 +54,11 @@ Leaks:  3
 Freed:  7
 Reused: 2
 Allocs: 8
-Retain: 8
+Retain: 7
 
 Unifications: 8
 Conjuncts:    11
-Disjuncts:    13
+Disjuncts:    12
 -- out/eval --
 (struct){
   x: (struct){

diff --git a/cue/testdata/comprehensions/closed.txtar b/cue/testdata/comprehensions/closed.txtar
@@ -95,7 +95,7 @@ Leaks:  2
 Freed:  70
 Reused: 64
 Allocs: 8
-Retain: 4
+Retain: 3
 
 Unifications: 58
 Conjuncts:    103

diff --git a/cue/testdata/comprehensions/errors.txtar b/cue/testdata/comprehensions/errors.txtar
@@ -44,18 +44,18 @@ conflictRangingOverSelf: {
 	}
 }
 -- out/eval/stats --
-Leaks:  4
-Freed:  27
-Reused: 23
-Allocs: 8
-Retain: 6
+Leaks:  1
+Freed:  28
+Reused: 22
+Allocs: 7
+Retain: 1
 
-Unifications: 21
+Unifications: 19
 Conjuncts:    40
-Disjuncts:    30
+Disjuncts:    29
 -- out/eval --
 Errors:
-conflictRangingOverSelf.x: conflicting values int and "age" (mismatched types int and string):
+conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string):
     ./in.cue:36:9
     ./in.cue:40:3
     ./in.cue:41:9
@@ -102,7 +102,7 @@ Result:
       // [eval]
       name: (string){ "name" }
       age: (_|_){
-        // [eval] conflictRangingOverSelf.x: conflicting values int and "age" (mismatched types int and string):
+        // [eval] conflictRangingOverSelf.x.age: conflicting values int and "age" (mismatched types int and string):
         //     ./in.cue:36:9
         //     ./in.cue:40:3
         //     ./in.cue:41:9

diff --git a/cue/testdata/comprehensions/fields.txtar b/cue/testdata/comprehensions/fields.txtar
@@ -62,10 +62,10 @@ Leaks:  1
 Freed:  32
 Reused: 26
 Allocs: 7
-Retain: 2
+Retain: 1
 
 Unifications: 33
-Conjuncts:    40
+Conjuncts:    41
 Disjuncts:    33
 -- out/eval --
 (struct){

diff --git a/cue/testdata/comprehensions/for.txtar b/cue/testdata/comprehensions/for.txtar
@@ -13,13 +13,13 @@ comprehensionBinds: {
 	b: {for _, _ in [1] {a: _}}
 }
 -- out/eval/stats --
-Leaks:  4
+Leaks:  2
 Freed:  16
 Reused: 12
-Allocs: 8
-Retain: 11
+Allocs: 6
+Retain: 7
 
-Unifications: 20
+Unifications: 18
 Conjuncts:    18
 Disjuncts:    21
 -- out/eval --

diff --git a/cue/testdata/comprehensions/iferror.txtar b/cue/testdata/comprehensions/iferror.txtar
@@ -151,10 +151,10 @@ Leaks:  0
 Freed:  43
 Reused: 35
 Allocs: 8
-Retain: 18
+Retain: 14
 
 Unifications: 33
-Conjuncts:    65
+Conjuncts:    66
 Disjuncts:    57
 -- out/eval --
 Errors:

diff --git a/cue/testdata/comprehensions/issue1732.txtar b/cue/testdata/comprehensions/issue1732.txtar
@@ -122,15 +122,15 @@ foo: {
 	}
 }
 -- out/eval/stats --
-Leaks:  4
+Leaks:  3
 Freed:  118
 Reused: 103
-Allocs: 19
-Retain: 14
+Allocs: 18
+Retain: 10
 
-Unifications: 112
+Unifications: 111
 Conjuncts:    249
-Disjuncts:    128
+Disjuncts:    126
 -- out/eval --
 (struct){
   networkingv1: (struct){

diff --git a/cue/testdata/comprehensions/issue2171.txtar b/cue/testdata/comprehensions/issue2171.txtar
@@ -25,11 +25,11 @@ Leaks:  0
 Freed:  3
 Reused: 0
 Allocs: 3
-Retain: 2
+Retain: 0
 
 Unifications: 3
 Conjuncts:    5
-Disjuncts:    5
+Disjuncts:    3
 -- out/eval --
 (struct){
   do: (struct){

diff --git a/cue/testdata/comprehensions/issue843.txtar b/cue/testdata/comprehensions/issue843.txtar
@@ -45,7 +45,7 @@ Leaks:  9
 Freed:  55
 Reused: 41
 Allocs: 23
-Retain: 20
+Retain: 14
 
 Unifications: 52
 Conjuncts:    120

diff --git a/cue/testdata/comprehensions/nested.txtar b/cue/testdata/comprehensions/nested.txtar
@@ -63,11 +63,11 @@ Leaks:  0
 Freed:  45
 Reused: 26
 Allocs: 19
-Retain: 36
+Retain: 33
 
 Unifications: 35
 Conjuncts:    95
-Disjuncts:    78
+Disjuncts:    75
 -- out/eval --
 (struct){
   service: (struct){

diff --git a/cue/testdata/comprehensions/pushdown.txtar b/cue/testdata/comprehensions/pushdown.txtar
@@ -746,11 +746,11 @@ Leaks:  14
 Freed:  394
 Reused: 387
 Allocs: 21
-Retain: 120
+Retain: 107
 
 Unifications: 394
-Conjuncts:    637
-Disjuncts:    476
+Conjuncts:    638
+Disjuncts:    471
 -- out/eval --
 Errors:
 embed.fail1.p: field not allowed:

diff --git a/cue/testdata/cycle/chain.txtar b/cue/testdata/cycle/chain.txtar
@@ -208,14 +208,14 @@ issue2052: full: {
 	d: #Depth & {#in: tree}
 }
 -- out/eval/stats --
-Leaks:  72
+Leaks:  70
 Freed:  1815
 Reused: 1801
-Allocs: 86
-Retain: 195
+Allocs: 84
+Retain: 185
 
-Unifications: 802
-Conjuncts:    3177
+Unifications: 800
+Conjuncts:    3175
 Disjuncts:    1974
 -- out/eval --
 (struct){

diff --git a/cue/testdata/cycle/comprehension.txtar b/cue/testdata/cycle/comprehension.txtar
@@ -303,16 +303,22 @@ selfReferential: fail: {
 	}
 }
 
+// avoid infinite recursion
+issue2367: {
+	a: _
+	for x in [a] {a: x}
+}
+
 -- out/eval/stats --
-Leaks:  48
-Freed:  1268
-Reused: 1256
+Leaks:  50
+Freed:  1270
+Reused: 1260
 Allocs: 60
-Retain: 189
+Retain: 145
 
-Unifications: 828
-Conjuncts:    2512
-Disjuncts:    1437
+Unifications: 832
+Conjuncts:    2525
+Disjuncts:    1404
 -- out/eval --
 Errors:
 selfReferential.insertionError.A: field foo3 not allowed by earlier comprehension or reference cycle
@@ -710,6 +716,9 @@ Result:
       }
     }
   }
+  issue2367: (struct){
+    a: (_){ _ }
+  }
 }
 -- out/compile --
 --- in.cue
@@ -1194,4 +1203,12 @@ Result:
       if 〈0;b〉 {}
     }
   }
+  issue2367: {
+    a: _
+    for _, x in [
+      〈1;a〉,
+    ] {
+      a: 〈1;x〉
+    }
+  }
 }
diff --git a/cue/testdata/cycle/evaluate.txtar b/cue/testdata/cycle/evaluate.txtar
@@ -107,15 +107,15 @@ closeFail: {
 }
 
 -- out/eval/stats --
-Leaks:  66
-Freed:  95
-Reused: 91
-Allocs: 70
-Retain: 136
+Leaks:  57
+Freed:  90
+Reused: 86
+Allocs: 61
+Retain: 126
 
-Unifications: 149
-Conjuncts:    289
-Disjuncts:    171
+Unifications: 135
+Conjuncts:    269
+Disjuncts:    156
 -- out/eval --
 Errors:
 closeCycle.a: structural cycle
@@ -126,6 +126,9 @@ closeFail.x.b: field not allowed:
     ./in.cue:104:6
     ./in.cue:105:5
 letCycleFail.t1.a.c: structural cycle
+listAddCycle.a: structural cycle
+listAddCycle.b.0.0: structural cycle
+listAddCycle.b.0.1: structural cycle
 structCycle.a: structural cycle
 structCycle.b.d: structural cycle
 disjunctionCycle.a: cannot use 1 (type int) as list in argument 1 to and:
@@ -142,10 +145,8 @@ structCycle.c: structural cycle:
     ./in.cue:77:14
 embedCycle: structural cycle:
     ./in.cue:83:11
-listAddCycle.c.0.0: structural cycle:
-    ./in.cue:89:5
-listAddCycle.c.0.1: structural cycle:
-    ./in.cue:89:5
+listAddCycle.c: structural cycle:
+    ./in.cue:89:6
 listMulCycle.a: invalid operands 3 and [{a:{b:c}}] to '+' (type int and list):
     ./in.cue:95:5
     ./in.cue:95:9
@@ -303,44 +304,27 @@ Result:
   listAddCycle: (_|_){
     // [structural cycle]
     a: (_|_){
-      // [structural cycle]
-      0: (_|_){
-        // [structural cycle] listAddCycle.c.0.0: structural cycle:
-        //     ./in.cue:89:5
-      }
-      1: (_|_){
-        // [structural cycle] listAddCycle.c.0.0: structural cycle:
-        //     ./in.cue:89:5
-      }
+      // [structural cycle] listAddCycle.a: structural cycle
     }
     b: (_|_){
-      // [structural cycle]
-      0: (_|_){
-        // [structural cycle] listAddCycle.c.0.0: structural cycle:
-        //     ./in.cue:89:5
-      }
-      1: (_|_){
-        // [structural cycle] listAddCycle.c.0.0: structural cycle:
-        //     ./in.cue:89:5
-      }
-    }
-    c: (_|_){
       // [structural cycle]
       0: (_|_){
         // [structural cycle]
         0: (_|_){
-          // [structural cycle] listAddCycle.c.0.0: structural cycle:
-          //     ./in.cue:89:5
+          // [structural cycle] listAddCycle.b.0.0: structural cycle
         }
         1: (_|_){
-          // [structural cycle] listAddCycle.c.0.1: structural cycle:
-          //     ./in.cue:89:5
+          // [structural cycle] listAddCycle.b.0.1: structural cycle
         }
       }
       1: (_|_){
         // [structural cycle]
       }
     }
+    c: (_|_){
+      // [structural cycle] listAddCycle.c: structural cycle:
+      //     ./in.cue:89:6
+    }
   }
   listMulCycle: (_|_){
     // [eval]