internal/core/adt: finalize in lookup in more cases

We add some more cases where we finalize when
doing lookups. We really should always finalize,
but this introduces some bugs. We finalize here
to be able to detect that comparison against
bottom properly. This brings behavior more in
line with V2. Note that this is still not fully
correct behavior, as we should report an error
in these cases.

elimination/disjunctions.txtar:
Note the change in this file. V3 is arguably
more correct, as it correctly reports an
error, where V2 did not.

Fixes #3836
Fixes #3838

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

Author: mpvl

cue/testdata/cycle/compbottom2.txtar

@@ -340,21 +340,7 @@ Unifications: 220
 Conjuncts:    279
 Disjuncts:    302
 -- out/evalalpha --
-Errors:
-_test.assert.res: invalid operand [
-	if in.opt != _|_ {in.opt.foo},
-	0,
-] (found list, want list or struct):
-    ./issue3838.cue:5:9
-_test.assert: 2 errors in empty disjunction::
-    ./issue3838.cue:23:12
-_test.assert.invoke: field not allowed:
-    ./issue3838.cue:23:12
-    ./issue3838.cue:26:18
-
-Result:
-(_|_){
-  // [eval]
+(struct){
   self: (struct){
     fail: (struct){
       a: (_|_){
@@ -390,33 +376,23 @@ Result:
   }
   issue3836: (struct){
     hidden: (#list){
-      _Value: (struct){
+      _Value: (_|_){
+        // [incomplete] issue3836.hidden._Value.bar.type: cyclic reference to field type:
+        //     ./issue3836.cue:5:3
         foo?: (_){ _ }
         bar?: (struct){
         }
         out: (#list){
         }
       }
     }
-    exposed: (struct){
-      foo?: (_){ _ }
-      bar?: (struct){
-      }
-      out: (#list){
-      }
+    exposed: (_|_){
+      // [cycle] issue3836.exposed: circular dependency in evaluation of conditionals: (foo|bar) changed after evaluation:
+      //     ./issue3836.cue:15:6
     }
   }
-  issue3838: (_|_){
-    // [eval] _test.assert.res: invalid operand [
-    // 	if in.opt != _|_ {in.opt.foo},
-    // 	0,
-    // ] (found list, want list or struct):
-    //     ./issue3838.cue:5:9
-    // _test.assert: 2 errors in empty disjunction::
-    //     ./issue3838.cue:23:12
-    // _test.assert.invoke: field not allowed:
-    //     ./issue3838.cue:23:12
-    //     ./issue3838.cue:26:18
+  issue3838: (bool){
+    true
     #T: (#struct){
       subject: (#struct){
         in: (#struct){
@@ -640,23 +616,7 @@ Result:
 diff old new
 --- old
 +++ new
-@@ -1,15 +1,29 @@
--(struct){
-+Errors:
-+_test.assert.res: invalid operand [
-+	if in.opt != _|_ {in.opt.foo},
-+	0,
-+] (found list, want list or struct):
-+    ./issue3838.cue:5:9
-+_test.assert: 2 errors in empty disjunction::
-+    ./issue3838.cue:23:12
-+_test.assert.invoke: field not allowed:
-+    ./issue3838.cue:23:12
-+    ./issue3838.cue:26:18
-+
-+Result:
-+(_|_){
-+  // [eval]
+@@ -2,14 +2,14 @@
    self: (struct){
      fail: (struct){
        a: (_|_){
@@ -675,7 +635,7 @@ diff old new
          }
        }
        t2: (struct){
-@@ -21,8 +35,8 @@
+@@ -21,8 +21,8 @@
      }
      isNotConcrete: (struct){
        t1: (struct){
@@ -686,54 +646,26 @@ diff old new
          }
        }
        t2: (struct){
-@@ -34,19 +48,33 @@
-   }
+@@ -35,10 +35,14 @@
    issue3836: (struct){
      hidden: (#list){
--      _Value: (_|_){
+       _Value: (_|_){
 -        // [cycle] issue3836.hidden._Value: circular dependency in evaluation of conditionals: (foo|bar) changed after evaluation:
 -        //     ./issue3836.cue:5:7
 -      }
 -      0: (string){ "bar is set" }
--    }
--    exposed: (_|_){
--      // [cycle] issue3836.exposed: circular dependency in evaluation of conditionals: (foo|bar) changed after evaluation:
--      //     ./issue3836.cue:15:6
--    }
--  }
--  issue3838: (bool){
--    true
-+      _Value: (struct){
++        // [incomplete] issue3836.hidden._Value.bar.type: cyclic reference to field type:
++        //     ./issue3836.cue:5:3
 +        foo?: (_){ _ }
 +        bar?: (struct){
 +        }
 +        out: (#list){
 +        }
 +      }
-+    }
-+    exposed: (struct){
-+      foo?: (_){ _ }
-+      bar?: (struct){
-+      }
-+      out: (#list){
-+      }
-+    }
-+  }
-+  issue3838: (_|_){
-+    // [eval] _test.assert.res: invalid operand [
-+    // 	if in.opt != _|_ {in.opt.foo},
-+    // 	0,
-+    // ] (found list, want list or struct):
-+    //     ./issue3838.cue:5:9
-+    // _test.assert: 2 errors in empty disjunction::
-+    //     ./issue3838.cue:23:12
-+    // _test.assert.invoke: field not allowed:
-+    //     ./issue3838.cue:23:12
-+    //     ./issue3838.cue:26:18
-     #T: (#struct){
-       subject: (#struct){
-         in: (#struct){
-@@ -83,12 +111,12 @@
+     }
+     exposed: (_|_){
+       // [cycle] issue3836.exposed: circular dependency in evaluation of conditionals: (foo|bar) changed after evaluation:
+@@ -83,12 +87,12 @@
      }
      mutualCycleFail: (struct){
        b: (_|_){
@@ -752,7 +684,7 @@ diff old new
        }
      }
      brokenCycleSuccess: (struct){
-@@ -229,17 +257,19 @@
+@@ -229,17 +233,19 @@
          ret?: (_){ _ }
        }
        expr: (#struct){
@@ -777,7 +709,7 @@ diff old new
      }
      brokenCycleSuccess: (struct){
        #E: (#struct){
-@@ -248,8 +278,12 @@
+@@ -248,8 +254,12 @@
        }
      }
      doubleAddfail: (_|_){

cue/testdata/cycle/inline.txtar

@@ -401,8 +401,8 @@ Reused: 0
 Allocs: 332
 Retain: 0
 
-Unifications: 252
-Conjuncts:    635
+Unifications: 253
+Conjuncts:    639
 Disjuncts:    0
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -423,8 +423,8 @@ diff old new
 -Unifications: 539
 -Conjuncts:    1663
 -Disjuncts:    943
-+Unifications: 252
-+Conjuncts:    635
++Unifications: 253
++Conjuncts:    639
 +Disjuncts:    0
 -- out/eval/stats --
 Leaks:  286