GC OK

Author: andrew4328

SRC/typecheck-infer-expr.lsts

@@ -143,6 +143,10 @@ let std-infer-expr(tctx: Maybe<TypeContext>, term: AST, is-scoped: Bool, used: I
                (let tctx-cond, let new-cond) = std-infer-expr(tctx, cond, false, Tail(), ta);
                (tctx-t, let new-t) = std-infer-expr(tctx-cond, t, false, Tail(), ta);
                (tctx-f, let new-f) = std-infer-expr(tctx, f, false, Tail(), ta);
+               if typeof-term(new-t).is-t(c"Nil",0) and typeof-term(new-f).is-linear-live
+               then (tctx-f, new-f) = wrap-call(tctx-f, c".release", new-f);
+               if typeof-term(new-f).is-t(c"Nil",0) and typeof-term(new-t).is-linear-live
+               then (tctx-t, new-t) = wrap-call(tctx-t, c".release", new-t);
                if not(is(cond,new-cond)) or not(is(t,new-t)) or not(is(f,new-f))
                then { cond = new-cond; t = new-t; f = new-f; term = mk-app(mk-app(mk-app(ifv,new-cond),new-t),new-f) };
                tctx = tctx.with-pctx( phi-merge(tctx,tctx-t.get-or(mk-tctx()).pctx,tctx-f.get-or(mk-tctx()).pctx,term) );
@@ -151,6 +155,10 @@ let std-infer-expr(tctx: Maybe<TypeContext>, term: AST, is-scoped: Bool, used: I
                (tctx-t, let new-t) = std-infer-expr(tctx, t, false, Tail(), ta);
                (tctx-f, let new-f) = std-infer-expr(tctx, f, false, Tail(), ta);
                (tctx-f, new-f) = release-locals(tctx, tctx-f, new-f, hint, false);
+               if typeof-term(new-t).is-t(c"Nil",0) and typeof-term(new-f).is-linear-live
+               then (tctx-f, new-f) = wrap-call(tctx-f, c".release", new-f);
+               if typeof-term(new-f).is-t(c"Nil",0) and typeof-term(new-t).is-linear-live
+               then (tctx-t, new-t) = wrap-call(tctx-t, c".release", new-t);
                tctx = tctx-t;
                if not(is(cond,new-cond)) or not(is(t,new-t)) or not(is(f,new-f))
                then { cond = new-cond; t = new-t; f = new-f; term = mk-app(mk-app(mk-app(ifv,new-cond),new-t),new-f) };
@@ -173,8 +181,6 @@ let std-infer-expr(tctx: Maybe<TypeContext>, term: AST, is-scoped: Bool, used: I
             };
             if non-zero(term-phi-id) and term-phi-id != t-phi-id then tctx = tctx.phi-move(typeof-term(t), t);
             if non-zero(term-phi-id) and term-phi-id != f-phi-id then tctx = tctx.phi-move(typeof-term(f), f);
-            if (typeof-term(term).is-t(c"Nil",0) or typeof-term(term).is-t(c"Never",0)) and non-zero(t-phi-id) then tctx = tctx.phi-move(typeof-term(t), t);
-            if (typeof-term(term).is-t(c"Nil",0) or typeof-term(term).is-t(c"Never",0)) and non-zero(f-phi-id) then tctx = tctx.phi-move(typeof-term(f), f);
          }
       );
       ASTEOF{} => tctx = tctx.ascript(term, t0(c"Nil"));

tests/promises/typechecking/misc-linear-error-1.lsts

@@ -4,3 +4,13 @@ import lib/core/bedrock.lsts;
 let f(): Nil = (
    if true then "";
 );
+
+let g(): Nil = (
+   if false then () else "";
+);
+
+f();
+assert( safe-alloc-block-count-monotonic == 0 );
+
+g();
+assert( safe-alloc-block-count-monotonic == 0 );