Magic-Mirror/dex2jar
1
0
Fork 0
mirror of https://github.com/pxb1988/dex2jar.git synced 2024-11-23 05:10:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherry-pick form

Browse Source 
85e41523ee
ffa0574dff
56e6c8602c
This commit is contained in:
Nico Mexis 2021-08-09 22:52:12 +02:00 committed by Bob Pan
parent 62eba635fd
commit c577db0da3
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NOTICE.txt
View File

@ -3,6 +3,7 @@ Copyright (c) 2009-2014 Panxiaobo
contributors contributors
- Bob Pan <pxb1988#gmail.com> - Bob Pan <pxb1988#gmail.com>
- HyperSpeeed <nico.mexis#kabelmail.de>
- Enea Stanzani <aeneas.ltr#gmail.com> - Enea Stanzani <aeneas.ltr#gmail.com>
- t3stwhat <t3stwhat#gmail.com> - t3stwhat <t3stwhat#gmail.com>
- paulhooijenga <paulhooijenga#gmail.com> - paulhooijenga <paulhooijenga#gmail.com>

21
dex-ir/src/main/java/com/googlecode/dex2jar/ir/ts/TypeTransformer.java
View File

@ -335,23 +335,18 @@ public class TypeTransformer implements Transformer {
public boolean addUses(String ele) { public boolean addUses(String ele) {
assert this.next == null; assert this.next == null;
TypeRef t = this; if (this.uses == null) {
if (t.uses != null) { this.uses = new HashSet<>();
return t.uses.add(ele);
} else {
t.uses = new HashSet<>();
return t.uses.add(ele);
} }
return this.uses.add(ele);
} }
public boolean addAllUses(Set<String> uses) { public boolean addAllUses(Set<String> uses) {
assert this.next == null; assert this.next == null;
if (uses != null) { if (this.uses == null) {
return uses.addAll(uses); this.uses = new HashSet<>();
} else {
uses = new HashSet<>();
return uses.addAll(uses);
} }
return this.uses.addAll(uses);
} }
} }
@ -632,10 +627,10 @@ public class TypeTransformer implements Transformer {
return mergeObjectType(a, b); return mergeObjectType(a, b);
} else { } else {
String elementTypeA = a.substring(as); String elementTypeA = a.substring(as);
String elementTypeB = a.substring(bs); String elementTypeB = b.substring(bs);
if (as < bs) { if (as < bs) {
return buildArray(elementTypeB.charAt(0) == 'L' ? bs : bs - 1, "L"); return buildArray(elementTypeB.charAt(0) == 'L' ? bs : bs - 1, "L");
} else if (bs > as) { } else if (as > bs) {
return buildArray(elementTypeA.charAt(0) == 'L' ? as : as - 1, "L"); return buildArray(elementTypeA.charAt(0) == 'L' ? as : as - 1, "L");
} else { // as==bs } else { // as==bs
if (elementTypeA.charAt(0) != 'L' || elementTypeB.charAt(0) != 'L') { if (elementTypeA.charAt(0) != 'L' || elementTypeB.charAt(0) != 'L') {