[jvm] Split large synthesized heap initialization method at proper bo…

…undary (#284)
titzer · Oct 1, 2024 · 581bf4d · 581bf4d
1 parent 19c58e1
commit 581bf4d
Show file tree

Hide file tree

Showing 7 changed files with 205 additions and 178 deletions.
diff --git a/aeneas/src/jvm/JvmBuilder.v3 b/aeneas/src/jvm/JvmBuilder.v3
@@ -15,8 +15,8 @@ class JvmClassfileBuilder(jprog: JvmProgram, jclass: JvmClass) {
 		file.this_class = newClassref(jclass.name);
 		file.super_class = newClassref(jclass.superName);
 	}
-	def emitValue(code: JvmCodeBuilder, etype: Type, val: Val) -> int {
-		return jprog.jheap.emitValue(code, etype, val);
+	def emitValue(code: JvmCodeBuilder, etype: Type, val: Val) {
+		jprog.jheap.emitValue(code, etype, val);
 	}
 	def newField(name: string, desc: string) -> JvmField {
 		var fld = JvmField.new(newUtf8(name), newUtf8(desc));
@@ -572,4 +572,15 @@ class JvmCodeBuilder(builder: JvmClassfileBuilder) {
 		iconst(64 - width);
 		binop(JvmBytecode.LUSHR);
 	}
+//------- helper routines -----------------------------------------
+	def splitAt(pos: int) -> JvmCodeBuilder {
+		var n = JvmCodeBuilder.new(builder);
+		n.code = Arrays.range(code, pos, cur_pos);
+		n.cur_stack = cur_stack;
+		n.max_locals = max_locals;
+		n.max_stack = max_stack;
+		n.cur_pos = n.code.length;
+		cur_pos = pos;
+		return n;
+	}
 }
diff --git a/aeneas/src/jvm/JvmGen.v3 b/aeneas/src/jvm/JvmGen.v3
@@ -37,6 +37,9 @@ class JvmProgram(compiler: Compiler, prog: Program) {
 		if (prog.getMain() != null) jvmType(prog.getMain().receiver);
 		prog.ir.classes.apply(processIrClass);
 		var pos = Vectors.drain(classQueue, 0, JvmClassGen.build);
+		context.method = null;
+		context.block = null;
+		context.graph = null;
 		jheap.emit();
 		Vectors.drain(classQueue, pos, JvmClassGen.build);
 		classQueue.apply(JvmClassGen.emit);