feat: add partial Long compilation

zskamljic · Nov 30, 2024 · cfbebb5 · cfbebb5
1 parent 1d17d1d
commit cfbebb5
Show file tree

Hide file tree

Showing 38 changed files with 81 additions and 38 deletions.
diff --git a/src/main/java/zskamljic/wjvern/llir/GlobalInitializer.java b/src/main/java/zskamljic/wjvern/llir/GlobalInitializer.java
@@ -29,7 +29,8 @@ public void finishInitialization(IrClassGenerator classGenerator) {
         if (!initializers.containsKey(classGenerator)) return;
 
         var initBuilder = new StringBuilder();
-        if (!classGenerator.getClassName().startsWith("java/lang/String")&&!classGenerator.getClassName().startsWith("java/lang/Integer")) {
+        if (!classGenerator.getClassName().startsWith("java/lang/String") && !classGenerator.hasMethodDependency(
+            "declare void @\"java/lang/String_<init>([BB)V\"(%\"java/lang/String\"*, %java_Array, i8)")) {
             initBuilder.append("declare void @\"java/lang/String_<init>([BB)V\"(ptr, ptr, i8) personality ptr @__gxx_personality_v0\n");
         }
         initBuilder.append("define void @\"").append(classGenerator.getClassName()).append("_var_init\"() personality ptr @__gxx_personality_v0 {\n");

diff --git a/src/main/java/zskamljic/wjvern/llir/IrClassGenerator.java b/src/main/java/zskamljic/wjvern/llir/IrClassGenerator.java
@@ -531,6 +531,10 @@ public Optional<String> getExceptionDefinition() {
         return Optional.of(type);
     }
 
+    public boolean hasMethodDependency(String signature) {
+        return methodDependencies.contains(signature);
+    }
+
     private record StringConstant(int index, int length, String content) {
     }
 }
diff --git a/src/main/resources/supported_classes.txt b/src/main/resources/supported_classes.txt
@@ -2,6 +2,7 @@ java/lang/Character
 java/lang/CharSequence
 java/lang/Comparable
 java/lang/Integer
+java/lang/Long
 java/lang/Number
 java/lang/Object
 java/lang/String

diff --git a/src/main/resources/unsupported_functions.json b/src/main/resources/unsupported_functions.json
@@ -162,6 +162,43 @@
       "formatUnsignedIntUTF16"
     ]
   },
+  "java/lang/Long": {
+    "bySignature": [
+      {
+        "name": "<init>",
+        "signatures": [
+          "(Ljava/lang/String;)V"
+        ]
+      }
+    ],
+    "byName": [
+      "compress",
+      "compare",
+      "compareTo",
+      "compareUnsigned",
+      "decode",
+      "divideUnsigned",
+      "expand",
+      "getLong",
+      "max",
+      "min",
+      "remainderUnsigned",
+      "rotateLeft",
+      "rotateRight",
+      "parseLong",
+      "parseUnsignedLong",
+      "sum",
+      "toHexString",
+      "toOctalString",
+      "toBinaryString",
+      "toUnsignedString",
+      "toStringUTF16",
+      "toUnsignedString0",
+      "toUnsignedBigInteger",
+      "formatUnsignedLong0",
+      "formatUnsignedLong0UTF16"
+    ]
+  },
   "java/lang/String": {
     "bySignature": [
       {

diff --git a/src/test/resources/BasicMath.ll b/src/test/resources/BasicMath.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Comparisons.ll b/src/test/resources/Comparisons.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ConstructorAndInstanceMethods.ll b/src/test/resources/ConstructorAndInstanceMethods.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Conversions.ll b/src/test/resources/Conversions.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/CustomException.ll b/src/test/resources/CustomException.ll
@@ -24,7 +24,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   i32(%CustomException*)* @"CustomException_getCode()I"
 }
 
-@typeInfo_types = private global [1 x i32] [i32 13]
+@typeInfo_types = private global [1 x i32] [i32 14]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 1, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Exceptions.ll b/src/test/resources/Exceptions.ll
@@ -55,7 +55,7 @@ declare void @__cxa_end_catch()
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ExceptionsData.ll b/src/test/resources/ExceptionsData.ll
@@ -48,7 +48,7 @@ declare void @__cxa_end_catch()
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ForEach.ll b/src/test/resources/ForEach.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ForLoop.ll b/src/test/resources/ForLoop.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/FunctionOverloading.ll b/src/test/resources/FunctionOverloading.ll
@@ -33,7 +33,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   i32(%FunctionOverloading*, i32)* @"FunctionOverloading_doSomething(I)I"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/IfStatements.ll b/src/test/resources/IfStatements.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Inheritance.ll b/src/test/resources/Inheritance.ll
@@ -38,7 +38,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%Inheritance*)* @"Inheritance_childMethod()V"
 }
 
-@typeInfo_types = private global [3 x i32] [i32 13, i32 12, i32 1]
+@typeInfo_types = private global [3 x i32] [i32 14, i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 3, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/InstanceFields.ll b/src/test/resources/InstanceFields.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/InstanceOf.ll b/src/test/resources/InstanceOf.ll
@@ -42,7 +42,7 @@ declare void @__cxa_end_catch()
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }
@@ -94,13 +94,13 @@ label4:
   ; %object entered scope under name %local.1
   ; Line 10
   %2 = load %"java/lang/Object"*, %"java/lang/Object"** %local.1
-  %3 = call i1 @instanceof(ptr %2, i32 12)
+  %3 = call i1 @instanceof(ptr %2, i32 13)
   %4 = sext i1 %3 to i32
   %5 = icmp eq i32 %4, 0
   br i1 %5, label %label1, label %label5
 label5:
   %6 = load %"java/lang/Object"*, %"java/lang/Object"** %local.1
-  %7 = call i1 @instanceof(ptr %6, i32 12)
+  %7 = call i1 @instanceof(ptr %6, i32 13)
   br i1 %7, label %label6, label %label7
 label7:
   call void @__cxa_throw(ptr null, ptr null, ptr null)

diff --git a/src/test/resources/InterfaceCalls.ll b/src/test/resources/InterfaceCalls.ll
@@ -49,7 +49,7 @@ declare void @__cxa_end_catch()
   i32(%InterfaceCalls*, %"java/lang/Object")* @"InterfaceCalls_compareTo(Ljava/lang/Object;)I"
 }
 
-@typeInfo_types = private global [3 x i32] [i32 12, i32 1, i32 8]
+@typeInfo_types = private global [3 x i32] [i32 13, i32 1, i32 8]
 @typeInfo_interfaces = private global [1 x i32] [i32 8]
 @typeInfo_interface_tables = private global [1 x ptr] [ptr @"InterfaceCalls_java/lang/Comparable_vtable"]
 @typeInfo = private global %java_TypeInfo { i32 3, i32* @typeInfo_types, i32 1, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }
@@ -191,7 +191,7 @@ label0:
   %local.1 = alloca %"java/lang/Object"**
   store %"java/lang/Object"* %param.1, %"java/lang/Object"** %local.1
   %2 = load %"java/lang/Object"*, %"java/lang/Object"** %local.1
-  %3 = call i1 @instanceof(ptr %2, i32 12)
+  %3 = call i1 @instanceof(ptr %2, i32 13)
   br i1 %3, label %label2, label %label3
 label3:
   call void @__cxa_throw(ptr null, ptr null, ptr null)

diff --git a/src/test/resources/MutableParameters.ll b/src/test/resources/MutableParameters.ll
@@ -34,7 +34,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/NativeMethods.ll b/src/test/resources/NativeMethods.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/NativeVarArgMethods.ll b/src/test/resources/NativeVarArgMethods.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ObjectArrays.ll b/src/test/resources/ObjectArrays.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Parameters.ll b/src/test/resources/Parameters.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Parent.ll b/src/test/resources/Parent.ll
@@ -33,7 +33,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%Parent*)* @"Parent_dynamic()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ReferenceFields.ll b/src/test/resources/ReferenceFields.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ReturnArray.ll b/src/test/resources/ReturnArray.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ReturnReference.ll b/src/test/resources/ReturnReference.ll
@@ -32,7 +32,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   i32(%ReturnReference*)* @"ReturnReference_returnValue()I"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/ReusedLocals.ll b/src/test/resources/ReusedLocals.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Simple.ll b/src/test/resources/Simple.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/StandardMain.ll b/src/test/resources/StandardMain.ll
@@ -35,7 +35,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/StaticFields.ll b/src/test/resources/StaticFields.ll
@@ -33,7 +33,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/StaticFunctions.ll b/src/test/resources/StaticFunctions.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Strings.ll b/src/test/resources/Strings.ll
@@ -51,7 +51,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/Switch.ll b/src/test/resources/Switch.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/VariableAssignment.ll b/src/test/resources/VariableAssignment.ll
@@ -31,7 +31,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }

diff --git a/src/test/resources/VirtualMethods.ll b/src/test/resources/VirtualMethods.ll
@@ -32,7 +32,7 @@ declare void @llvm.memset.p0.i64(ptr,i8,i64,i1)
   void(%VirtualMethods*)* @"VirtualMethods_doSomething()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 12, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 13, i32 1]
 @typeInfo_interfaces = private global [0 x i32] []
 @typeInfo_interface_tables = private global [0 x ptr] []
 @typeInfo = private global %java_TypeInfo { i32 2, i32* @typeInfo_types, i32 0, i32* @typeInfo_interfaces, ptr @typeInfo_interface_tables }