feat: make java/lang/Throwable compile

zskamljic · Nov 21, 2024 · 1d17d1d · 1d17d1d
1 parent 03e2d29
commit 1d17d1d
Show file tree

Hide file tree

Showing 41 changed files with 147 additions and 123 deletions.
diff --git a/src/main/java/zskamljic/wjvern/Blacklist.java b/src/main/java/zskamljic/wjvern/Blacklist.java
@@ -85,7 +85,7 @@ private static boolean isBlacklistedForClass(MethodModel method) {
     public static boolean hasUnsupportedType(MethodRefEntry method) {
         return Stream.concat(Stream.of(method.typeSymbol().returnType()), method.typeSymbol().parameterList().stream())
             .map(c -> c.packageName().replace(".", "/") + "/" + c.displayName())
-            .anyMatch(Blacklist::isSupportedClass);
+            .allMatch(Blacklist::isSupportedClass);
     }
 
     record Items(BlacklistClass any, Map<String, BlacklistClass> classes) {

diff --git a/src/main/java/zskamljic/wjvern/llir/ClassBuilder.java b/src/main/java/zskamljic/wjvern/llir/ClassBuilder.java
@@ -107,7 +107,6 @@ private void handleStaticRequirements(IrClassGenerator classGenerator, List<Stri
 
         classGenerator.injectCode("""
             %"java/util/stream/IntStream" = type opaque
-            %"java/util/function/BiFunction" = type opaque
             declare i32 @__gxx_personality_v0(...)
             declare i1 @instanceof(ptr,i32)
             declare ptr @type_interface_vtable(ptr,i32)
@@ -196,7 +195,7 @@ private void handleClassEntry(
         generateClass(classEntry, generatedClasses, registry, globalInitializer);
         var dependent = Utils.unwrapType(classEntry);
         if (!dependent.isPrimitive()) {
-            classGenerator.addRequiredType(new LlvmType.Declared(typeName(dependent)));
+            classGenerator.addRequiredType(new LlvmType.Declared(Utils.typeName(dependent)));
         }
         Optional.ofNullable(generatedClasses.get(classEntry.name().stringValue()))
             .flatMap(IrClassGenerator::getExceptionDefinition)
@@ -253,7 +252,7 @@ private void generateClass(
         var type = Utils.unwrapType(entry);
         if (type.isPrimitive()) return;
 
-        var name = typeName(type);
+        var name = Utils.typeName(type);
         if (generatedClasses.containsKey(name)) return;
 
         ClassBuilder classBuilder;
@@ -292,25 +291,17 @@ private void generateClass(
         classBuilder.generate(generatedClasses, registry, globalInitializer);
     }
 
-    private String typeName(ClassDesc type) {
-        var className = type.packageName().replace('.', '/');
-        if (!className.isEmpty()) {
-            className += "/";
-        }
-        return className + type.displayName();
-    }
-
     private Optional<ClassModel> loadClass(ClassEntry classEntry) {
         var type = Utils.unwrapType(classEntry);
         if (type.isPrimitive()) return Optional.empty();
-        return loadClass(typeName(type));
+        return loadClass(Utils.typeName(type));
     }
 
     private Optional<ClassModel> loadClassStdlibAll(ClassEntry classEntry) {
         var type = Utils.unwrapType(classEntry);
         if (type.isPrimitive()) return Optional.empty();
 
-        return Optional.of(resolver.resolve(typeName(type)));
+        return Optional.of(resolver.resolve(Utils.typeName(type)));
     }
 
     private Optional<ClassModel> loadClass(String className) {

diff --git a/src/main/java/zskamljic/wjvern/llir/IrClassGenerator.java b/src/main/java/zskamljic/wjvern/llir/IrClassGenerator.java
@@ -14,6 +14,7 @@
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.MethodRefEntry;
 import java.lang.classfile.instruction.InvokeInstruction;
+import java.lang.constant.ClassDesc;
 import java.lang.reflect.AccessFlag;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -144,6 +145,16 @@ public void addMethodDependency(MethodRefEntry method, boolean isStatic) {
         if (method.owner().name().stringValue().equals(className)) return;
         if (Blacklist.hasUnsupportedType(method)) return;
 
+        method.typeSymbol()
+            .parameterList()
+            .stream()
+            .distinct()
+            .filter(Predicate.not(ClassDesc::isArray))
+            .filter(Predicate.not(ClassDesc::isPrimitive))
+            .map(Utils::typeName)
+            .map(LlvmType.Declared::new)
+            .forEach(this::addRequiredType);
+
         methodDependencies.add(Utils.methodDeclaration(method, isStatic));
     }
 

diff --git a/src/main/java/zskamljic/wjvern/llir/Utils.java b/src/main/java/zskamljic/wjvern/llir/Utils.java
@@ -27,6 +27,14 @@ public static String escape(String name) {
         return name;
     }
 
+    public static String typeName(ClassDesc type) {
+        var className = type.packageName().replace('.', '/');
+        if (!className.isEmpty()) {
+            className += "/";
+        }
+        return className + type.displayName();
+    }
+
     public static String methodName(String parent, MethodModel method) {
         return escape(parent + "_" + method.methodName() + method.methodTypeSymbol().descriptorString());
     }

diff --git a/src/main/java/zskamljic/wjvern/llir/models/AggregateType.java b/src/main/java/zskamljic/wjvern/llir/models/AggregateType.java
@@ -15,7 +15,8 @@ public String toString() {
             builder.append(type).append(" = type { ");
 
             var fieldsString = fields.stream()
-                .map(String::valueOf)
+                //.map(String::valueOf)
+                .map(f -> f instanceof LlvmType.Pointer ? "ptr" : f.toString())
                 .collect(Collectors.joining(", "));
             builder.append(fieldsString);
 

diff --git a/src/main/resources/supported_classes.txt b/src/main/resources/supported_classes.txt
@@ -5,6 +5,8 @@ java/lang/Integer
 java/lang/Number
 java/lang/Object
 java/lang/String
+java/lang/Throwable
 java/lang/Void
 java/io/Serializable
+java/util/List
 java/util/function/Supplier
diff --git a/src/main/resources/unsupported_functions.json b/src/main/resources/unsupported_functions.json
@@ -217,9 +217,49 @@
       "lastIndexOfLatin1"
     ]
   },
+  "java/lang/Throwable": {
+    "byName": [
+      "addSuppressed",
+      "getSuppressed",
+      "initCause",
+      "lockedPrintStackTrace",
+      "printEnclosedStackTrace",
+      "printStackTrace",
+      "readObject",
+      "setStackTrace",
+      "validateSuppressedExceptionsList",
+      "getOurStackTrace",
+      "writeObject",
+      "getStackTrace",
+      "writeObject",
+      "lockedPrintStackTrace",
+      "printEnclosedStackTrace",
+      "fillInStackTrace"
+    ],
+    "bySignature": [
+      {
+        "name": "<init>",
+        "signatures": [
+          "()V",
+          "(Ljava/lang/String;)V",
+          "(Ljava/lang/String;Ljava/lang/Throwable;)V",
+          "(Ljava/lang/Throwable;)V",
+          "(Ljava/lang/String;Ljava/lang/Throwable;ZZ)V"
+        ]
+      }
+    ]
+  },
   "java/util/List": {
     "byName": [
-      "spliterator"
+      "copyOf",
+      "of",
+      "sort",
+      "spliterator",
+      "getFirst",
+      "getLast",
+      "removeFirst",
+      "removeLast",
+      "reversed"
     ]
   }
 }
diff --git a/src/test/resources/BasicMath.ll b/src/test/resources/BasicMath.ll
@@ -1,6 +1,6 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %BasicMath = type { %BasicMath_vtable_type*, %java_TypeInfo* }
@@ -17,7 +17,6 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %"java/lang/String_vtable_type" = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)*, i32(%"java/lang/String"*)*, i1(%"java/lang/String"*)*, %"java/lang/String"(%"java/lang/String"*)*, i8(%"java/lang/String"*)*, %java_Array(%"java/lang/String"*)*, i1(%"java/lang/String"*)*, %"java/lang/String"(%"java/lang/String"*, %"java/lang/invoke/MethodHandles$Lookup")*, %"java/lang/Object"(%"java/lang/String"*, %"java/lang/invoke/MethodHandles$Lookup")* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -32,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 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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
@@ -1,6 +1,6 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %Comparisons = type { %Comparisons_vtable_type*, %java_TypeInfo* }
@@ -17,7 +17,6 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %Comparisons_vtable_type = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -32,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 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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
@@ -1,6 +1,6 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %ConstructorAndInstanceMethods = type { %ConstructorAndInstanceMethods_vtable_type*, %java_TypeInfo* }
@@ -17,7 +17,6 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %ConstructorAndInstanceMethods_vtable_type = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -32,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 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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
@@ -1,6 +1,6 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %Conversions = type { %Conversions_vtable_type*, %java_TypeInfo* }
@@ -17,7 +17,6 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %Conversions_vtable_type = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -32,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 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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
@@ -1,7 +1,7 @@
 %"java/lang/Exception" = type { ptr, ptr }
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %CustomException = type { %CustomException_vtable_type*, %java_TypeInfo*, i32 }
@@ -12,7 +12,6 @@ declare void @"java/lang/Exception_<init>()V"(%"java/lang/Exception"*)
 %CustomException_vtable_type = type { i32(%CustomException*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -25,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 11]
+@typeInfo_types = private global [1 x i32] [i32 13]
 @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
@@ -1,8 +1,8 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %CustomException = type { ptr, ptr, i32 }
-%"java/lang/Throwable" = type opaque
+%"java/lang/Throwable" = type { ptr, ptr, ptr, ptr, ptr, ptr, i32, ptr }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %Exceptions = type { %Exceptions_vtable_type*, %java_TypeInfo* }
@@ -20,10 +20,9 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %"java/lang/String_vtable_type" = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)*, i32(%"java/lang/String"*)*, i1(%"java/lang/String"*)*, %"java/lang/String"(%"java/lang/String"*)*, i8(%"java/lang/String"*)*, %java_Array(%"java/lang/String"*)*, i1(%"java/lang/String"*)*, %"java/lang/String"(%"java/lang/String"*, %"java/lang/invoke/MethodHandles$Lookup")*, %"java/lang/Object"(%"java/lang/String"*, %"java/lang/invoke/MethodHandles$Lookup")* }
 %Exceptions_vtable_type = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)* }
 %CustomException_vtable_type = type { i32(%CustomException*)* }
-%"java/lang/Throwable_vtable_type" = type {  }
+%"java/lang/Throwable_vtable_type" = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)*, %"java/lang/String"(%"java/lang/Throwable"*)*, %"java/lang/String"(%"java/lang/Throwable"*)*, %"java/lang/Throwable"(%"java/lang/Throwable"*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -45,13 +44,18 @@ declare void @__cxa_end_catch()
 @CustomException_type_info = constant { ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv117__class_type_infoE, i64 2), ptr @CustomException_type_string }
 @PCustomException_type_info = constant { ptr, ptr, i32, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv119__pointer_type_infoE, i64 2), ptr @PCustomException_type_string, i32 0, ptr @CustomException_type_info }
 
+@"java/lang/Throwable_type_string" = constant [22 x i8] c"19java/lang/Throwable\00"
+@"Pjava/lang/Throwable_type_string" = constant [23 x i8] c"P19java/lang/Throwable\00"
+@"java/lang/Throwable_type_info" = constant { ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv117__class_type_infoE, i64 2), ptr @"java/lang/Throwable_type_string" }
+@"Pjava/lang/Throwable_type_info" = constant { ptr, ptr, i32, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv119__pointer_type_infoE, i64 2), ptr @"Pjava/lang/Throwable_type_string", i32 0, ptr @"java/lang/Throwable_type_info" }
+
 @Exceptions_vtable_data = global %Exceptions_vtable_type {
   i32(%"java/lang/Object"*)* @"java/lang/Object_hashCode()I",
   i1(%"java/lang/Object"*, %"java/lang/Object")* @"java/lang/Object_equals(Ljava/lang/Object;)Z",
   void(%"java/lang/Object"*)* @"java/lang/Object_finalize()V"
 }
 
-@typeInfo_types = private global [2 x i32] [i32 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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
@@ -1,6 +1,6 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %CustomException = type { ptr, ptr, i32 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
@@ -21,7 +21,6 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %CustomException_vtable_type = type { i32(%CustomException*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -49,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 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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
@@ -1,6 +1,6 @@
 %"java/lang/Object" = type { ptr, ptr }
 %"java/lang/invoke/MethodHandles$Lookup" = type opaque
-%"java/lang/String" = type { ptr, ptr, %java_Array*, i8, i32, i1 }
+%"java/lang/String" = type { ptr, ptr, ptr, i8, i32, i1 }
 %java_Array = type { i32, ptr }
 %java_TypeInfo = type { i32, i32*, i32, i32*, ptr }
 %ForEach = type { %ForEach_vtable_type*, %java_TypeInfo* }
@@ -17,7 +17,6 @@ declare void @"java/lang/Object_wait0(J)V"(%"java/lang/Object"*, i64) nounwind
 %ForEach_vtable_type = type { i32(%"java/lang/Object"*)*, i1(%"java/lang/Object"*, %"java/lang/Object")*, void(%"java/lang/Object"*)* }
 
 %"java/util/stream/IntStream" = type opaque
-%"java/util/function/BiFunction" = type opaque
 declare i32 @__gxx_personality_v0(...)
 declare i1 @instanceof(ptr,i32)
 declare ptr @type_interface_vtable(ptr,i32)
@@ -32,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 10, i32 1]
+@typeInfo_types = private global [2 x i32] [i32 12, 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 }