Merge pull request #2029 from andrew4328/maybe-gc-enabled-fdsklsl

All tests green.

Full test suite takes 9.5 minutes to run with GC enabled.

Author: andrew4328

BOOTSTRAP/cli.c

@@ -8,12 +8,14 @@ LSTSFLAGS = MALLOC_CHECK_=3
 # recommendation: ulimit -s unlimited
 
 dev: install-production
-	#lm --showalloc SRC/unit-tctx-core.lsts > out.txt
-	#lm --showalloc SRC/unit-prop-core.lsts > out.txt
-	#lm --showalloc SRC/unit-ascript-core.lsts > out.txt
-	#lm --showalloc SRC/index.lsts > out.txt
-	lm tests/promises/typechecking/misc-linear-error-1.lsts > out.txt
-	gcc tmp.c;
+	lm tests/promises/vector/constructor.lsts
+	#time lm --showalloc SRC/unit-type-core.lsts > out.txt
+	#time lm --showalloc SRC/unit-tctx-core.lsts > out.txt
+	#time lm --showalloc SRC/unit-prop-core.lsts > out.txt
+	#time lm --showalloc SRC/unit-ascript-core.lsts > out.txt
+	#time lm --showalloc SRC/index.lsts > out.txt
+	#time lm --showalloc SRC/dev-index.lsts > out.txt
+	gcc tmp.c
 	./a.out
 
 build: compile-production
@@ -28,8 +30,15 @@ build: compile-production
 deploy: build smoke-test
 deploy-lite: build smoke-test-lite
 
-valgrind: install-bootstrap
-	valgrind --tool=callgrind lm --v2 SRC/index.lsts
+gprofng: install-production
+	gprofng collect app lm SRC/dev-index.lsts
+
+gprofng-view:
+	gprofng display text -functions test.1.er > gprofng.view
+	nano gprofng.view
+
+valgrind: install-production
+	valgrind --tool=callgrind lm SRC/dev-index.lsts
 
 valgrind-view:
 	callgrind_annotate callgrind.out.18778
@@ -60,17 +69,21 @@ compile-production: compile-bootstrap
 
 install-production: compile-production
 ifeq ($(shell test -w /usr/local/bin; echo $$?), 0)
+	cp production /usr/local/bin/lm-production
 	mv production /usr/local/bin/lm
 else
 	mkdir -p $${HOME}/.local/bin
+	cp production $${HOME}/.local/bin/lm-production
 	mv production $${HOME}/.local/bin/lm
 endif
 
 install-bootstrap: compile-bootstrap
 ifeq ($(shell test -w /usr/local/bin; echo $$?), 0)
+	cp bootstrap.exe /usr/local/bin/lm-bootstrap
 	mv bootstrap.exe /usr/local/bin/lm
 else
 	mkdir -p $${HOME}/.local/bin
+	cp bootstrap.exe $${HOME}/.local/bin/lm-bootstrap
 	mv bootstrap.exe $${HOME}/.local/bin/lm
 endif
 

Makefile

@@ -10,7 +10,7 @@ let .ascript(tctx: TypeContext?, t: AST, tt: Type): TypeContext? = (
                exit-error("Type Ascription Inequality\n\{typeof-term-normal(t)} does not imply \{norm-tt}", t);
             }
          };
-         if tt.slot(c"Phi::Id",1).l1.simple-tag != prev-tt.slot(c"Phi::Id",1).l1.simple-tag {
+         if tt.slot(c"Phi::Id",1).l1.simple-id != prev-tt.slot(c"Phi::Id",1).l1.simple-id {
             tctx = tctx.phi-move(prev-tt, t);
          }
       };
@@ -22,5 +22,11 @@ let .ascript(tctx: TypeContext?, t: AST, tt: Type): TypeContext? = (
 let ascript-force(t: AST, tt: Type): Nil = (
    add-concrete-type-instance(tt, t);
    ascript-natural(t, tt);
+
+   # these initializations are necessary to prevent stale phi types
+   # I don't remember why that is, but just try removing them and debug from there
+   type-index-normal = type-index-normal.bind(t, ta);
+   type-index-denormal = type-index-denormal.bind(t, ta);
+
    types-have-changed = true;
 );

SRC/ascript-ascript-integrated.lsts

@@ -2,7 +2,7 @@
 let .resurrect(tctx: TypeContext?, tt: Type, t: AST): (TypeContext?, Type) = (
    # TODO: fix tt2, tt3 workaround which was for linear variable bug
    # NOTE: make sure to create a promise test covering this phi/linear bug
-   let phi-id = tt.slot(c"Phi::Id",1).l1.simple-tag;
+   let phi-id = tt.slot(c"Phi::Id",1).l1.simple-id;
    if non-zero(phi-id) {
       let tt2 = tctx.with-phi(tt, t);
       let phi-state = tt2.slot(c"Phi::State",1).l1;

SRC/ascript-ascript-normal.lsts

@@ -1,14 +1,10 @@
 
 import SRC/unit-util.lsts;
-import SRC/dev-unit-type-core.lsts;
-import SRC/dev-unit-ast-core.lsts;
-import SRC/dev-unit-tctx-core.lsts;
-import SRC/dev-unit-prop-core.lsts;
-import SRC/dev-unit-ascript-core.lsts;
-import SRC/dev-unit-typecheck-core.lsts;
-import SRC/dev-unit-backend-core.lsts;
+import SRC/unit-type-core.lsts;
+import SRC/unit-ast-core.lsts;
+import SRC/unit-tctx-core.lsts;
+import SRC/unit-prop-core.lsts;
+import SRC/unit-ascript-core.lsts;
+import SRC/unit-typecheck-core.lsts;
+import SRC/unit-backend-core.lsts;
 import SRC/unit-main-core.lsts;
-
-import PLUGINS/FRONTEND/LSTS/dev-index.lsts;
-import PLUGINS/BACKEND/C/dev-index.lsts;
-import PLUGINS/FRONTEND/C/index.lsts;

SRC/ascript-ascript.lsts

@@ -6,5 +6,5 @@ import SRC/ascript-type-index.lsts;
 import SRC/dev-ascript-concrete-index.lsts;
 import SRC/ascript-datatype-index.lsts;
 import SRC/ascript-with-only-datatype.lsts;
-import SRC/ascript-ascript-integrated.lsts;
+import SRC/ascript-ascript.lsts;
 import SRC/ascript-tctx-resurrect.lsts;

SRC/ascript-tctx-resurrect.lsts

@@ -1,6 +1,6 @@
 
 let .phi-override(tctx: TypeContext?, dst: Type, src: Type, blame: AST): TypeContext? = (
-   let dst-id = dst.slot(c"Phi::Id",1).l1.simple-tag;
+   let dst-id = dst.slot(c"Phi::Id",1).l1.simple-id;
    let src-tt = src.slot(c"Phi::State",1).l1;
    if non-zero(dst-id) and non-zero(src-tt) {
       tctx = tctx.bind-phi(dst-id, src-tt, blame, dst.is-t(c"GlobalVariable",0));

SRC/dev-index.lsts

@@ -47,22 +47,23 @@ let .least-upper-bound(tctx: TypeContext?, left: Type, right: Type, blame: AST):
             if ps.is-some then rt = ts(ltag,ps.get-or-panic);
          }
       );
+      Tuple{ first:TId{lid=id}, second:TId{rid=id} } => if lid==rid then rt = left;
       Tuple{ first:TAny{}, second:TAny{} } => ();
       _ => ();
    };
 
    if non-zero(rt) and left.is-t(c"Phi::State",1) and right.is-t(c"Phi::State",1) {
       # Merge and bind new phi state
       let new-phi-state = tctx.phi-merge(left.slot(c"Phi::State",1).l1, right.slot(c"Phi::State",1).l1, blame);
-      let new-phi-id = uuid();
+      let new-phi-id = iuid();
       tctx = tctx.bind-phi(new-phi-id, new-phi-state, blame);
 
       # Move linear variables in left and right types
-      tctx = tctx.bind-phi(left.slot(c"Phi::Id",1).l1.simple-tag, left.slot(c"Phi::State",1).l1.move-linear, blame);
-      tctx = tctx.bind-phi(right.slot(c"Phi::Id",1).l1.simple-tag, right.slot(c"Phi::State",1).l1.move-linear, blame);
+      tctx = tctx.bind-phi(left.slot(c"Phi::Id",1).l1.simple-id, left.slot(c"Phi::State",1).l1.move-linear, blame);
+      tctx = tctx.bind-phi(right.slot(c"Phi::Id",1).l1.simple-id, right.slot(c"Phi::State",1).l1.move-linear, blame);
 
       # Add Phi::Id to least-upper-bound
-      rt = rt && t1(c"Phi::Id",t0(new-phi-id));
+      rt = rt && t1(c"Phi::Id",ti(new-phi-id));
    };
 
    if left.is-t(c"Phi::State",1) or right.is-t(c"Phi::State",1) and not(rt.is-t(c"Phi::Id",1))