Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
极致猎手
jadx
提交
cb03532b
J
jadx
项目概览
极致猎手
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
cb03532b
编写于
3月 14, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: allow implicit type cast for array operations (#1407)
上级
c93e9eea
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
120 addition
and
10 deletion
+120
-10
jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
...src/main/java/jadx/core/dex/instructions/InsnDecoder.java
+14
-6
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
...core/dex/visitors/typeinference/TypeInferenceVisitor.java
+36
-0
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdate.java
...java/jadx/core/dex/visitors/typeinference/TypeUpdate.java
+26
-4
jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver19.java
...java/jadx/tests/integration/types/TestTypeResolver19.java
+44
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
浏览文件 @
cb03532b
...
@@ -389,11 +389,11 @@ public class InsnDecoder {
...
@@ -389,11 +389,11 @@ public class InsnDecoder {
return
arrLenInsn
;
return
arrLenInsn
;
case
AGET:
case
AGET:
return
arrayGet
(
insn
,
ArgType
.
INT_FLOAT
);
return
arrayGet
(
insn
,
ArgType
.
INT_FLOAT
,
ArgType
.
NARROW_NUMBERS_NO_BOOL
);
case
AGET_BOOLEAN:
case
AGET_BOOLEAN:
return
arrayGet
(
insn
,
ArgType
.
BOOLEAN
);
return
arrayGet
(
insn
,
ArgType
.
BOOLEAN
);
case
AGET_BYTE:
case
AGET_BYTE:
return
arrayGet
(
insn
,
ArgType
.
BYTE
);
return
arrayGet
(
insn
,
ArgType
.
BYTE
,
ArgType
.
NARROW_INTEGRAL
);
case
AGET_BYTE_BOOLEAN:
case
AGET_BYTE_BOOLEAN:
return
arrayGet
(
insn
,
ArgType
.
BYTE_BOOLEAN
);
return
arrayGet
(
insn
,
ArgType
.
BYTE_BOOLEAN
);
case
AGET_CHAR:
case
AGET_CHAR:
...
@@ -406,7 +406,7 @@ public class InsnDecoder {
...
@@ -406,7 +406,7 @@ public class InsnDecoder {
return
arrayGet
(
insn
,
ArgType
.
UNKNOWN_OBJECT
);
return
arrayGet
(
insn
,
ArgType
.
UNKNOWN_OBJECT
);
case
APUT:
case
APUT:
return
arrayPut
(
insn
,
ArgType
.
INT_FLOAT
);
return
arrayPut
(
insn
,
ArgType
.
INT_FLOAT
,
ArgType
.
NARROW_NUMBERS_NO_BOOL
);
case
APUT_BOOLEAN:
case
APUT_BOOLEAN:
return
arrayPut
(
insn
,
ArgType
.
BOOLEAN
);
return
arrayPut
(
insn
,
ArgType
.
BOOLEAN
);
case
APUT_BYTE:
case
APUT_BYTE:
...
@@ -607,16 +607,24 @@ public class InsnDecoder {
...
@@ -607,16 +607,24 @@ public class InsnDecoder {
}
}
private
InsnNode
arrayGet
(
InsnData
insn
,
ArgType
argType
)
{
private
InsnNode
arrayGet
(
InsnData
insn
,
ArgType
argType
)
{
return
arrayGet
(
insn
,
argType
,
argType
);
}
private
InsnNode
arrayGet
(
InsnData
insn
,
ArgType
arrElemType
,
ArgType
resType
)
{
InsnNode
inode
=
new
InsnNode
(
InsnType
.
AGET
,
2
);
InsnNode
inode
=
new
InsnNode
(
InsnType
.
AGET
,
2
);
inode
.
setResult
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
0
,
arg
Type
));
inode
.
setResult
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
0
,
res
Type
));
inode
.
addArg
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
1
,
ArgType
.
array
(
ar
g
Type
)));
inode
.
addArg
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
1
,
ArgType
.
array
(
ar
rElem
Type
)));
inode
.
addArg
(
InsnArg
.
reg
(
insn
,
2
,
ArgType
.
NARROW_INTEGRAL
));
inode
.
addArg
(
InsnArg
.
reg
(
insn
,
2
,
ArgType
.
NARROW_INTEGRAL
));
return
inode
;
return
inode
;
}
}
private
InsnNode
arrayPut
(
InsnData
insn
,
ArgType
argType
)
{
private
InsnNode
arrayPut
(
InsnData
insn
,
ArgType
argType
)
{
return
arrayPut
(
insn
,
argType
,
argType
);
}
private
InsnNode
arrayPut
(
InsnData
insn
,
ArgType
arrElemType
,
ArgType
argType
)
{
InsnNode
inode
=
new
InsnNode
(
InsnType
.
APUT
,
3
);
InsnNode
inode
=
new
InsnNode
(
InsnType
.
APUT
,
3
);
inode
.
addArg
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
1
,
ArgType
.
array
(
ar
g
Type
)));
inode
.
addArg
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
1
,
ArgType
.
array
(
ar
rElem
Type
)));
inode
.
addArg
(
InsnArg
.
reg
(
insn
,
2
,
ArgType
.
NARROW_INTEGRAL
));
inode
.
addArg
(
InsnArg
.
reg
(
insn
,
2
,
ArgType
.
NARROW_INTEGRAL
));
inode
.
addArg
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
0
,
argType
));
inode
.
addArg
(
InsnArg
.
typeImmutableIfKnownReg
(
insn
,
0
,
argType
));
return
inode
;
return
inode
;
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
浏览文件 @
cb03532b
...
@@ -87,6 +87,7 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
...
@@ -87,6 +87,7 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
this
::
tryDeduceTypes
,
this
::
tryDeduceTypes
,
this
::
trySplitConstInsns
,
this
::
trySplitConstInsns
,
this
::
tryToFixIncompatiblePrimitives
,
this
::
tryToFixIncompatiblePrimitives
,
this
::
tryToForceImmutableTypes
,
this
::
tryInsertAdditionalMove
,
this
::
tryInsertAdditionalMove
,
this
::
runMultiVariableSearch
,
this
::
runMultiVariableSearch
,
this
::
tryRemoveGenerics
);
this
::
tryRemoveGenerics
);
...
@@ -835,6 +836,7 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
...
@@ -835,6 +836,7 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
if
(
typeInfo
.
getType
().
isTypeKnown
())
{
if
(
typeInfo
.
getType
().
isTypeKnown
())
{
return
false
;
return
false
;
}
}
boolean
assigned
=
false
;
for
(
ITypeBound
bound
:
typeInfo
.
getBounds
())
{
for
(
ITypeBound
bound
:
typeInfo
.
getBounds
())
{
ArgType
boundType
=
bound
.
getType
();
ArgType
boundType
=
bound
.
getType
();
switch
(
bound
.
getBound
())
{
switch
(
bound
.
getBound
())
{
...
@@ -842,6 +844,7 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
...
@@ -842,6 +844,7 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
if
(!
boundType
.
contains
(
PrimitiveType
.
BOOLEAN
))
{
if
(!
boundType
.
contains
(
PrimitiveType
.
BOOLEAN
))
{
return
false
;
return
false
;
}
}
assigned
=
true
;
break
;
break
;
case
USE:
case
USE:
if
(!
boundType
.
canBeAnyNumber
())
{
if
(!
boundType
.
canBeAnyNumber
())
{
...
@@ -850,6 +853,9 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
...
@@ -850,6 +853,9 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
break
;
break
;
}
}
}
}
if
(!
assigned
)
{
return
false
;
}
boolean
fixed
=
false
;
boolean
fixed
=
false
;
for
(
ITypeBound
bound
:
typeInfo
.
getBounds
())
{
for
(
ITypeBound
bound
:
typeInfo
.
getBounds
())
{
...
@@ -932,6 +938,36 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
...
@@ -932,6 +938,36 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
return
convertInsn
;
return
convertInsn
;
}
}
private
boolean
tryToForceImmutableTypes
(
MethodNode
mth
)
{
boolean
fixed
=
false
;
for
(
SSAVar
ssaVar
:
mth
.
getSVars
())
{
ArgType
type
=
ssaVar
.
getTypeInfo
().
getType
();
if
(!
type
.
isTypeKnown
()
&&
ssaVar
.
isTypeImmutable
())
{
if
(
forceImmutableType
(
ssaVar
))
{
fixed
=
true
;
}
}
}
if
(!
fixed
)
{
return
false
;
}
return
runTypePropagation
(
mth
);
}
private
boolean
forceImmutableType
(
SSAVar
ssaVar
)
{
for
(
RegisterArg
useArg
:
ssaVar
.
getUseList
())
{
InsnNode
parentInsn
=
useArg
.
getParentInsn
();
if
(
parentInsn
!=
null
)
{
InsnType
insnType
=
parentInsn
.
getType
();
if
(
insnType
==
InsnType
.
AGET
||
insnType
==
InsnType
.
APUT
)
{
ssaVar
.
setType
(
ssaVar
.
getImmutableType
());
return
true
;
}
}
}
return
false
;
}
private
static
void
assignImmutableTypes
(
MethodNode
mth
)
{
private
static
void
assignImmutableTypes
(
MethodNode
mth
)
{
for
(
SSAVar
ssaVar
:
mth
.
getSVars
())
{
for
(
SSAVar
ssaVar
:
mth
.
getSVars
())
{
ArgType
immutableType
=
getSsaImmutableType
(
ssaVar
);
ArgType
immutableType
=
getSsaImmutableType
(
ssaVar
);
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdate.java
浏览文件 @
cb03532b
...
@@ -513,7 +513,18 @@ public final class TypeUpdate {
...
@@ -513,7 +513,18 @@ public final class TypeUpdate {
private
TypeUpdateResult
arrayGetListener
(
TypeUpdateInfo
updateInfo
,
InsnNode
insn
,
InsnArg
arg
,
ArgType
candidateType
)
{
private
TypeUpdateResult
arrayGetListener
(
TypeUpdateInfo
updateInfo
,
InsnNode
insn
,
InsnArg
arg
,
ArgType
candidateType
)
{
if
(
isAssign
(
insn
,
arg
))
{
if
(
isAssign
(
insn
,
arg
))
{
return
updateTypeChecked
(
updateInfo
,
insn
.
getArg
(
0
),
ArgType
.
array
(
candidateType
));
TypeUpdateResult
result
=
updateTypeChecked
(
updateInfo
,
insn
.
getArg
(
0
),
ArgType
.
array
(
candidateType
));
if
(
result
==
REJECT
)
{
ArgType
arrType
=
insn
.
getArg
(
0
).
getType
();
if
(
arrType
.
isTypeKnown
()
&&
arrType
.
isArray
()
&&
arrType
.
getArrayElement
().
isPrimitive
())
{
TypeCompareEnum
compResult
=
comparator
.
compareTypes
(
candidateType
,
arrType
.
getArrayElement
());
if
(
compResult
==
TypeCompareEnum
.
WIDER
)
{
// allow implicit upcast for primitive types (int a = byteArr[n])
return
CHANGED
;
}
}
}
return
result
;
}
}
InsnArg
arrArg
=
insn
.
getArg
(
0
);
InsnArg
arrArg
=
insn
.
getArg
(
0
);
if
(
arrArg
==
arg
)
{
if
(
arrArg
==
arg
)
{
...
@@ -521,7 +532,18 @@ public final class TypeUpdate {
...
@@ -521,7 +532,18 @@ public final class TypeUpdate {
if
(
arrayElement
==
null
)
{
if
(
arrayElement
==
null
)
{
return
REJECT
;
return
REJECT
;
}
}
return
updateTypeChecked
(
updateInfo
,
insn
.
getResult
(),
arrayElement
);
TypeUpdateResult
result
=
updateTypeChecked
(
updateInfo
,
insn
.
getResult
(),
arrayElement
);
if
(
result
==
REJECT
)
{
ArgType
resType
=
insn
.
getResult
().
getType
();
if
(
resType
.
isTypeKnown
()
&&
resType
.
isPrimitive
())
{
TypeCompareEnum
compResult
=
comparator
.
compareTypes
(
resType
,
arrayElement
);
if
(
compResult
==
TypeCompareEnum
.
WIDER
)
{
// allow implicit upcast for primitive types (int a = byteArr[n])
return
CHANGED
;
}
}
}
return
result
;
}
}
// index argument
// index argument
return
SAME
;
return
SAME
;
...
@@ -538,10 +560,10 @@ public final class TypeUpdate {
...
@@ -538,10 +560,10 @@ public final class TypeUpdate {
TypeUpdateResult
result
=
updateTypeChecked
(
updateInfo
,
putArg
,
arrayElement
);
TypeUpdateResult
result
=
updateTypeChecked
(
updateInfo
,
putArg
,
arrayElement
);
if
(
result
==
REJECT
)
{
if
(
result
==
REJECT
)
{
ArgType
putType
=
putArg
.
getType
();
ArgType
putType
=
putArg
.
getType
();
if
(
putType
.
isTypeKnown
()
&&
!
putType
.
isPrimitive
()
)
{
if
(
putType
.
isTypeKnown
())
{
TypeCompareEnum
compResult
=
comparator
.
compareTypes
(
arrayElement
,
putType
);
TypeCompareEnum
compResult
=
comparator
.
compareTypes
(
arrayElement
,
putType
);
if
(
compResult
==
TypeCompareEnum
.
WIDER
||
compResult
==
TypeCompareEnum
.
WIDER_BY_GENERIC
)
{
if
(
compResult
==
TypeCompareEnum
.
WIDER
||
compResult
==
TypeCompareEnum
.
WIDER_BY_GENERIC
)
{
// allow wider result (i.e
allow put in Object[] any objects
)
// allow wider result (i.e
. allow put any objects in Object[] or byte in int[]
)
return
CHANGED
;
return
CHANGED
;
}
}
}
}
...
...
jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver19.java
0 → 100644
浏览文件 @
cb03532b
package
jadx.tests.integration.types
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
/**
* Issue 1407
*/
public
class
TestTypeResolver19
extends
SmaliTest
{
public
static
class
TestCls
{
public
static
int
[]
test
(
byte
[]
bArr
)
{
int
[]
iArr
=
new
int
[
bArr
.
length
];
for
(
int
i
=
0
;
i
<
bArr
.
length
;
i
++)
{
iArr
[
i
]
=
bArr
[
i
];
}
return
iArr
;
}
public
static
int
[]
test2
(
byte
[]
bArr
)
{
int
[]
iArr
=
new
int
[
bArr
.
length
];
for
(
int
i
=
0
;
i
<
bArr
.
length
;
i
++)
{
int
i2
=
bArr
[
i
];
if
(
i2
<
0
)
{
i2
=
(
int
)
((
long
)
i2
&
0xFFFF_FFFF
L
);
}
iArr
[
i
]
=
i2
;
}
return
iArr
;
}
}
@Test
public
void
test
()
{
noDebugInfo
();
assertThat
(
getClassNode
(
TestCls
.
class
))
.
code
()
.
containsOne
(
"iArr[i] = bArr[i];"
)
.
containsOne
(
"iArr[i] = i2;"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录