From b71cd333f37f662f3d89caf9c8b9cdd8b45782e1 Mon Sep 17 00:00:00 2001
From: Igor Rudenko <iostream64@gmail.com>
Date: Sat, 7 Sep 2024 23:07:16 +0300
Subject: [PATCH] Add trivial class static initialization

---
 tests/integration_test.rs                     |  27 ++++++++++++++
 tests/test_data/Dependable.class              | Bin 0 -> 294 bytes
 tests/test_data/Dependable.java               |   8 ++++
 tests/test_data/DependsOnDependable.class     | Bin 0 -> 354 bytes
 tests/test_data/DependsOnDependable.java      |   8 ++++
 tests/test_data/StaticInitialization.class    | Bin 0 -> 745 bytes
 tests/test_data/StaticInitialization.java     |  35 ++++++++++++++++++
 .../test_data/StaticInitializationUser.class  | Bin 0 -> 349 bytes
 tests/test_data/StaticInitializationUser.java |   6 +++
 vm/src/vm.rs                                  |   8 ++++
 10 files changed, 92 insertions(+)
 create mode 100644 tests/test_data/Dependable.class
 create mode 100644 tests/test_data/Dependable.java
 create mode 100644 tests/test_data/DependsOnDependable.class
 create mode 100644 tests/test_data/DependsOnDependable.java
 create mode 100644 tests/test_data/StaticInitialization.class
 create mode 100644 tests/test_data/StaticInitialization.java
 create mode 100644 tests/test_data/StaticInitializationUser.class
 create mode 100644 tests/test_data/StaticInitializationUser.java

diff --git a/tests/integration_test.rs b/tests/integration_test.rs
index 48d1a5ad..001bbf22 100644
--- a/tests/integration_test.rs
+++ b/tests/integration_test.rs
@@ -81,3 +81,30 @@ fn should_do_arrays() {
     let last_frame_value = vm.run("Array").unwrap();
     assert_eq!(740, last_frame_value.unwrap())
 }
+
+#[test]
+fn should_do_class_static_initialization() {
+    let vm = VM::new(
+        vec!["tests/test_data/StaticInitialization.class"],
+        "tests/test_data/std",
+    )
+    .unwrap();
+    let last_frame_value = vm.run("StaticInitialization").unwrap();
+    assert_eq!(257, last_frame_value.unwrap())
+}
+
+#[ignore]
+#[test]
+fn should_do_class_static_initialization_multiple_classes() {
+    let vm = VM::new(
+        vec![
+            "tests/test_data/Dependable.class",
+            "tests/test_data/DependsOnDependable.class",
+            "tests/test_data/StaticInitializationUser.class",
+        ],
+        "tests/test_data/std",
+    )
+    .unwrap();
+    let last_frame_value = vm.run("StaticInitializationUser").unwrap();
+    assert_eq!(350, last_frame_value.unwrap())
+}
diff --git a/tests/test_data/Dependable.class b/tests/test_data/Dependable.class
new file mode 100644
index 0000000000000000000000000000000000000000..4d367ab9021f603d992677ff0a4ad09f943cc5fd
GIT binary patch
literal 294
zcmYLD!D_-l6r7ht6Js>7cMsmIl==fASVa&-4=ufKlBFcXSj6~WrH6uto~0jEoJ7&f
z%-gp!^XBjW_zU0#4=xOtHY^V{)CEDR4r-XG{A0KdQyuLE^-+>1`?0|6KfX8Mpkc%H
z(1a&&XZlm;u?jOy;X!4Eo(N<iu%_FXJAawvdR1&fy?eW;oKcir1Krncv5WLPDc$}(
z>bWd|9#0u8DP$hwWN>CnVvDaXS;)1)59F&7wu$9;DRtoAq)*ij@Phaob_XZo-O+|g
Ohgn58VN)Aa37s=Gfi64%

literal 0
HcmV?d00001

diff --git a/tests/test_data/Dependable.java b/tests/test_data/Dependable.java
new file mode 100644
index 00000000..93046ad5
--- /dev/null
+++ b/tests/test_data/Dependable.java
@@ -0,0 +1,8 @@
+
+public class Dependable {
+    static int valueA = 100;
+
+    static {
+        valueA = 200;
+    }
+}
diff --git a/tests/test_data/DependsOnDependable.class b/tests/test_data/DependsOnDependable.class
new file mode 100644
index 0000000000000000000000000000000000000000..53681bda9e8aab4288c8927af905f7ce5f3736e5
GIT binary patch
literal 354
zcmZvXPfx-?5XIlLz_ztOrTFLK!JB%JM6Sd{AS5OR4jRvH+l?uyi$Tiw0uCk|_yB$=
z!)!5f(96th_V?bK`TAaO0CaKU!GbMN@=->G5RBzqwlb+-Tcc>K;u)dRNp(8ACD<32
z&n_Ie0-lcp_yn)7-jz;dlqm-1GRxH+f$m+@P!|Y%92zX#VIL#?m+ulvy-C9Q`a`PK
zFn^2G^l9hlbmHtM+<Tnl(^w5slXUuz-?iBs=NxSDWyE`OG*1@Kd>YpVzs|T5_wv;z
vXi<P6SMzO92hCr!T^Ir35+b;HS)sZ_HAu{`7uI02(1y#h1_aw26-LKf$Ob+H

literal 0
HcmV?d00001

diff --git a/tests/test_data/DependsOnDependable.java b/tests/test_data/DependsOnDependable.java
new file mode 100644
index 00000000..fd8cd23a
--- /dev/null
+++ b/tests/test_data/DependsOnDependable.java
@@ -0,0 +1,8 @@
+
+public class DependsOnDependable {
+    static int valueB = Dependable.valueA + 50;
+
+    static {
+        valueB += 100;
+    }
+}
diff --git a/tests/test_data/StaticInitialization.class b/tests/test_data/StaticInitialization.class
new file mode 100644
index 0000000000000000000000000000000000000000..fd51db188439b977623c3b22e8c7b138aefae899
GIT binary patch
literal 745
zcmZWn%TC)+6r5{2BypUQgh0SaA5aM;r~(zKD-xuXHj<?j7Kzxfs2yX0!8ph@mD)A^
zk#4%_rpcmJRq+A+m8w5b^)=UtibQ4U&bjx@IcMg`Uw?nT0`M63btq8N&<vz7BTzVT
zUOF3r6CQ2s4Ng2a7MN-Jp&xGxsP)Ev78zvI&<*5Z2$XxV6Z@`3g6{<WYhH$-K<-8I
z+>RpWm4I?!$+BApW>F9*_4@6;we!4V?Y6r-pLU-Jh=fuyFefR-q`u>O!Qn$$J8xj&
zW@1xkV$r}7OaV=5Oe9*o><kY*f!VGfdb<~A125`3gMcsEnd4L5Lj9n7?Xwq0et5Li
z*cZstj(hsdIiK<~O*fdD*L%Z@$n`qD?6XAPf40|UODt2A!qsXprCmn4^pqeiB*@hz
z3?X+8fhupeiGr9~`v~!Yfk2I?OoI(|X_K*}R+BeCEv&u2K`bH5PIsn64=O*Pp*Gc4
zZG`mITNJCr+PdAmRK&YK-$%%gP_#!V+f}<I=PJoulas-nE2vQHBFaRQlk3dhWrn}a
zFK9yiz&s7#`)A_~jZ4MbpHLYipBbab{$KPl((0BukuXOv85fWDE<q9B7#23|2{m;*
uM)_LDDh<&o`|JF2C{axfd8`s2aPA{6yoHrSQx?iklqsn~3Ck=~u<{oLNq{i`

literal 0
HcmV?d00001

diff --git a/tests/test_data/StaticInitialization.java b/tests/test_data/StaticInitialization.java
new file mode 100644
index 00000000..9620e06f
--- /dev/null
+++ b/tests/test_data/StaticInitialization.java
@@ -0,0 +1,35 @@
+
+public class StaticInitialization {
+    private static final int STATIC_FINAL_FIELD = init();
+    private static int staticField1;
+    private static int staticField2;
+    private static int[] staticArray;
+
+    // Static initializer block
+    static {
+        staticField1 = 5; // Direct static field initialization
+        staticArray = new int[staticField1]; // Initialize array in static block
+        for (int i = 0; i < staticArray.length; i++) {
+            staticArray[i] = i * staticField1;
+        }
+    }
+
+    private static int init() {
+        return 42;
+    }
+
+    public static void main(String[] args) {
+        int arraySum = 0;
+        for (int i = 0; i < staticArray.length; i++) {
+            arraySum += staticArray[i];
+        }
+
+        int result = STATIC_FINAL_FIELD + staticField1 + staticField2 + arraySum;
+    }
+
+    // Another static block (executed in order of appearance)
+    static {
+        staticField1 += 50; // Modify staticField1
+        staticField2 = staticField1 * 2; // Initialize staticField2 based on staticField1
+    }
+}
diff --git a/tests/test_data/StaticInitializationUser.class b/tests/test_data/StaticInitializationUser.class
new file mode 100644
index 0000000000000000000000000000000000000000..0a44b20e0d9914b35c6f546dfbf65c6815daaa62
GIT binary patch
literal 349
zcmZ`#u}%U(5Pbu8oOhn0qQ-`T4lLvYBo=5)NQe}tG*)}Zh739O%&|w|Uuk1P!3X$J
z##t$-+)3uW$-XzUv)@0PEr1~|BGgb1;KlIKAe=1JTJ>{f=KV>!(3vGP25i{g5$fIE
zG{gbI08xxX#Dvy^e$!^QnwT9?X|BbwR(Yj|1R4c6CR`;}S<Xh%hE>k*QWWN8rAvZ$
zU(CeO9JA3+)iTxP^R9=tRBQ;B-PiH{Nr^4l%x`;BLX;F$ndwJ%1Ka-%xN%-|a3ov0
zQv<m@B{!vN3zDFJ{RR3EBKu2r*G?MZ6lcPnv?J(R_@4*{d#U?9z?1Mr(E78T{{p=d
BMk)XR

literal 0
HcmV?d00001

diff --git a/tests/test_data/StaticInitializationUser.java b/tests/test_data/StaticInitializationUser.java
new file mode 100644
index 00000000..87657fa2
--- /dev/null
+++ b/tests/test_data/StaticInitializationUser.java
@@ -0,0 +1,6 @@
+
+public class StaticInitializationUser {
+    public static void main(String[] args) {
+        int result = DependsOnDependable.valueB;
+    }
+}
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
index 583e31a5..cec93d5d 100644
--- a/vm/src/vm.rs
+++ b/vm/src/vm.rs
@@ -19,6 +19,14 @@ impl VM {
             .get_method_by_name_signature(main_class_name, "main:([Ljava/lang/String;)V")?;
 
         let mut engine = Engine::new(&self.class_loader.method_area());
+
+        for (class_name, java_class) in self.class_loader.method_area().loaded_classes.iter() {
+            if let Some(java_method) = java_class.methods.method_by_signature.get("<clinit>:()V") {
+                println!("About to initialize java class {class_name} java_method={java_method:?}");
+                engine.execute(java_method)?; //todo implement multiclass correct initialization order
+            }
+        }
+
         engine.execute(main_method)
     }
 }