Ugly workaround for #2566 issue

cue-lang · Sep 11, 2023 · 4f21370 · 4f21370
1 parent e40ffb3
commit 4f21370
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/cue/testdata/eval/let_funcs.txtar b/cue/testdata/eval/let_funcs.txtar
@@ -47,15 +47,15 @@ foo: {
 }
 -- out/eval/stats --
 Leaks:  0
-Freed:  42
-Reused: 38
+Freed:  26
+Reused: 22
 Allocs: 4
 Retain: 0
 
-Unifications: 42
-Conjuncts:    90
-Disjuncts:    42
-Builtins:     9
+Unifications: 26
+Conjuncts:    42
+Disjuncts:    26
+Builtins:     1
 -- out/eval --
 (struct){
   #Foo: (#struct){
@@ -74,43 +74,27 @@ Builtins:     9
       foo: (bool){ false }
     }
     e1: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e2: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e3: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e4: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e5: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e6: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e7: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
     e8: (#struct){
-      #a: (string){ "hello" }
-      #b: (string){ "world" }
       foo: (bool){ false }
     }
   }

diff --git a/internal/core/adt/eval.go b/internal/core/adt/eval.go
@@ -1573,6 +1573,15 @@ func (n *nodeContext) evalExpr(v Conjunct, state vertexStatus) {
 		}
 		v.CloseInfo = ci
 
+		if _, ok := x.(*LetReference); ok {
+			if arc.status == finalized {
+				if b, ok := arc.BaseValue.(*Bottom); !ok || !b.IsIncomplete() {
+					n.addExprConjunct(MakeRootConjunct(nil, arc.ToDataAll(n.ctx)), arc.status)
+					return
+				}
+			}
+		}
+
 		n.addVertexConjuncts(v, arc, false)
 
 	case Evaluator: