internal/core/adt: split updateCyclicStatus based on version

This makes it easier to track the code from which this
function is called for a specific version of the evaluator.

Issue #2850

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

Author: mpvl

internal/core/adt/conjunct.go

@@ -181,7 +181,7 @@ func (n *nodeContext) scheduleConjunct(c Conjunct, id CloseInfo) {
 		n.unshare()
 
 		// At this point we known we have at least an empty list.
-		n.updateCyclicStatus(id)
+		n.updateCyclicStatusV3(id)
 
 		env := &Environment{
 			Up:     env,
@@ -234,7 +234,7 @@ func (n *nodeContext) scheduleConjunct(c Conjunct, id CloseInfo) {
 func (n *nodeContext) scheduleStruct(env *Environment,
 	s *StructLit,
 	ci CloseInfo) {
-	n.updateCyclicStatus(ci)
+	n.updateCyclicStatusV3(ci)
 
 	// NOTE: This is a crucial point in the code:
 	// Unification dereferencing happens here. The child nodes are set to
@@ -537,7 +537,7 @@ func (n *nodeContext) addNotify2(v *Vertex, c CloseInfo) []receiver {
 // Literal conjuncts
 
 func (n *nodeContext) insertValueConjunct(env *Environment, v Value, id CloseInfo) {
-	n.updateCyclicStatus(id)
+	n.updateCyclicStatusV3(id)
 
 	ctx := n.ctx
 
@@ -571,7 +571,7 @@ func (n *nodeContext) insertValueConjunct(env *Environment, v Value, id CloseInf
 			panic(fmt.Sprintf("invalid type %T", x.BaseValue))
 
 		case *ListMarker:
-			n.updateCyclicStatus(id)
+			n.updateCyclicStatusV3(id)
 
 			// TODO: arguably we know now that the type _must_ be a list.
 			n.scheduleTask(handleListVertex, env, x, id)

internal/core/adt/cycle.go

@@ -575,20 +575,30 @@ func getNonCyclicCount(c Conjunct) int {
 	}
 }
 
+// updateCyclicStatusV3 looks for proof of non-cyclic conjuncts to override
+// a structural cycle.
+func (n *nodeContext) updateCyclicStatusV3(c CloseInfo) {
+	if !c.IsCyclic {
+		n.hasNonCycle = true
+		for _, c := range n.cyclicConjuncts {
+			ci := c.c.CloseInfo
+			ci.cc = n.node.rootCloseContext(n.ctx)
+			n.scheduleVertexConjuncts(c.c, c.arc, ci)
+			n.node.cc.decDependent(n.ctx, DEFER, nil)
+		}
+		n.cyclicConjuncts = n.cyclicConjuncts[:0]
+	}
+}
+
 // updateCyclicStatus looks for proof of non-cyclic conjuncts to override
 // a structural cycle.
 func (n *nodeContext) updateCyclicStatus(c CloseInfo) {
+	unreachableForDev(n.ctx)
+
 	if !c.IsCyclic {
 		n.hasNonCycle = true
 		for _, c := range n.cyclicConjuncts {
-			if n.ctx.isDevVersion() {
-				ci := c.c.CloseInfo
-				ci.cc = n.node.rootCloseContext(n.ctx)
-				n.scheduleVertexConjuncts(c.c, c.arc, ci)
-				n.node.cc.decDependent(n.ctx, DEFER, nil)
-			} else {
-				n.addVertexConjuncts(c.c, c.arc, false)
-			}
+			n.addVertexConjuncts(c.c, c.arc, false)
 		}
 		n.cyclicConjuncts = n.cyclicConjuncts[:0]
 	}
@@ -611,15 +621,14 @@ func assertStructuralCycle(n *nodeContext) bool {
 }
 
 func (n *nodeContext) reportCycleError() {
-	n.setBaseValue(CombineErrors(nil,
-		n.node.Value(),
-		&Bottom{
-			Code:  StructuralCycleError,
-			Err:   n.ctx.Newf("structural cycle"),
-			Value: n.node.Value(),
-			Node:  n.node,
-			// TODO: probably, this should have the referenced arc.
-		}))
+	b := &Bottom{
+		Code:  StructuralCycleError,
+		Err:   n.ctx.Newf("structural cycle"),
+		Value: n.node.Value(),
+		Node:  n.node,
+		// TODO: probably, this should have the referenced arc.
+	}
+	n.setBaseValue(CombineErrors(nil, n.node.Value(), b))
 	n.node.Arcs = nil
 }
 

internal/core/adt/tasks.go

@@ -201,7 +201,7 @@ func processListLit(c *OpContext, t *task, mode runMode) {
 
 	l := t.x.(*ListLit)
 
-	n.updateCyclicStatus(t.id)
+	n.updateCyclicStatusV3(t.id)
 
 	var ellipsis Node