internal/core/adt: clean up use of Vertex.state

This is to make it easier to see that this field
is used when it is non-nil.

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I2225ecc55a398b8b978ead8297a63376bca04a2a
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1218220
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Daniel Martí <[email protected]>

Author: mpvl

internal/core/adt/context.go

@@ -724,14 +724,12 @@ func (c *OpContext) evalStateCI(v Expr, state combinedFlags) (result Value, ci C
 		// TODO: is this indirect necessary?
 		// arc = arc.Indirect()
 
-		n := arc.state
 		if c.isDevVersion() {
-			n = arc.getState(c)
-			if n != nil {
+			if n := arc.getState(c); n != nil {
 				c.ci, _ = n.detectCycleV3(arc, nil, x, c.ci)
 			}
 		} else {
-			if n != nil {
+			if n := arc.state; n != nil {
 				c.ci, _ = n.markCycle(arc, nil, x, c.ci)
 			}
 		}
@@ -742,7 +740,7 @@ func (c *OpContext) evalStateCI(v Expr, state combinedFlags) (result Value, ci C
 
 		if c.isDevVersion() {
 			if s := arc.getState(c); s != nil {
-				defer n.retainProcess().releaseProcess()
+				defer s.retainProcess().releaseProcess()
 
 				origNeeds := state.conditions()
 				needs := origNeeds | arcTypeKnown
@@ -751,7 +749,7 @@ func (c *OpContext) evalStateCI(v Expr, state combinedFlags) (result Value, ci C
 				switch runMode {
 				case finalize:
 					arc.unify(c, needs, attemptOnly, true) // to set scalar
-					arc.state.freeze(needs)
+					s.freeze(needs)
 				case attemptOnly:
 					arc.unify(c, needs, attemptOnly, true) // to set scalar
 

internal/core/adt/cycle.go

@@ -684,7 +684,7 @@ func (n *nodeContext) detectCycleV3(arc *Vertex, env *Environment, x Resolver, c
 				//		c: a: int
 				//
 				// This is equivalent to a reference cycle.
-				if r.Depth == n.node.state.depth {
+				if r.Depth == n.depth {
 					return ci, true
 				}
 				ci.Refs = nil