internal/core/adt: reduce counter issues

Disjuncts holes and their associated close
contexts will only reach a zero conjunctCount
after all disjuncts were processed. Intermediate
results will not pass the counter test.

As individual disjuncts will have been finalized
and checked anyway, we can just drop the
checking of such nodes.

We also do not have to check a node if it is
shared.

Issue #3635

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I0a769d08fd954538efa5453a9e12cbe62d354b0b
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1207170
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Matthew Sackman <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: mpvl

internal/core/adt/eval_test.go

@@ -77,23 +77,20 @@ var needFix = map[string]string{
 // TODO: These counters should all go to zero.
 var skipDebugDepErrors = map[string]int{
 	"benchmarks/issue1684":     16,
-	"benchmarks/disjunctelim":  1,
 	"builtins/default":         1,
 	"compile/scope":            1,
 	"comprehensions/pushdown":  2,
 	"cycle/comprehension":      2,
 	"cycle/disjunction":        4,
 	"cycle/evaluate":           1,
-	"cycle/structural":         18,
-	"disjunctions/edge":        1,
-	"disjunctions/errors":      4,
+	"cycle/structural":         17,
+	"disjunctions/errors":      3,
 	"disjunctions/elimination": 15,
-	"disjunctions/embed":       12,
+	"disjunctions/embed":       6,
 	"disjunctions/nested":      1,
-	"eval/conjuncts":           3,
 	"eval/disjunctions":        3,
-	"eval/notify":              18,
-	"fulleval/054_issue312":    2,
+	"eval/notify":              17,
+	"fulleval/054_issue312":    1,
 	"scalars/embed":            2,
 }
 

internal/core/adt/unify.go

@@ -405,7 +405,18 @@ func (v *Vertex) unify(c *OpContext, needs condition, mode runMode) bool {
 		defer n.unmarkOptional(n.markOptional())
 
 		if DebugDeps {
-			RecordDebugGraph(n.ctx, n.node, "Finalize")
+			switch n.node.BaseValue.(type) {
+			case *Disjunction:
+				// If we have a disjunction, its individual disjuncts will
+				// already have been checked. The node itself will likely have
+				// spurious results, as it will contain unclosed holes.
+
+			case *Vertex:
+				// No need to check dereferenced results.
+
+			default:
+				RecordDebugGraph(n.ctx, n.node, "Finalize")
+			}
 		}
 	}