Merge pull request #2005 from andrew-johnson-4/gc-enabled-compiler-fdskdsl

andrew4328 · web-flow · commit da0e9eb3f75b · 2026-03-09T20:12:31.000-06:00
Gc enabled compiler fdskdsl
diff --git a/LM/index.lsts b/LM/index.lsts
diff --git a/LM/type-definition.lsts b/LM/type-definition.lsts
diff --git a/LM/unit-type-core.lsts b/LM/unit-type-core.lsts
diff --git a/lib/core/array.lsts b/lib/core/array.lsts
@@ -53,8 +53,8 @@ let safe-alloc-impl(nb: USize, tt: Type<t>): t[] = (
    mark-memory-as-safe(ptr as U8[], nb);
 
    # TODO: wrap counter adjustments in conditional compilation
-   if not(config-v23) then safe-alloc-block-count = safe-alloc-block-count + 1;
-   if not(config-v23) then safe-alloc-block-count-monotonic = safe-alloc-block-count-monotonic + 1;
+   safe-alloc-block-count = safe-alloc-block-count + 1;
+   safe-alloc-block-count-monotonic = safe-alloc-block-count-monotonic + 1;
 
    ptr
 );
@@ -71,7 +71,7 @@ let safe-realloc-impl(ptr: ?[], nb: USize): ?[] = (
    mark-memory-as-safe(new-ptr as U8[], nb);
 
    # TODO: wrap counter adjustments in conditional compilation
-   if not(config-v23) then safe-alloc-block-count-monotonic = safe-alloc-block-count-monotonic + 1;
+   safe-alloc-block-count-monotonic = safe-alloc-block-count-monotonic + 1;
 
    new-ptr
 );
@@ -96,7 +96,7 @@ let safe-free(ptr: ?[]): Nil = (
    # BEFORE CHANGING THIS: talk to alex
 
    # TODO: wrap counter adjustments in conditional compilation
-   if not(config-v23) then safe-alloc-block-count = safe-alloc-block-count - 1;
+   safe-alloc-block-count = safe-alloc-block-count - 1;
 
    free(ptr as C<"void">[]);
    ()
diff --git a/tests/promises/vector/bound-buffer-into-string.lsts b/tests/promises/vector/bound-buffer-into-string.lsts
@@ -10,5 +10,5 @@ import lib/core/bedrock.lsts;
 # 1 string literal "a"
 assert( mk-vector(type(U8), 1).push(97).buffer-into-string == "a" );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 2 );
+assert( safe-alloc-block-count-monotonic == 2 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-cmp.lsts b/tests/promises/vector/bound-cmp.lsts
@@ -8,5 +8,5 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 0).push(8) == mk-vector(type(U8), 0).push(8) );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 2 );
+assert( safe-alloc-block-count-monotonic == 2 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-constructor.lsts b/tests/promises/vector/bound-constructor.lsts
@@ -13,7 +13,7 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 123).length == 0 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
 
 assert( (mk-vector() : Vector<U8>).length == 0 );
@@ -28,5 +28,5 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( (mk-vector(123) : Vector<U8>).length == 0 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-index.lsts b/tests/promises/vector/bound-index.lsts
@@ -3,5 +3,5 @@ import lib/core/bedrock.lsts;
 
 assert( mk-vector(type(U8), 123).push(8)[0] == 8 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-into-vector.lsts b/tests/promises/vector/bound-into-vector.lsts
@@ -8,5 +8,5 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 1).push(8).into(type(Vector<U8>)).length == 1 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-length.lsts b/tests/promises/vector/bound-length.lsts
@@ -8,10 +8,10 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 123).length == 0 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 123).push(8).length == 1 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-push.lsts b/tests/promises/vector/bound-push.lsts
@@ -10,5 +10,5 @@ safe-alloc-block-count-monotonic = 0;
 # reallocation necessary
 assert( mk-vector(type(U8), 0).push(8).length == 1 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-realloc.lsts b/tests/promises/vector/bound-realloc.lsts
@@ -3,5 +3,5 @@ import lib/core/bedrock.lsts;
 
 assert( mk-vector(type(U8), 0).realloc(1).length == 0 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-reverse.lsts b/tests/promises/vector/bound-reverse.lsts
@@ -8,5 +8,5 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 0).push(8).reverse.length == 1 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-set-index.lsts b/tests/promises/vector/bound-set-index.lsts
@@ -8,5 +8,5 @@ if true {
    assert(v[0] == 9);
 };
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/bound-sort.lsts b/tests/promises/vector/bound-sort.lsts
@@ -8,5 +8,5 @@ safe-alloc-block-count-monotonic = 0;
 
 assert( mk-vector(type(U8), 0).push(8).sort.length == 1 );
 assert( safe-alloc-block-count == 0 );
-if not(config-v23) then assert( safe-alloc-block-count-monotonic == 1 );
+assert( safe-alloc-block-count-monotonic == 1 );
 safe-alloc-block-count-monotonic = 0;
diff --git a/tests/promises/vector/constructor.lsts b/tests/promises/vector/constructor.lsts
@@ -7,10 +7,17 @@ assert( safe-alloc-block-count == 0 );
 mk-vector(type(U8), 2);
 assert( safe-alloc-block-count == 0 );
 
-let _01 = mk-vector(type(U8), 2).push(123);
+# NOTE: there are two tricks to this test
+# 1) vector push cannot be ignored, so it must be stored in a variable
+# 2) the variable must be garbage collected for the test
+if true {
+   let _01 = mk-vector(type(U8), 2).push(123);
+};
 assert( safe-alloc-block-count == 0 );
 
-let _02 = mk-vector(type(U8), 0).push(123);
+if true {
+   let _02 = mk-vector(type(U8), 0).push(123);
+};
 assert( safe-alloc-block-count == 0 );
 
 assert( mk-vector(type(U8), 2).push(123).push(45)[0] == 123 );
@@ -25,14 +32,18 @@ assert( safe-alloc-block-count == 0 );
 assert( mk-vector(type(U8), 0).push(123).push(45)[1] == 45 );
 assert( safe-alloc-block-count == 0 );
 
-let _1 = mk-vector(type(String), 2).push("A");
-let _2 = mk-vector(type(String), 2).push("A").push("B");
-let _3 = mk-vector(type(String), 2).push("A").push("B").push("C");
+if true {
+   let _1 = mk-vector(type(String), 2).push("A");
+   let _2 = mk-vector(type(String), 2).push("A").push("B");
+   let _3 = mk-vector(type(String), 2).push("A").push("B").push("C");
+};
 assert( safe-alloc-block-count == 0 );
 
-let _4 = mk-vector(type(String), 0).push("A");
-let _5 = mk-vector(type(String), 0).push("A").push("B");
-let _6 = mk-vector(type(String), 0).push("A").push("B").push("C");
+if true {
+   let _4 = mk-vector(type(String), 0).push("A");
+   let _5 = mk-vector(type(String), 0).push("A").push("B");
+   let _6 = mk-vector(type(String), 0).push("A").push("B").push("C");
+};
 assert( safe-alloc-block-count == 0 );
 
 assert(
diff --git a/tests/regress.rs b/tests/regress.rs
@@ -33,8 +33,13 @@ fn compile_bootstrap() {
 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_v3 && target.contains("lm-") {
+
+   let mut lm_protect = target.contains("lm-");
+   //if target.contains("lm-ast") { lm_protect = false; };
+   //if target.contains("lm-tctx") { lm_protect = false; };
+   //if target.contains("lm-type") { lm_protect = false; };
+    
+   let exit = if is_v3 && lm_protect {
       Command::new("./bootstrap.exe")
               .stdout(std::process::Stdio::piped())
               .stderr(std::process::Stdio::piped())
