-
-
Notifications
You must be signed in to change notification settings - Fork 423
Support Kotlin relocations #1680
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Goooler
merged 3 commits into
g/20250723/relocate-kotlin-metadata
from
g/202508021/kotlin-relocation
Aug 28, 2025
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocationClassWriter.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package com.github.jengelman.gradle.plugins.shadow.internal | ||
|
|
||
| import com.github.jengelman.gradle.plugins.shadow.relocation.RelocateClassContext | ||
| import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator | ||
| import java.lang.reflect.Field | ||
| import org.objectweb.asm.AnnotationVisitor | ||
| import org.objectweb.asm.ClassReader | ||
| import org.objectweb.asm.ClassVisitor | ||
| import org.objectweb.asm.ClassWriter | ||
| import org.objectweb.asm.Opcodes | ||
|
|
||
| internal class RelocationClassWriter( | ||
| classReader: ClassReader, | ||
| relocators: Set<Relocator>, | ||
| flags: Int = 0, | ||
| ) : ClassWriter(classReader, flags) { | ||
| internal var isRelocated = false | ||
|
|
||
| init { | ||
| // If the class is a Kotlin class, we need to apply relocations to the symbol table. | ||
| if (classReader.isKotlinClass()) { | ||
| val symbolTable = symbolTableField.get(this) | ||
|
|
||
| @Suppress("UNCHECKED_CAST") | ||
| val entries = entriesField.get(symbolTable) as Array<Any?> | ||
| entries.forEach { entryObj -> | ||
| if (entryObj != null) { | ||
| (symbolValueField.get(entryObj) as? String)?.let { value -> | ||
| val newValue = relocators.applyClassRelocation(value) | ||
| if (value != newValue) { | ||
| symbolValueField.set(entryObj, newValue) | ||
| isRelocated = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun ClassReader.isKotlinClass(): Boolean { | ||
| var flag = false | ||
| accept( | ||
| object : ClassVisitor(Opcodes.ASM9) { | ||
| override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? { | ||
| if (desc == "Lkotlin/Metadata;") { | ||
| flag = true | ||
| } | ||
| return super.visitAnnotation(desc, visible) | ||
| } | ||
| }, | ||
| ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES, | ||
| ) | ||
| return flag | ||
|
Goooler marked this conversation as resolved.
|
||
| } | ||
|
|
||
| companion object Companion { | ||
| private val classWriterClass = ClassWriter::class.java | ||
| private val symbolTableClass: Class<*> = Class.forName("org.objectweb.asm.SymbolTable") // Package private. | ||
| private val symbolClass: Class<*> = Class.forName("org.objectweb.asm.Symbol") // Package private. | ||
|
|
||
| private val symbolTableField: Field = classWriterClass.getDeclaredField("symbolTable") | ||
| .apply { isAccessible = true } | ||
| private val entriesField: Field = symbolTableClass.getDeclaredField("entries") | ||
| .apply { isAccessible = true } | ||
| private val symbolValueField: Field = symbolClass.getDeclaredField("value") | ||
| .apply { isAccessible = true } | ||
|
|
||
| fun Iterable<Relocator>.applyClassRelocation(value: String): String = fold(value) { string, relocator -> | ||
| relocator.relocateClass(RelocateClassContext(string)) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
43 changes: 0 additions & 43 deletions
43
src/main/kotlin/com/xpdustry/ksr/KotlinShadowRelocatorPlugin.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The isKotlinClass() method creates a ClassVisitor and processes the entire class file to check for a single annotation. This could be expensive for large classes. Consider using ClassReader.readUnsignedShort() and parsing annotations more efficiently, or caching this result to avoid repeated scanning.