Skip to content

Commit 434f1eb

Browse files
committed
Prevent Java version detection from throwing
1 parent 81f546b commit 434f1eb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

patches/api/0004-Add-SIMD-utilities.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@ index 0000000000000000000000000000000000000000..77cf83bd096bbf6bfa7e510d97716b51
6262
+}
6363
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
6464
new file mode 100644
65-
index 0000000000000000000000000000000000000000..1bbec0b032a4765f5e55a1475a1b7401f72164e7
65+
index 0000000000000000000000000000000000000000..c6a7f59b246ab9a8f3c7ac895287ed71a28a6aaa
6666
--- /dev/null
6767
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
6868
@@ -0,0 +1,32 @@
6969
+package gg.pufferfish.pufferfish.simd;
7070
+
71-
+import jdk.incubator.vector.IntVector;
72-
+
7371
+@Deprecated
7472
+public class SIMDDetection {
7573
+
@@ -94,7 +92,9 @@ index 0000000000000000000000000000000000000000..1bbec0b032a4765f5e55a1475a1b7401
9492
+ } else {
9593
+ int dot = version.indexOf(".");
9694
+ if(dot != -1) { version = version.substring(0, dot); }
97-
+ } return Integer.parseInt(version);
95+
+ }
96+
+ version = version.split("-")[0]; // Azul is stupid
97+
+ return Integer.parseInt(version);
9898
+ }
9999
+
100100
+}

patches/server/0004-Add-SIMD-utilities.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ index 5e494f3ca75958efb0aa53ec556e2ad4b03001bd..5676fcb8533b2d0d46108d5730abe955
2323
archiveClassifier.set("dev")
2424

2525
diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
26-
index f81a4985a24520ab5c7dce0b49a864e09c01e5b7..fc36ab62fa03f65644acbb8349641bbc3460730f 100644
26+
index f81a4985a24520ab5c7dce0b49a864e09c01e5b7..c1ba6068408dc7f40b549ae3c22b876b28017c35 100644
2727
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
2828
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
2929
@@ -1,5 +1,6 @@
@@ -42,7 +42,7 @@ index f81a4985a24520ab5c7dce0b49a864e09c01e5b7..fc36ab62fa03f65644acbb8349641bbc
4242
+ try {
4343
+ SIMDDetection.isEnabled = SIMDDetection.canEnable();
4444
+ SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17;
45-
+ } catch (NoClassDefFoundError ignored) {}
45+
+ } catch (NoClassDefFoundError | Exception ignored) {}
4646
+
4747
+ if (SIMDDetection.isEnabled) {
4848
+ PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");

0 commit comments

Comments
 (0)