Fix static init for LaxMalloc class

core/src/main/java/org/teavm/backend/wasm/WasmGCTarget.java

@@ -33,6 +33,7 @@ import org.teavm.backend.wasm.gc.TeaVMWasmGCHost;
 import org.teavm.backend.wasm.gc.WasmGCClassConsumer;
 import org.teavm.backend.wasm.gc.WasmGCClassConsumerContext;
 import org.teavm.backend.wasm.gc.WasmGCDependencies;
+import org.teavm.backend.wasm.generate.gc.LaxMallocInitializerContributor;
 import org.teavm.backend.wasm.generate.gc.WasmGCDeclarationsGenerator;
 import org.teavm.backend.wasm.generate.gc.WasmGCNameProvider;
 import org.teavm.backend.wasm.generate.gc.classes.WasmGCCustomTypeMapperFactory;
@@ -77,6 +78,7 @@ import org.teavm.model.transformation.BoundCheckInsertion;
 import org.teavm.model.transformation.NullCheckFilter;
 import org.teavm.model.transformation.NullCheckInsertion;
 import org.teavm.model.util.VariableCategoryProvider;
+import org.teavm.runtime.LaxMalloc;
 import org.teavm.vm.BuildTarget;
 import org.teavm.vm.TeaVMTarget;
 import org.teavm.vm.TeaVMTargetController;
@@ -301,6 +303,14 @@ public class WasmGCTarget implements TeaVMTarget, TeaVMWasmGCHost {
             refQueueSupplyFunction.setExportName("teavm.reportGarbageCollectedValue");
         }
 
+        if(enableDirectMallocSupport) {
+            var laxMallocClinitRef = new MethodReference(LaxMalloc.class, "<clinit>", void.class);
+            if (controller.getDependencyInfo().getMethod(laxMallocClinitRef) != null) {
+                var laxMallocClinit = declarationsGenerator.functions().forStaticMethod(laxMallocClinitRef);
+                declarationsGenerator.addEarlyInitializerContributor(new LaxMallocInitializerContributor(laxMallocClinit));
+            }
+        }
+
         moduleGenerator.generate();
         customGenerators.contributeToModule(module);
         generateExceptionExports(declarationsGenerator);
@@ -311,7 +321,7 @@ public class WasmGCTarget implements TeaVMTarget, TeaVMWasmGCHost {
                 heapSegment.setOffset(WasmRuntime.align(lastSegment.getOffset()
                         + lastSegment.getLength(), WasmHeap.PAGE_SIZE));
             }
-            heapSegment.setLength(directMallocMinHeapSize);
+            heapSegment.setLength(WasmHeap.PAGE_SIZE);
             module.getSegments().add(heapSegment);
             intrinsics.setupLaxMallocHeap(heapSegment.getOffset(), heapSegment.getOffset() + directMallocMinHeapSize,
                     heapSegment.getOffset() + directMallocMaxHeapSize);

core/src/main/java/org/teavm/backend/wasm/gc/WasmGCDependencies.java

@@ -131,6 +131,7 @@ public class WasmGCDependencies {
     }
 
     public void contributeDirectMalloc() {
+        analyzer.linkMethod(new MethodReference(LaxMalloc.class, "<clinit>", void.class)).use();
         analyzer.linkMethod(new MethodReference(LaxMalloc.class, "laxMalloc", int.class, Address.class)).use();
         analyzer.linkMethod(new MethodReference(LaxMalloc.class, "laxCalloc", int.class, Address.class)).use();
         analyzer.linkMethod(new MethodReference(LaxMalloc.class, "laxFree", Address.class, void.class)).use();

core/src/main/java/org/teavm/backend/wasm/generate/gc/LaxMallocInitializerContributor.java

@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2024 lax1dude.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.teavm.backend.wasm.generate.gc;
+
+import org.teavm.backend.wasm.model.WasmFunction;
+import org.teavm.backend.wasm.model.expression.WasmCall;
+
+public class LaxMallocInitializerContributor implements WasmGCInitializerContributor {
+
+    private final WasmFunction clinit;
+
+    public LaxMallocInitializerContributor(WasmFunction clinit) {
+        this.clinit = clinit;
+    }
+
+    @Override
+    public void contributeToInitializerDefinitions(WasmFunction function) {
+    }
+
+    @Override
+    public void contributeToInitializer(WasmFunction function) {
+        function.getBody().add(new WasmCall(clinit));
+    }
+
+}

core/src/main/java/org/teavm/backend/wasm/generate/gc/WasmGCDeclarationsGenerator.java

@@ -178,4 +178,8 @@ public class WasmGCDeclarationsGenerator {
     public void addToInitializer(Consumer<WasmFunction> contributor) {
         methodGenerator.getGenerationContext().addToInitializer(contributor);
     }
+
+    public void addEarlyInitializerContributor(WasmGCInitializerContributor contributor) {
+        initializerContributors.add(contributor);
+    }
 }

core/src/main/java/org/teavm/runtime/LaxMalloc.java

@@ -80,6 +80,9 @@ public final class LaxMalloc {
         // initialize heap limit
         addrHeap(ADDR_HEAP_INNER_LIMIT).putAddress(addrHeap(ADDR_HEAP_DATA_START));
         addrHeap(ADDR_HEAP_OUTER_LIMIT).putAddress(getHeapMinAddr());
+        
+        //TODO: Need to handle error setting the heap to its initial size
+        growHeapOuter(getHeapMinAddr().toInt() >> 16);
     }
 
     /**