Skip to content
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

Exclude annotation members from aggressive overloading #453

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exclude annotation members from aggressive overloading #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion base/src/main/java/proguard/obfuscate/MemberNameCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void visitAnyMember(Clazz clazz, Member member)
String descriptor = member.getDescriptor(clazz);

// Check whether we're allowed to do aggressive overloading
if (!allowAggressiveOverloading)
if (!allowAggressiveOverloading || clazz.extendsOrImplements("java/lang/annotation/Annotation"))
{
// Trim the return argument from the descriptor if not.
// Works for fields and methods alike.
Expand Down
2 changes: 1 addition & 1 deletion base/src/main/java/proguard/obfuscate/MemberNameConflictFixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private void visitMember(Clazz clazz,
String descriptor = member.getDescriptor(clazz);

// Check whether we're allowed to overload aggressively.
if (!allowAggressiveOverloading)
if (!allowAggressiveOverloading || clazz.extendsOrImplements("java/lang/annotation/Annotation"))
{
// Trim the return argument from the descriptor if not.
// Works for fields and methods alike.
Expand Down
2 changes: 1 addition & 1 deletion base/src/main/java/proguard/obfuscate/MemberObfuscator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void visitAnyMember(Clazz clazz, Member member)
String descriptor = member.getDescriptor(clazz);

// Check whether we're allowed to overload aggressively.
if (!allowAggressiveOverloading)
if (!allowAggressiveOverloading || clazz.extendsOrImplements("java/lang/annotation/Annotation"))
{
// Trim the return argument from the descriptor if not.
// Works for fields and methods alike.
Expand Down