fix: add shims for Caffeine UnsafeAccess

itsaky-adfa · itsaky-adfa · commit e4febed40547 · 2026-03-25T23:00:35.000+05:30
Backed by our own AndroidUnsafe

Signed-off-by: Akash Yadav &lt;akashyadav@appdevforall.org&gt;
diff --git a/patches/0001-fix-use-application-class-loader-to-find-jrt-file-sy.patch b/patches/0001-fix-use-application-class-loader-to-find-jrt-file-sy.patch
@@ -1,7 +1,7 @@
 From e571c9c18c355383a36012601b86dd8a0bd32959 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <contact@itsaky.com>
 Date: Wed, 11 Mar 2026 16:39:54 +0530
-Subject: [PATCH 01/12] fix: use application class loader to find jrt:/ file
+Subject: [PATCH 01/13] fix: use application class loader to find jrt:/ file
  system
 
 The JRT file system is not available on Android. It needs to be part of the application. To ensure Kotlin's CoreJrtFileSystem can find that file system, we need to make it use the application class loader so that it finds the jrt:/ file system in the application's classes, not in the system's loader
diff --git a/patches/0002-fix-replace-usage-of-JavaVersion.current-with-androi.patch b/patches/0002-fix-replace-usage-of-JavaVersion.current-with-androi.patch
@@ -1,7 +1,7 @@
 From 2dc80f890f351be62507dda6217bfb5ff3d402c7 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <contact@itsaky.com>
 Date: Wed, 11 Mar 2026 16:41:22 +0530
-Subject: [PATCH 02/12] fix: replace usage of JavaVersion.current() with
+Subject: [PATCH 02/13] fix: replace usage of JavaVersion.current() with
  androidJavaVersion()
 
 JavaVersion.current() tries to use system properties like 'java.version' and 'java.runtime.version'
diff --git a/patches/0003-fix-relocate-javax.annotation-in-embeddable-JARs.patch b/patches/0003-fix-relocate-javax.annotation-in-embeddable-JARs.patch
@@ -1,7 +1,7 @@
 From 31726352002706034f43e21d807774bd48d38511 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <contact@itsaky.com>
 Date: Wed, 11 Mar 2026 16:44:52 +0530
-Subject: [PATCH 03/12] fix: relocate javax.annotation in embeddable JARs
+Subject: [PATCH 03/13] fix: relocate javax.annotation in embeddable JARs
 
 Classes from the javax.annotation package cause duplicate class errors in Android projects.
 
diff --git a/patches/0004-feat-add-analysis-api-standalone-embeddable-for-ide-.patch b/patches/0004-feat-add-analysis-api-standalone-embeddable-for-ide-.patch
@@ -1,7 +1,7 @@
 From 6c16fb3d36855b3499ab858379bade4a755c0c91 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <contact@itsaky.com>
 Date: Fri, 13 Mar 2026 19:14:18 +0530
-Subject: [PATCH 04/12] feat: add analysis-api-standalone-embeddable-for-ide
+Subject: [PATCH 04/13] feat: add analysis-api-standalone-embeddable-for-ide
  module
 
 Signed-off-by: Akash Yadav <contact@itsaky.com>
diff --git a/patches/0005-fix-use-SwingUtilities-shim-directly-to-check-for-ap.patch b/patches/0005-fix-use-SwingUtilities-shim-directly-to-check-for-ap.patch
@@ -1,7 +1,7 @@
 From 7084d7c52a41a8262938fde3922d36433b7b6f88 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <contact@itsaky.com>
 Date: Fri, 13 Mar 2026 19:15:23 +0530
-Subject: [PATCH 05/12] fix: use SwingUtilities (shim) directly to check for
+Subject: [PATCH 05/13] fix: use SwingUtilities (shim) directly to check for
  application thread
 
 Signed-off-by: Akash Yadav <contact@itsaky.com>
diff --git a/patches/0006-fix-add-ability-to-provide-custom-CompilerConfigurat.patch b/patches/0006-fix-add-ability-to-provide-custom-CompilerConfigurat.patch
@@ -1,7 +1,7 @@
 From 044d6b2568cb6ce1b432ad68307077296b82e0db Mon Sep 17 00:00:00 2001
 From: Akash Yadav <contact@itsaky.com>
 Date: Fri, 13 Mar 2026 19:16:19 +0530
-Subject: [PATCH 06/12] fix: add ability to provide custom
+Subject: [PATCH 06/13] fix: add ability to provide custom
  CompilerConfiguration to StandaloneAnalysisAPISession
 
 Signed-off-by: Akash Yadav <contact@itsaky.com>
diff --git a/patches/0007-fix-make-LLFlightRecorder-no-op.patch b/patches/0007-fix-make-LLFlightRecorder-no-op.patch
@@ -1,7 +1,7 @@
 From 797b38a8271a02f3656d60056bd80f79cc8b7798 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 18 Mar 2026 21:44:04 +0530
-Subject: [PATCH 07/12] fix: make LLFlightRecorder no-op
+Subject: [PATCH 07/13] fix: make LLFlightRecorder no-op
 
 jdk.jfr is not available on Android.
 
diff --git a/patches/0008-feat-package-AndroidUnsafe-within-embeddable-jar.patch b/patches/0008-feat-package-AndroidUnsafe-within-embeddable-jar.patch
@@ -1,7 +1,7 @@
 From e20d9c3af823b10fe95dcf414e92c321bc9b330a Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 25 Mar 2026 17:25:33 +0530
-Subject: [PATCH 08/12] feat: package AndroidUnsafe within embeddable jar
+Subject: [PATCH 08/13] feat: package AndroidUnsafe within embeddable jar
 
 This also ensures that the usages of Unsafe are already relocated in the JAR file, significantly reducing the build times of consuming projects.
 
diff --git a/patches/0009-feat-provide-shims-for-SwingUtilities.patch b/patches/0009-feat-provide-shims-for-SwingUtilities.patch
@@ -1,7 +1,7 @@
 From ad493d46660d463634cf5e088d3805cb60d43fbc Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 25 Mar 2026 18:33:05 +0530
-Subject: [PATCH 09/12] feat: provide shims for SwingUtilities
+Subject: [PATCH 09/13] feat: provide shims for SwingUtilities
 
 Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
 ---
diff --git a/patches/0010-fix-add-missing-classes-from-trove4j.patch b/patches/0010-fix-add-missing-classes-from-trove4j.patch
@@ -1,7 +1,7 @@
 From 7fe5a8092769a44e0e907ec791be4f1b178334ba Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 25 Mar 2026 19:10:14 +0530
-Subject: [PATCH 10/12] fix: add missing classes from trove4j
+Subject: [PATCH 10/13] fix: add missing classes from trove4j
 
 Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
 ---
diff --git a/patches/0011-fix-add-shim-for-IntelliJCoroutines.patch b/patches/0011-fix-add-shim-for-IntelliJCoroutines.patch
@@ -1,7 +1,7 @@
 From cfb1cb53049bb363933586c28214c230e5e8e551 Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 25 Mar 2026 20:26:23 +0530
-Subject: [PATCH 11/12] fix: add shim for IntelliJCoroutines
+Subject: [PATCH 11/13] fix: add shim for IntelliJCoroutines
 
 Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
 ---
diff --git a/patches/0012-fix-add-shim-for-DebugAttachDetectorArgs.patch b/patches/0012-fix-add-shim-for-DebugAttachDetectorArgs.patch
@@ -1,7 +1,7 @@
 From 394054814f1394007f4f8f56cbd89f93b59129cf Mon Sep 17 00:00:00 2001
 From: Akash Yadav <akashyadav@appdevforall.org>
 Date: Wed, 25 Mar 2026 21:11:01 +0530
-Subject: [PATCH 12/12] fix: add shim for DebugAttachDetectorArgs
+Subject: [PATCH 12/13] fix: add shim for DebugAttachDetectorArgs
 
 Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
 ---
diff --git a/patches/0013-fix-add-shims-for-Caffeine-UnsafeAccess.patch b/patches/0013-fix-add-shims-for-Caffeine-UnsafeAccess.patch
@@ -0,0 +1,212 @@
+From 881e208e026237cc10597af60587218869bfcc7c Mon Sep 17 00:00:00 2001
+From: Akash Yadav <akashyadav@appdevforall.org>
+Date: Wed, 25 Mar 2026 23:00:11 +0530
+Subject: [PATCH 13/13] fix: add shims for Caffeine UnsafeAccess
+
+Backed by our own AndroidUnsafe
+
+Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
+---
+ .../build.gradle.kts                          |  8 ++
+ .../benmanes/caffeine/base/UnsafeAccess.java  | 52 +++++++++++
+ .../benmanes/caffeine/cache/UnsafeAccess.java | 86 +++++++++++++++++++
+ .../util/containers/AndroidUnsafe.java        |  5 ++
+ 4 files changed, 151 insertions(+)
+ create mode 100644 prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/base/UnsafeAccess.java
+ create mode 100644 prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/cache/UnsafeAccess.java
+
+diff --git a/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
+index 3c1399b40081..4b408655b465 100644
+--- a/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
++++ b/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
+@@ -91,8 +91,16 @@ tasks.register<ShadowJar>("embeddable") {
+     relocate("javax.swing.SwingUtilities", "com.android.javax.swing.SwingUtilities")
+ 
+     // replace with our Android-compatible implementation
++    exclude("com/intellij/util/DebugAttachDetectorArgs.class")
+     relocate("com.intellij.util.DebugAttachDetectorArgs", "com.android.com.intellij.util.DebugAttachDetectorArgs")
+ 
++    // These are somewhat compatible with Android, but still fail on newer Android version
++    // Replace with our own implementation which makes use of HiddenApiBypass
++    exclude("com/github/benmanes/caffeine/cache/UnsafeAccess.class")
++    exclude("com/github/benmanes/caffeine/base/UnsafeAccess.class")
++    relocate("com.github.benmanes.caffeine.cache.UnsafeAccess", "com.android.com.github.benmanes.caffeine.cache.UnsafeAccess")
++    relocate("com.github.benmanes.caffeine.base.UnsafeAccess", "com.android.com.github.benmanes.caffeine.base.UnsafeAccess")
++
+     packagesToRelocate.forEach {
+         relocate(it, "$kotlinEmbeddableRootPackage.$it")
+     }
+diff --git a/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/base/UnsafeAccess.java b/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/base/UnsafeAccess.java
+new file mode 100644
+index 000000000000..fd3a5c4d932f
+--- /dev/null
++++ b/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/base/UnsafeAccess.java
+@@ -0,0 +1,52 @@
++/*
++ * Copyright 2014 Ben Manes. All Rights Reserved.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package com.android.com.github.benmanes.caffeine.base;
++
++import sun.misc.Unsafe;
++
++/**
++ * Static access to {@link Unsafe} and convenient utility methods for performing low-level, unsafe
++ * operations.
++ * <p>
++ * <b>Warning:</b> This class is scheduled for removal in version 3.0.0.
++ *
++ * @author ben.manes@gmail.com (Ben Manes)
++ * @deprecated Scheduled for removal in version 3.0.0
++ */
++@Deprecated
++@SuppressWarnings("restriction")
++public final class UnsafeAccess {
++    /**
++     * The Unsafe instance.
++     */
++    public static final Unsafe UNSAFE = com.android.com.github.benmanes.caffeine.cache.UnsafeAccess.UNSAFE;
++
++
++    /**
++     * Returns the location of a given static field.
++     *
++     * @param clazz     the class containing the field
++     * @param fieldName the name of the field
++     * @return the address offset of the field
++     */
++    public static long objectFieldOffset(Class<?> clazz, String fieldName) {
++        return com.android.com.github.benmanes.caffeine.cache.UnsafeAccess.objectFieldOffset(clazz, fieldName);
++    }
++
++
++    private UnsafeAccess() {
++    }
++}
+diff --git a/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/cache/UnsafeAccess.java b/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/cache/UnsafeAccess.java
+new file mode 100644
+index 000000000000..084a67464c25
+--- /dev/null
++++ b/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/android/com/github/benmanes/caffeine/cache/UnsafeAccess.java
+@@ -0,0 +1,86 @@
++/*
++ * Copyright 2014 Ben Manes. All Rights Reserved.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package com.android.com.github.benmanes.caffeine.cache;
++
++import com.intellij.util.containers.AndroidUnsafe;
++import org.lsposed.hiddenapibypass.HiddenApiBypass;
++import sun.misc.Unsafe;
++
++import java.lang.reflect.Field;
++import java.util.List;
++
++/**
++ * Static access to {@link Unsafe} and convenient utility methods for performing low-level, unsafe
++ * operations.
++ *
++ * @author ben.manes@gmail.com (Ben Manes)
++ */
++public final class UnsafeAccess {
++
++    public static final Unsafe UNSAFE;
++
++    static {
++        UNSAFE = AndroidUnsafe.getUnsafe();
++    }
++
++    /**
++     * Returns the location of a given static field.
++     *
++     * @param clazz     the class containing the field
++     * @param fieldName the name of the field
++     * @return the address offset of the field
++     */
++    public static long objectFieldOffset(Class<?> clazz, String fieldName) {
++        return AndroidUnsafe.objectFieldOffset(tryGetField(clazz, fieldName));
++    }
++
++
++    private static Field tryGetField(Class<?> clazz, String fieldName) {
++        try {
++            return clazz.getDeclaredField(fieldName);
++        }
++        catch (NoSuchFieldException | SecurityException e) {
++            try {
++                return clazz.getField(fieldName);
++            }
++            catch (NoSuchFieldException | SecurityException e1) {
++                try {
++                    List<Field> staticFields = HiddenApiBypass.getStaticFields(clazz);
++                    List<Field> instanceFields = HiddenApiBypass.getInstanceFields(clazz);
++                    for (Field field : staticFields) {
++                        if (field.getName().equals(fieldName)) {
++                            return field;
++                        }
++                    }
++
++                    for (Field field : instanceFields) {
++                        if (field.getName().equals(fieldName)) {
++                            return field;
++                        }
++                    }
++                }
++                catch (Throwable _e) {
++                    throw new Error(e);
++                }
++            }
++        }
++
++        throw new RuntimeException(fieldName + " not found in " + clazz);
++    }
++
++    private UnsafeAccess() {
++    }
++}
+diff --git a/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/intellij/util/containers/AndroidUnsafe.java b/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/intellij/util/containers/AndroidUnsafe.java
+index 4c179310346d..bb7b43828567 100644
+--- a/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/intellij/util/containers/AndroidUnsafe.java
++++ b/prepare/ide-plugin-dependencies/android-shims/src/main/java/com/intellij/util/containers/AndroidUnsafe.java
+@@ -7,6 +7,7 @@ package com.intellij.util.containers;
+ 
+ import android.util.Log;
+ import org.lsposed.hiddenapibypass.HiddenApiBypass;
++import sun.misc.Unsafe;
+ 
+ import java.lang.reflect.Field;
+ import java.lang.reflect.Method;
+@@ -134,4 +135,8 @@ public class AndroidUnsafe {
+ 		m.setAccessible(true);
+ 		return m;
+ 	}
++
++    public static Unsafe getUnsafe() {
++		return (Unsafe) unsafe;
++    }
+ }
+-- 
+2.53.0
+
