Skip to content

Fix ConstantValueAttribute remapping and skipStringConstants short-circuit in RelocatorRemapper #1954

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.

Sign up for GitHub

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 2 commits into from
Mar 3, 2026
+12 −1
Merged

Fix ConstantValueAttribute remapping and skipStringConstants short-circuit in RelocatorRemapper #1954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa7a06
Initial plan
Copilot Mar 3, 2026
134ea29
Fix ConstantValueAttribute remapping and skipStringConstants logic in…
Copilot Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import java.lang.classfile.Signature
import java.lang.classfile.Superclass
import java.lang.classfile.TypeAnnotation
import java.lang.classfile.attribute.AnnotationDefaultAttribute
import java.lang.classfile.attribute.ConstantValueAttribute
import java.lang.classfile.attribute.EnclosingMethodAttribute
import java.lang.classfile.attribute.ExceptionsAttribute
import java.lang.classfile.attribute.InnerClassInfo
Expand All @@ -39,6 +40,7 @@ import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute
import java.lang.classfile.attribute.RuntimeVisibleParameterAnnotationsAttribute
import java.lang.classfile.attribute.RuntimeVisibleTypeAnnotationsAttribute
import java.lang.classfile.attribute.SignatureAttribute
import java.lang.classfile.constantpool.StringEntry
import java.lang.classfile.instruction.ConstantInstruction
import java.lang.classfile.instruction.ExceptionCatch
import java.lang.classfile.instruction.FieldInstruction
Expand Down Expand Up @@ -183,6 +185,15 @@ internal class RelocatorRemapper(

private fun asFieldTransform(): FieldTransform = FieldTransform { fb, fe ->
when (fe) {
is ConstantValueAttribute -> {
val constant = fe.constant()
if (constant is StringEntry) {
val remapped = map(constant.stringValue(), true)
fb.with(ConstantValueAttribute.of(fb.constantPool().stringEntry(remapped)))
} else {
fb.with(fe)
}
}
is SignatureAttribute -> fb.with(SignatureAttribute.of(mapSignature(fe.asTypeSignature())))
is RuntimeVisibleAnnotationsAttribute ->
fb.with(RuntimeVisibleAnnotationsAttribute.of(mapAnnotations(fe.annotations())))
Expand Down Expand Up @@ -518,7 +529,7 @@ internal class RelocatorRemapper(

for (relocator in relocators) {
if (mapLiterals && relocator.skipStringConstants) {
return name
continue
} else if (relocator.canRelocateClass(newName)) {
return prefix + relocator.relocateClass(newName) + suffix
} else if (relocator.canRelocatePath(newName)) {
Expand Down