internal/core/adt: inline structs in schema are not closed by default

If an inline struct is used within a schema, it
should only be treated as closed if it itself
references a schema. This also applies to
non-inline schema, but the algorithm handles
that correctly. But because inline structs are
created within a new context, and as a different
root, this is not passed correctly.

To deal with this, we turn off "FromDef" when
handling inline values, and then check if the
result itself is closed.

Fixes #3853

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

Author: mpvl

cue/testdata/definitions/typocheck.txtar

@@ -306,7 +306,7 @@ Allocs: 508
 Retain: 0
 
 Unifications: 403
-Conjuncts:    780
+Conjuncts:    781
 Disjuncts:    34
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
@@ -328,7 +328,7 @@ diff old new
 -Conjuncts:    1396
 -Disjuncts:    901
 +Unifications: 403
-+Conjuncts:    780
++Conjuncts:    781
 +Disjuncts:    34
 -- out/eval/stats --
 Leaks:  107
@@ -367,11 +367,6 @@ embed.simple.a.err: field not allowed:
     ./in.cue:4:5
 embed.withIndirect.err: field not allowed:
     ./in.cue:71:8
-embedInline.out.b.d: field not allowed:
-    ./inline.cue:8:4
-b.d: field not allowed:
-    ./inline.cue:23:12
-    ./inline.cue:20:4
 embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
     ./validators.cue:21:5
     ./validators.cue:21:12
@@ -636,42 +631,31 @@ Result:
       }
     }
   }
-  embedInline: (_|_){
-    // [eval]
+  embedInline: (struct){
     #Schema: (#struct){
       a: (string){ "hello" }
       b: (#struct){
         c: (string){ "foo" }
         d: (string){ "never printed" }
       }
     }
-    out: (_|_){
-      // [eval]
+    out: (#struct){
       a: (string){ "hello" }
-      b: (_|_){
-        // [eval]
+      b: (#struct){
         c: (string){ "foo" }
-        d: (_|_){
-          // [eval] embedInline.out.b.d: field not allowed:
-          //     ./inline.cue:8:4
-        }
+        d: (string){ "never printed" }
       }
     }
   }
-  issue3853: (_|_){
-    // [eval]
+  issue3853: (struct){
     #Schema: (#struct){
       a: (string){ "hello" }
       b: (#struct){
         c: (string){ "foo" }
         d: (string){ "never printed" }
       }
     }
-    out: (_|_){
-      // [eval] b.d: field not allowed:
-      //     ./inline.cue:23:12
-      //     ./inline.cue:20:4
-    }
+    out: (string){ "hello" }
   }
   issue3832: (#struct){
     _person: (struct){
@@ -1054,7 +1038,7 @@ Result:
 diff old new
 --- old
 +++ new
-@@ -1,81 +1,34 @@
+@@ -1,81 +1,29 @@
  Errors:
  and.transitive.out.ok: field not allowed:
 -    ./in.cue:34:5
@@ -1133,15 +1117,10 @@ diff old new
 -    ./validators.cue:12:6
 -    ./validators.cue:17:5
 -    ./validators.cue:18:5
-+embedInline.out.b.d: field not allowed:
-+    ./inline.cue:8:4
-+b.d: field not allowed:
-+    ./inline.cue:23:12
-+    ./inline.cue:20:4
  embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
      ./validators.cue:21:5
      ./validators.cue:21:12
-@@ -94,14 +47,11 @@
+@@ -94,14 +42,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1157,7 +1136,7 @@ diff old new
        }
      }
      andInStruct: (_|_){
-@@ -111,14 +61,11 @@
+@@ -111,14 +56,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1173,7 +1152,7 @@ diff old new
        }
      }
      embedDefWithEmbedding: (_|_){
-@@ -128,15 +75,11 @@
+@@ -128,15 +70,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1190,7 +1169,7 @@ diff old new
        }
      }
      embedComprehension: (_|_){
-@@ -146,16 +89,11 @@
+@@ -146,16 +84,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1208,7 +1187,7 @@ diff old new
        }
      }
      fieldWithAnd: (_|_){
-@@ -166,9 +104,6 @@
+@@ -166,9 +99,6 @@
          // [eval]
          err: (_|_){
            // [eval] embed.fieldWithAnd.a.err: field not allowed:
@@ -1218,7 +1197,7 @@ diff old new
            //     ./in.cue:20:13
          }
        }
-@@ -179,20 +114,15 @@
+@@ -179,20 +109,15 @@
          a: (int){ int }
        }
        B: (struct){
@@ -1244,7 +1223,7 @@ diff old new
        }
      }
      andEmbed: (_|_){
-@@ -208,17 +138,11 @@
+@@ -208,17 +133,11 @@
        }
        d: (_|_){
          // [eval]
@@ -1263,7 +1242,7 @@ diff old new
        }
      }
      nonDef: (struct){
-@@ -227,12 +151,12 @@
+@@ -227,12 +146,12 @@
            a: (string){ string }
          }
          #Y: (#struct){
@@ -1280,7 +1259,7 @@ diff old new
          }
        }
      }
-@@ -242,12 +166,12 @@
+@@ -242,12 +161,12 @@
            Name: (string){ string }
          }
          #Step: (#struct){
@@ -1297,7 +1276,7 @@ diff old new
          }
          out: (#struct){
            Name: (string){ "foo" }
-@@ -257,21 +181,15 @@
+@@ -257,21 +176,15 @@
      }
      withIndirect: (_|_){
        // [eval]
@@ -1324,7 +1303,7 @@ diff old new
      }
      normalValidator: (_|_){
        // [eval]
-@@ -281,20 +199,17 @@
+@@ -281,20 +194,17 @@
        }
        x: (_|_){
          // [eval]
@@ -1348,7 +1327,7 @@ diff old new
          #X: (_){
            matchN(0, (#list){
            })
-@@ -301,17 +216,10 @@
+@@ -301,17 +211,10 @@
            a?: (int){ int }
            b?: (int){ int }
          }
@@ -1370,7 +1349,7 @@ diff old new
          }
        }
        t2: (_|_){
-@@ -330,10 +238,7 @@
+@@ -330,10 +233,7 @@
            // [eval]
            b: (_|_){
              // [eval] embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct):
@@ -1381,7 +1360,7 @@ diff old new
              //     ./validators.cue:24:8
              // embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
              //     ./validators.cue:21:5
-@@ -360,16 +265,11 @@
+@@ -360,16 +260,11 @@
        }
        out: (_|_){
          // [eval]
@@ -1399,7 +1378,7 @@ diff old new
        }
      }
      transitiveWithEmbed: (_|_){
-@@ -385,45 +285,50 @@
+@@ -385,17 +280,11 @@
        }
        out: (_|_){
          // [eval]
@@ -1414,78 +1393,11 @@ diff old new
 -          //     ./in.cue:45:7
            //     ./in.cue:46:3
          }
--      }
--    }
--  }
--  embedInline: (struct){
--    #Schema: (#struct){
--      a: (string){ "hello" }
--      b: (#struct){
--        c: (string){ "foo" }
--        d: (string){ "never printed" }
--      }
--    }
--    out: (#struct){
--      a: (string){ "hello" }
--      b: (#struct){
--        c: (string){ "foo" }
--        d: (string){ "never printed" }
--      }
--    }
--  }
--  issue3853: (struct){
--    #Schema: (#struct){
--      a: (string){ "hello" }
--      b: (#struct){
--        c: (string){ "foo" }
--        d: (string){ "never printed" }
--      }
--    }
--    out: (string){ "hello" }
 +        a: (string){ string }
-+      }
-+    }
-+  }
-+  embedInline: (_|_){
-+    // [eval]
-+    #Schema: (#struct){
-+      a: (string){ "hello" }
-+      b: (#struct){
-+        c: (string){ "foo" }
-+        d: (string){ "never printed" }
-+      }
-+    }
-+    out: (_|_){
-+      // [eval]
-+      a: (string){ "hello" }
-+      b: (_|_){
-+        // [eval]
-+        c: (string){ "foo" }
-+        d: (_|_){
-+          // [eval] embedInline.out.b.d: field not allowed:
-+          //     ./inline.cue:8:4
-+        }
-+      }
-+    }
-+  }
-+  issue3853: (_|_){
-+    // [eval]
-+    #Schema: (#struct){
-+      a: (string){ "hello" }
-+      b: (#struct){
-+        c: (string){ "foo" }
-+        d: (string){ "never printed" }
-+      }
-+    }
-+    out: (_|_){
-+      // [eval] b.d: field not allowed:
-+      //     ./inline.cue:23:12
-+      //     ./inline.cue:20:4
-+    }
+       }
+     }
    }
-   issue3832: (#struct){
-     _person: (struct){
-@@ -440,8 +345,8 @@
+@@ -440,8 +329,8 @@
              //     ./issue3832.cue:8:16
            }
            outFirstName: (_|_){
@@ -1496,7 +1408,7 @@ diff old new
            }
          }
        }
-@@ -451,35 +356,27 @@
+@@ -451,35 +340,27 @@
          }, (#struct){
            pass: (#struct){
              let self#1 = (_|_){
@@ -1542,7 +1454,7 @@ diff old new
        pass: (#struct){
          let self#1 = (#struct){
            firstName: (string){ "Sam" }
-@@ -486,18 +383,21 @@
+@@ -486,18 +367,21 @@
          }
          outFirstName: (string){ "Sam" }
        }
@@ -1576,7 +1488,7 @@ diff old new
    }
    issue3833: (struct){
      out: (#struct){
-@@ -573,12 +473,8 @@
+@@ -573,12 +457,8 @@
          globalField: (string){ string }
        }
        #Context: (#struct){
@@ -1591,7 +1503,7 @@ diff old new
        }
        out: (struct){
          ingress: (#struct){
-@@ -606,22 +502,22 @@
+@@ -606,22 +486,22 @@
            #Z: (#struct){
            }
            x: (#struct){
@@ -1630,7 +1542,7 @@ diff old new
              z: (int){ 1 }
            }
          }
-@@ -631,22 +527,22 @@
+@@ -631,22 +511,22 @@
            #Z: (#struct){
            }
            x: (#struct){
@@ -1669,7 +1581,7 @@ diff old new
              z: (int){ 1 }
            }
          }
-@@ -701,38 +597,11 @@
+@@ -701,38 +581,11 @@
      #Main: (#struct){
        namespace: (string){ string }
        output: (_|_){
@@ -1710,7 +1622,7 @@ diff old new
          let base#6 = (#struct){
            someMsg: (string){ string }
            obs: (#struct){ |(*(#struct){
-@@ -775,6 +644,19 @@
+@@ -775,6 +628,19 @@
              }
            }
          }
@@ -1730,7 +1642,7 @@ diff old new
        }
      }
      out: (#struct){
-@@ -804,17 +686,8 @@
+@@ -804,17 +670,8 @@
              //     ./validators.cue:32:17
              // disjunction.withErr.t1.out.b1.b2.b3: undefined field: mayExistLater:
              //     ./validators.cue:29:22