Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
2c072539
J
jadx
项目概览
Quincy379
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2c072539
编写于
3月 21, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: check variable usage before convert indexed loop to for-each variant (#483)
上级
5a940a3b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
76 addition
and
2 deletion
+76
-2
jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java
...ava/jadx/core/dex/visitors/regions/LoopRegionVisitor.java
+5
-2
jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexedLoop.java
...st/java/jadx/tests/integration/loops/TestIndexedLoop.java
+71
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java
浏览文件 @
2c072539
...
...
@@ -116,7 +116,7 @@ public class LoopRegionVisitor extends AbstractVisitor implements IRegionVisitor
// all checks passed
initInsn
.
add
(
AFlag
.
SKIP
);
incrInsn
.
add
(
AFlag
.
SKIP
);
LoopType
arrForEach
=
checkArrayForEach
(
mth
,
initInsn
,
incrInsn
,
condition
);
LoopType
arrForEach
=
checkArrayForEach
(
mth
,
loopRegion
,
initInsn
,
incrInsn
,
condition
);
if
(
arrForEach
!=
null
)
{
loopRegion
.
setType
(
arrForEach
);
return
true
;
...
...
@@ -125,7 +125,7 @@ public class LoopRegionVisitor extends AbstractVisitor implements IRegionVisitor
return
true
;
}
private
static
LoopType
checkArrayForEach
(
MethodNode
mth
,
InsnNode
initInsn
,
InsnNode
incrInsn
,
private
static
LoopType
checkArrayForEach
(
MethodNode
mth
,
LoopRegion
loopRegion
,
InsnNode
initInsn
,
InsnNode
incrInsn
,
IfCondition
condition
)
{
if
(!(
incrInsn
instanceof
ArithNode
))
{
return
null
;
...
...
@@ -186,6 +186,9 @@ public class LoopRegionVisitor extends AbstractVisitor implements IRegionVisitor
if
(
iterVar
==
null
)
{
return
null
;
}
if
(!
usedOnlyInLoop
(
mth
,
loopRegion
,
iterVar
))
{
return
null
;
}
// array for each loop confirmed
len
.
add
(
AFlag
.
SKIP
);
...
...
jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexedLoop.java
0 → 100644
浏览文件 @
2c072539
package
jadx.tests.integration.loops
;
import
java.io.File
;
import
org.junit.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
static
org
.
hamcrest
.
Matchers
.
nullValue
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestIndexedLoop
extends
IntegrationTest
{
public
static
class
TestCls
{
public
File
test
(
File
[]
files
)
{
File
file
=
null
;
if
(
files
!=
null
)
{
int
length
=
files
.
length
;
if
(
length
==
0
)
{
file
=
null
;
}
else
{
for
(
int
i
=
0
;
i
<
length
;
i
++)
{
file
=
files
[
i
];
if
(
file
.
getName
().
equals
(
"f"
))
{
break
;
}
}
}
}
else
{
file
=
null
;
}
if
(
file
!=
null
)
{
file
.
deleteOnExit
();
}
return
file
;
}
public
void
check
()
{
assertThat
(
test
(
null
),
nullValue
());
assertThat
(
test
(
new
File
[]{}),
nullValue
());
File
file
=
new
File
(
"f"
);
assertThat
(
test
(
new
File
[]{
new
File
(
"a"
),
file
}),
is
(
file
));
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
not
(
containsString
(
"for (File file :"
)));
assertThat
(
code
,
containsOne
(
"for (int i = 0; i < length; i++) {"
));
}
@Test
public
void
testNoDebug
()
{
noDebugInfo
();
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
not
(
containsString
(
"for (File file :"
)));
assertThat
(
code
,
containsOne
(
"for (int i = 0; i < length; i++) {"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录