-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: check synthetic methods before remove/inline (#1560)
- Loading branch information
Showing
4 changed files
with
91 additions
and
26 deletions.
There are no files selected for viewing
This file contains 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 contains 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
47 changes: 47 additions & 0 deletions
47
jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java
This file contains 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,47 @@ | ||
package jadx.tests.integration.inline; | ||
|
||
import java.util.Collections; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
import jadx.tests.api.SmaliTest; | ||
|
||
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat; | ||
|
||
@SuppressWarnings("CommentedOutCode") | ||
public class TestOverlapSyntheticMethods extends SmaliTest { | ||
// @formatter:off | ||
/* | ||
public String test(int i) { | ||
return a(i) + "|" + a(i); | ||
} | ||
public int a(int i) { | ||
return i; | ||
} | ||
public String a(int i) { | ||
return "i:" + i; | ||
} | ||
*/ | ||
// @formatter:on | ||
|
||
@Test | ||
public void testSmali() { | ||
assertThat(getClassNodeFromSmali()) | ||
.code() | ||
.containsOne("int a(int i) {") | ||
.containsOne("String m0a(int i) {"); | ||
} | ||
|
||
@Test | ||
public void testSmaliNoRename() { | ||
getArgs().setRenameFlags(Collections.emptySet()); | ||
disableCompilation(); | ||
assertThat(getClassNodeFromSmali()) | ||
.code() | ||
.containsOne("int a(int i) {") | ||
.containsOne("String a(int i) {") | ||
.containsOne("return a(i) + \"|\" + a(i);"); | ||
} | ||
} |
41 changes: 41 additions & 0 deletions
41
jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali
This file contains 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,41 @@ | ||
.class public Linline/TestOverlapSyntheticMethods; | ||
.super Ljava/lang/Object; | ||
|
||
.method public synthetic a(I)I | ||
.registers 2 | ||
return p1 | ||
.end method | ||
|
||
.method public synthetic a(I)Ljava/lang/String; | ||
.registers 4 | ||
new-instance v0, Ljava/lang/StringBuilder; | ||
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V | ||
const-string v1, "i:" | ||
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; | ||
move-result-object v0 | ||
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; | ||
move-result-object v0 | ||
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; | ||
move-result-object v0 | ||
return-object v0 | ||
.end method | ||
|
||
.method public test(I)Ljava/lang/String; | ||
.registers 4 | ||
new-instance v0, Ljava/lang/StringBuilder; | ||
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V | ||
invoke-virtual {p0, p1}, Linline/TestOverlapSyntheticMethods;->a(I)I | ||
move-result v1 | ||
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; | ||
move-result-object v0 | ||
const-string v1, "|" | ||
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; | ||
move-result-object v0 | ||
invoke-virtual {p0, p1}, Linline/TestOverlapSyntheticMethods;->a(I)Ljava/lang/String; | ||
move-result-object v1 | ||
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; | ||
move-result-object v0 | ||
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; | ||
move-result-object v0 | ||
return-object v0 | ||
.end method |