Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
极致猎手
jadx
提交
0deafb76
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 搜索 >>
提交
0deafb76
编写于
11月 09, 2020
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: correct merge code variables across PHI instructions (#930)
上级
cd612b45
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
151 addition
and
5 deletion
+151
-5
jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
...src/main/java/jadx/core/dex/instructions/args/SSAVar.java
+21
-0
jadx-core/src/main/java/jadx/core/dex/visitors/InitCodeVariables.java
...c/main/java/jadx/core/dex/visitors/InitCodeVariables.java
+8
-5
jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInLoop.java
...jadx/tests/integration/variables/TestVariablesInLoop.java
+19
-0
jadx-core/src/test/smali/variables/TestVariablesInLoop.smali
jadx-core/src/test/smali/variables/TestVariablesInLoop.smali
+103
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
浏览文件 @
0deafb76
...
...
@@ -166,6 +166,27 @@ public class SSAVar {
return
usedInPhi
;
}
/**
* Concat assign PHI insn and usedInPhi
*/
public
List
<
PhiInsn
>
getPhiList
()
{
InsnNode
assignInsn
=
getAssign
().
getParentInsn
();
if
(
assignInsn
!=
null
&&
assignInsn
.
getType
()
==
InsnType
.
PHI
)
{
PhiInsn
assignPhi
=
(
PhiInsn
)
assignInsn
;
if
(
usedInPhi
==
null
)
{
return
Collections
.
singletonList
(
assignPhi
);
}
List
<
PhiInsn
>
list
=
new
ArrayList
<>(
1
+
usedInPhi
.
size
());
list
.
add
(
assignPhi
);
list
.
addAll
(
usedInPhi
);
return
list
;
}
if
(
usedInPhi
==
null
)
{
return
Collections
.
emptyList
();
}
return
usedInPhi
;
}
public
boolean
isUsedInPhi
()
{
return
usedInPhi
!=
null
&&
!
usedInPhi
.
isEmpty
();
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/InitCodeVariables.java
浏览文件 @
0deafb76
...
...
@@ -70,11 +70,11 @@ public class InitCodeVariables extends AbstractVisitor {
}
private
static
void
setCodeVar
(
SSAVar
ssaVar
,
CodeVar
codeVar
)
{
List
<
PhiInsn
>
usedInPhiList
=
ssaVar
.
getUsedInPhi
();
if
(!
usedInP
hiList
.
isEmpty
())
{
List
<
PhiInsn
>
phiList
=
ssaVar
.
getPhiList
();
if
(!
p
hiList
.
isEmpty
())
{
Set
<
SSAVar
>
vars
=
new
LinkedHashSet
<>();
vars
.
add
(
ssaVar
);
collectConnectedVars
(
usedInP
hiList
,
vars
);
collectConnectedVars
(
p
hiList
,
vars
);
setCodeVarType
(
codeVar
,
vars
);
vars
.
forEach
(
var
->
{
if
(
var
.
isCodeVarSet
())
{
...
...
@@ -105,15 +105,18 @@ public class InitCodeVariables extends AbstractVisitor {
}
private
static
void
collectConnectedVars
(
List
<
PhiInsn
>
phiInsnList
,
Set
<
SSAVar
>
vars
)
{
if
(
phiInsnList
.
isEmpty
())
{
return
;
}
for
(
PhiInsn
phiInsn
:
phiInsnList
)
{
SSAVar
resultVar
=
phiInsn
.
getResult
().
getSVar
();
if
(
vars
.
add
(
resultVar
))
{
collectConnectedVars
(
resultVar
.
get
UsedInPhi
(),
vars
);
collectConnectedVars
(
resultVar
.
get
PhiList
(),
vars
);
}
phiInsn
.
getArguments
().
forEach
(
arg
->
{
SSAVar
sVar
=
((
RegisterArg
)
arg
).
getSVar
();
if
(
vars
.
add
(
sVar
))
{
collectConnectedVars
(
sVar
.
get
UsedInPhi
(),
vars
);
collectConnectedVars
(
sVar
.
get
PhiList
(),
vars
);
}
});
}
...
...
jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInLoop.java
0 → 100644
浏览文件 @
0deafb76
package
jadx.tests.integration.variables
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestVariablesInLoop
extends
SmaliTest
{
@Test
public
void
test
()
{
assertThat
(
getClassNodeFromSmali
())
.
code
()
.
containsOne
(
"int i;"
)
.
countString
(
2
,
"i = 0;"
)
.
doesNotContain
(
"i3"
);
}
}
jadx-core/src/test/smali/variables/TestVariablesInLoop.smali
0 → 100644
浏览文件 @
0deafb76
.class public abstract Lvariables/TestVariablesInLoop;
.super Ljava/lang/Object;
.source "SourceFile"
.implements Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
value = {
"Ljava/lang/Object;",
"Ljava/util/List<",
"Ljava/lang/Long;",
">;"
}
.end annotation
.method static test(Ljava/util/List;)I
.locals 5
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Ljava/util/List<",
"Ljava/lang/Long;",
">;)I"
}
.end annotation
invoke-interface {p0}, Ljava/util/List;->size()I
move-result v0
const/4 v1, 0x0
if-nez v0, :cond_0
return v1
:cond_0
instance-of v2, p0, Lvariables/TestVariablesInLoop;
if-eqz v2, :cond_1
check-cast p0, Lvariables/TestVariablesInLoop;
const/4 v2, 0x0
:goto_0
if-ge v1, v0, :cond_2
invoke-virtual {p0, v1}, Lvariables/TestVariablesInLoop;->getLong(I)J
move-result-wide v3
invoke-static {v3, v4}, Lvariables/TestVariablesInLoop;->mth(J)I
move-result v3
add-int/2addr v2, v3
add-int/lit8 v1, v1, 0x1
goto :goto_0
:cond_1
const/4 v2, 0x0
:goto_1
if-ge v1, v0, :cond_2
invoke-interface {p0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
move-result-object v3
check-cast v3, Ljava/lang/Long;
invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
move-result-wide v3
invoke-static {v3, v4}, Lvariables/TestVariablesInLoop;->mth(J)I
move-result v3
add-int/2addr v2, v3
add-int/lit8 v1, v1, 0x1
goto :goto_1
:cond_2
return v2
.end method
.method public final getLong(I)J
.locals 2
const/16 v0, 0x0
return-wide v0
.end method
.method static mth(J)I
.locals 2
const/4 v0, 0x0
return v0
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录