Skip to content

Fix field access flags preservation and module exports/opens relocation in RelocatorRemapper #1952

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 3 commits into from
Mar 3, 2026
Merged

Fix field access flags preservation and module exports/opens relocation in RelocatorRemapper #1952

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ded953
Initial plan
Copilot Mar 3, 2026
85527a8
Fix field flags and module exports/opens relocation in RelocatorRemapper
Copilot Mar 3, 2026
5c2104c
Fix compilation error and spotless format violations in RelocatorRema…
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
29 changes: 26 additions & 3 deletions 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 @@ -24,6 +24,8 @@ import java.lang.classfile.attribute.ExceptionsAttribute
import java.lang.classfile.attribute.InnerClassInfo
import java.lang.classfile.attribute.InnerClassesAttribute
import java.lang.classfile.attribute.ModuleAttribute
import java.lang.classfile.attribute.ModuleExportInfo
import java.lang.classfile.attribute.ModuleOpenInfo
import java.lang.classfile.attribute.ModuleProvideInfo
import java.lang.classfile.attribute.NestHostAttribute
import java.lang.classfile.attribute.NestMembersAttribute
Expand Down Expand Up @@ -55,6 +57,7 @@ import java.lang.constant.DynamicCallSiteDesc
import java.lang.constant.DynamicConstantDesc
import java.lang.constant.MethodHandleDesc
import java.lang.constant.MethodTypeDesc
import java.lang.constant.PackageDesc
import java.util.regex.Pattern

/**
Expand All @@ -75,7 +78,7 @@ internal class RelocatorRemapper(
cle.fieldName().stringValue(),
mapClassDesc(ClassDesc.ofDescriptor(cle.fieldType().stringValue())),
) { fb ->
fb.transform(cle, asFieldTransform())
fb.withFlags(cle.flags().flagsMask()).transform(cle, asFieldTransform())
}
is MethodModel ->
clb.withMethod(
Expand Down Expand Up @@ -123,8 +126,28 @@ internal class RelocatorRemapper(
cle.moduleFlagsMask(),
cle.moduleVersion().orElse(null),
cle.requires(),
cle.exports(),
cle.opens(),
cle.exports().map { mei ->
ModuleExportInfo.of(
clb
.constantPool()
.packageEntry(
PackageDesc.ofInternalName(map(mei.exportedPackage().asSymbol().internalName()))
),
mei.exportsFlagsMask(),
mei.exportsTo(),
)
},
cle.opens().map { moi ->
ModuleOpenInfo.of(
clb
.constantPool()
.packageEntry(
PackageDesc.ofInternalName(map(moi.openedPackage().asSymbol().internalName()))
),
moi.opensFlagsMask(),
moi.opensTo(),
)
},
cle.uses().map { clb.constantPool().classEntry(mapClassDesc(it.asSymbol())!!) },
cle.provides().map { mp ->
ModuleProvideInfo.of(
Expand Down