Merge pull request #2004 from andrew-johnson-4/start-enabling-gc-dfsdssl

Start enabling gc dfsdssl

Author: andrew4328

BOOTSTRAP/cli.c

@@ -8,7 +8,7 @@ LSTSFLAGS = MALLOC_CHECK_=3
 # recommendation: ulimit -s unlimited
 
 dev: install-production
-	lm --v23 tests/promises/typechecking/nil-never-variables.lsts
+	lm tests/promises/typechecking/must-use-reject-2.lsts
 	$(CC) $(CFLAGS) tmp.c
 	./a.out
 

Makefile

@@ -371,10 +371,6 @@ let lsts-parse-type-conjugate(tokens: List<Token>): Tuple<Type,List<Token>> = (
          head(args);
       } else if base==c"CompatOwnedData" and args.length==1 {
          t1(c"OwnedData",head(args));
-      } else if base==c"CompatMustRetain" and args.length==0 {
-         t0(c"MustRetain");
-      } else if base==c"CompatMustRelease" and args.length==0 {
-         t0(c"MustRelease");
       } else TGround ( base, close(args) );
    };
    while lsts-parse-head(tokens) == c"[" or lsts-parse-head(tokens)==c"?" {
@@ -936,12 +932,16 @@ let lsts-parse-typedef(tokens: List<Token>): (AST, List<Token>) = (
       if lsts-parse-head(tokens)==c"implies" {
          lsts-parse-expect(c"implies", tokens); tokens = tail(tokens);
          (let i, tokens) = lsts-parse-type(tokens);
-         if not(config-v3) and (i.is-t(c"MustRetain",0) or i.is-t(c"MustRelease",0)) then ()
+         if i.is-t(c"CompatMustRelease",0) then infers = infers.push(t0(c"MustRelease"));
+         else if config-v23 and i.is-t(c"MustRelease",0) then ()
+         else if config-v23 and i.is-t(c"MustRetain",0) then ()
          else infers = infers.push(i);
          while lsts-parse-head(tokens)==c"," {
             lsts-parse-expect(c",", tokens); tokens = tail(tokens);
             (i, tokens) = lsts-parse-type(tokens);
-            if not(config-v3) and (i.is-t(c"MustRetain",0) or i.is-t(c"MustRelease",0)) then ()
+            if i.is-t(c"CompatMustRelease",0) then infers = infers.push(t0(c"MustRelease"));
+            else if config-v23 and i.is-t(c"MustRelease",0) then ()
+            else if config-v23 and i.is-t(c"MustRetain",0) then ()
             else infers = infers.push(i);
          }
       };

PLUGINS/FRONTEND/LSTS/lsts-parse.lsts

@@ -387,14 +387,14 @@ let std-infer-expr(tctx: Maybe<TypeContext>, term: AST, is-scoped: Bool, used: I
       );
       _ => fail("Unexpected Term in std-infer-expr at \{term.location}\n\{term}\n");
    };
-   if used.is-unused and typeof-term(term).slot(c"Phi::State",1).is-linear-live {
+   if used.is-unused and typeof-term(term).is-t(c"MustUse",0) then exit-error("MustUse term value must be used", term);
+   else if used.is-unused and typeof-term(term).slot(c"Phi::State",1).is-linear-live {
       if typeof-term(term).slot(c"Phi::State",1).l1.is-t(c"MustRelease::ToRelease",1) {
          (tctx, term) = wrap-call(tctx, c".release", term);
       } else if typeof-term(term).is-t(c"MustRetain",0) {
          tctx = tctx.phi-move(typeof-term(term),term);
       }
    }};
-   if used.is-unused and typeof-term(term).is-t(c"MustUse",0) then exit-error("MustUse term value must be used", term);
    (tctx, term);
 );
 

SRC/typecheck-infer-expr.lsts

@@ -0,0 +1,12 @@
+
+import lib/core/bedrock.lsts;
+
+let f() = (
+   let x = ("a", "b");
+   let y = [] : List<String>;
+   if non-zero(x.first) then g(y, "c");
+);
+
+let g(x: List<String>, y: String) = ();
+
+

tests/promises/typechecking/linear-in-if-1.lsts

@@ -30,11 +30,11 @@ fn compile_bootstrap() {
    };
 }
 
-fn run_bootstrap(target: &str, leave_tmp: bool, is_v23: bool) -> String {
+fn run_bootstrap(target: &str, leave_tmp: bool, is_v3: bool) -> String {
    if !leave_tmp { rm("tmp.c"); };
    rm("a.out");
 
-   let exit = if is_v23 {
+   let exit = if is_v3 && target.contains("lm-") {
       Command::new("./bootstrap.exe")
               .stdout(std::process::Stdio::piped())
               .stderr(std::process::Stdio::piped())
@@ -46,6 +46,17 @@ fn run_bootstrap(target: &str, leave_tmp: bool, is_v23: bool) -> String {
               .expect("failed to execute process")
               .wait_with_output()
               .expect("failed to wait for process")
+   } else if is_v3 {
+      Command::new("./bootstrap.exe")
+              .stdout(std::process::Stdio::piped())
+              .stderr(std::process::Stdio::piped())
+              .arg("-o")
+              .arg("tmp.c")
+              .arg(target)
+              .spawn()
+              .expect("failed to execute process")
+              .wait_with_output()
+              .expect("failed to wait for process")
    } else {
       Command::new("./bootstrap.exe")
               .stdout(std::process::Stdio::piped())