Merge 1.18 into 1.19.2

embeddedt · Apr 16, 2024 · 237239d · 237239d
2 parents dcc0ed2 + 2f4836b
commit 237239d
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java
@@ -14,10 +14,13 @@
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
@@ -107,9 +110,22 @@ private static AsyncSearchManager createSearchManager() {
                     throw new RuntimeException(e);
                 }
             };
-            return new AsyncSearchManager(stackListSupplier, () -> {
+            Supplier<Predicate<Boolean>> shouldShowStack = () -> {
                 return Predicates.alwaysTrue();
-            }, normalizeOperator);
+            };
+            try {
+                try {
+                    // Old constructor taking Supplier as first arg
+                    MethodHandle cn = MethodHandles.publicLookup().findConstructor(AsyncSearchManager.class, MethodType.methodType(void.class, Supplier.class, Supplier.class, UnaryOperator.class));
+                    return (AsyncSearchManager)cn.invoke(stackListSupplier, shouldShowStack, normalizeOperator);
+                } catch(NoSuchMethodException e) {
+                    // New constructor taking Function as first arg
+                    MethodHandle cn = MethodHandles.publicLookup().findConstructor(AsyncSearchManager.class, MethodType.methodType(void.class, Function.class, Supplier.class, UnaryOperator.class));
+                    return (AsyncSearchManager)cn.invoke((Function<?, ?>)o -> stackListSupplier.get(), shouldShowStack, normalizeOperator);
+                }
+            } catch(Throwable mhThrowable) {
+                throw new ReflectiveOperationException(mhThrowable);
+            }
         } catch(ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }