Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
2f5dd171
J
jadx
项目概览
keyescgm
/
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,发现更多精彩内容 >>
未验证
提交
2f5dd171
编写于
12月 09, 2020
作者:
J
Jonas Konrad
提交者:
GitHub
12月 09, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: do not remove method start block when it is referenced from dead code (PR #1044)
上级
e7598d43
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
30 addition
and
3 deletion
+30
-3
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockSplitter.java
...ava/jadx/core/dex/visitors/blocksmaker/BlockSplitter.java
+3
-3
jadx-core/src/test/java/jadx/tests/integration/others/TestDeadBlockReferencesStart.java
...ests/integration/others/TestDeadBlockReferencesStart.java
+16
-0
jadx-core/src/test/smali/others/TestDeadBlockReferencesStart.smali
.../src/test/smali/others/TestDeadBlockReferencesStart.smali
+11
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockSplitter.java
浏览文件 @
2f5dd171
...
...
@@ -339,7 +339,7 @@ public class BlockSplitter extends AbstractVisitor {
Set
<
BlockNode
>
toRemove
=
new
LinkedHashSet
<>();
for
(
BlockNode
block
:
mth
.
getBasicBlocks
())
{
if
(
block
.
getPredecessors
().
isEmpty
()
&&
block
!=
mth
.
getEnterBlock
())
{
collectSuccessors
(
block
,
toRemove
);
collectSuccessors
(
block
,
mth
.
getEnterBlock
(),
toRemove
);
}
}
if
(
toRemove
.
isEmpty
())
{
...
...
@@ -390,7 +390,7 @@ public class BlockSplitter extends AbstractVisitor {
&&
!
block
.
contains
(
AFlag
.
MTH_ENTER_BLOCK
);
}
private
static
void
collectSuccessors
(
BlockNode
startBlock
,
Set
<
BlockNode
>
toRemove
)
{
private
static
void
collectSuccessors
(
BlockNode
startBlock
,
BlockNode
methodEnterBlock
,
Set
<
BlockNode
>
toRemove
)
{
Deque
<
BlockNode
>
stack
=
new
ArrayDeque
<>();
stack
.
add
(
startBlock
);
while
(!
stack
.
isEmpty
())
{
...
...
@@ -398,7 +398,7 @@ public class BlockSplitter extends AbstractVisitor {
if
(!
toRemove
.
contains
(
block
))
{
toRemove
.
add
(
block
);
for
(
BlockNode
successor
:
block
.
getSuccessors
())
{
if
(
toRemove
.
containsAll
(
successor
.
getPredecessors
()))
{
if
(
successor
!=
methodEnterBlock
&&
toRemove
.
containsAll
(
successor
.
getPredecessors
()))
{
stack
.
push
(
successor
);
}
}
...
...
jadx-core/src/test/java/jadx/tests/integration/others/TestDeadBlockReferencesStart.java
0 → 100644
浏览文件 @
2f5dd171
package
jadx.tests.integration.others
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
countString
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
public
class
TestDeadBlockReferencesStart
extends
SmaliTest
{
@Test
public
void
test
()
{
String
code
=
getClassNodeFromSmali
().
getCode
().
getCodeStr
();
assertThat
(
code
,
countString
(
0
,
"throw"
));
}
}
jadx-core/src/test/smali/others/TestDeadBlockReferencesStart.smali
0 → 100644
浏览文件 @
2f5dd171
.class Lothers/TestDeadBlockReferencesStart;
.super Ljava/lang/Object;
.method public test()V
.registers 6
:start
return-void
goto :start
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录