internal/core/adt: closedness fix related to comprehension

This consists of two fixes: 1. use allows instead of matchPattern to check for fields that are not covered by patterns. 2. updates the arcTypes _after_ calling allows, as allows needs the old values. Fixes #3486 Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: I85c04f814bf0cb67a2a57dc10205ad2a309cb61f Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1202421 Unity-Result: CUE porcuepine <[email protected]> Reviewed-by: Daniel Martí <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
cue-lang · Oct 9, 2024 · cd2107a · cd2107a
1 parent 6916b5b
commit cd2107a
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 13 deletions.
diff --git a/cue/testdata/comprehensions/closed.txtar b/cue/testdata/comprehensions/closed.txtar
@@ -99,16 +99,27 @@ issue3483: {
 		}
 	}
 }
+issue3486: {
+	#schema: {}
+
+	if true {
+		out: {
+			#schema
+			// This field should be allowed as #schema is embedded.
+			extra: "foo"
+		}
+	}
+}
 -- out/eval/stats --
 Leaks:  2
-Freed:  76
-Reused: 70
+Freed:  80
+Reused: 74
 Allocs: 8
 Retain: 3
 
-Unifications: 64
-Conjuncts:    112
-Disjuncts:    77
+Unifications: 68
+Conjuncts:    118
+Disjuncts:    81
 -- out/evalalpha --
 Errors:
 noEraseDefinition.a.0.b: field not allowed:
@@ -229,12 +240,19 @@ Result:
       }
     }
   }
+  issue3486: (struct){
+    #schema: (#struct){
+    }
+    out: (#struct){
+      extra: (string){ "foo" }
+    }
+  }
 }
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
 --- old
 +++ new
-@@ -1,15 +1,10 @@
+@@ -1,20 +1,10 @@
  Errors:
 +noEraseDefinition.a.0.b: field not allowed:
 +    ./in.cue:55:17
@@ -246,14 +264,19 @@ diff old new
      ./in.cue:28:4
 -    ./in.cue:32:8
      ./in.cue:32:14
+-issue3486.out.extra: field not allowed:
+-    ./v3issues.cue:10:11
+-    ./v3issues.cue:12:2
+-    ./v3issues.cue:14:4
+-    ./v3issues.cue:16:4
 -noEraseDefinition.a.0.b: field not allowed:
 -    ./in.cue:54:17
 -    ./in.cue:55:7
 -    ./in.cue:55:17
 
  Result:
  (_|_){
-@@ -45,11 +40,8 @@
+@@ -50,11 +40,8 @@
        // [eval]
        d: (_|_){
          // [eval] disallowed.vErr.d: field not allowed:
@@ -266,7 +289,7 @@ diff old new
          //     ./in.cue:32:14
        }
      }
-@@ -78,13 +70,11 @@
+@@ -83,13 +70,11 @@
        // [eval]
        0: (_|_){
          // [eval]
@@ -281,7 +304,7 @@ diff old new
        }
      }
    }
-@@ -109,13 +99,11 @@
+@@ -114,13 +99,11 @@
        c: (_){ _ }
      }
      out: (#struct){
@@ -297,6 +320,29 @@ diff old new
        }
      }
    }
+@@ -134,19 +117,11 @@
+       }
+     }
+   }
+-  issue3486: (_|_){
+-    // [eval]
++  issue3486: (struct){
+     #schema: (#struct){
+     }
+-    out: (_|_){
+-      // [eval]
+-      extra: (_|_){
+-        // [eval] issue3486.out.extra: field not allowed:
+-        //     ./v3issues.cue:10:11
+-        //     ./v3issues.cue:12:2
+-        //     ./v3issues.cue:14:4
+-        //     ./v3issues.cue:16:4
+-      }
++    out: (#struct){
++      extra: (string){ "foo" }
+     }
+   }
+ }
 -- diff/todo/p3 --
 Missing error positions.
 -- diff/explanation --
@@ -310,6 +356,11 @@ disallowed.vErr.d: field not allowed:
     ./in.cue:28:4
     ./in.cue:32:8
     ./in.cue:32:14
+issue3486.out.extra: field not allowed:
+    ./v3issues.cue:10:11
+    ./v3issues.cue:12:2
+    ./v3issues.cue:14:4
+    ./v3issues.cue:16:4
 noEraseDefinition.a.0.b: field not allowed:
     ./in.cue:54:17
     ./in.cue:55:7
@@ -433,6 +484,21 @@ Result:
       }
     }
   }
+  issue3486: (_|_){
+    // [eval]
+    #schema: (#struct){
+    }
+    out: (_|_){
+      // [eval]
+      extra: (_|_){
+        // [eval] issue3486.out.extra: field not allowed:
+        //     ./v3issues.cue:10:11
+        //     ./v3issues.cue:12:2
+        //     ./v3issues.cue:14:4
+        //     ./v3issues.cue:16:4
+      }
+    }
+  }
 }
 -- out/compile --
 --- in.cue
@@ -554,4 +620,13 @@ Result:
       })
     }
   }
+  issue3486: {
+    #schema: {}
+    if true {
+      out: {
+        〈2;#schema〉
+        extra: "foo"
+      }
+    }
+  }
 }
diff --git a/internal/core/adt/comprehension.go b/internal/core/adt/comprehension.go
@@ -478,14 +478,15 @@ func (n *nodeContext) processComprehensionInner(d *envYield, state vertexStatus)
 		// because the parent referrer will reach a zero count before this
 		// node will reach a zero count, we need to propagate the arcType.
 		for arc, p := c.arcCC, c.cc; p != nil; arc, p = arc.parent, p.parent {
+
+			t := arc.arcType
+			if p.isClosed && t >= ArcPending && !p.allows(ctx, f, arc) {
+				ctx.notAllowedError(p.src, arc.src)
+			}
 			// TODO: remove this line once we use the arcType of the
 			// closeContext in notAllowedError.
 			arc.src.updateArcType(c.arcType)
-			t := arc.arcType
 			arc.updateArcType(c.arcType)
-			if p.isClosed && t >= ArcPending && !matchPattern(ctx, p.Expr, f) {
-				ctx.notAllowedError(p.src, arc.src)
-			}
 		}
 		v.updateArcType(c.arcType)
 		if v.ArcType == ArcNotPresent {

diff --git a/internal/core/adt/constraints.go b/internal/core/adt/constraints.go
@@ -109,6 +109,8 @@ func (n *nodeContext) insertConstraint(pattern Value, c Conjunct) bool {
 
 // matchPattern reports whether f matches pattern. The result reflects
 // whether unification of pattern with f converted to a CUE value succeeds.
+// The caller should check separately whether f matches any other arcs
+// that are not covered by pattern.
 func matchPattern(ctx *OpContext, pattern Value, f Feature) bool {
 	if pattern == nil || !f.IsRegular() {
 		return false