Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
b861151f
J
jadx
项目概览
ql04210214
/
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,发现更多精彩内容 >>
提交
b861151f
编写于
8月 04, 2018
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: rollback finally block extraction if some blocks not removed (#327)
上级
feeafc40
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
5 deletion
+31
-5
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
+4
-0
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockFinallyExtract.java
...dx/core/dex/visitors/blocksmaker/BlockFinallyExtract.java
+13
-2
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/helpers/BlocksRemoveInfo.java
...re/dex/visitors/blocksmaker/helpers/BlocksRemoveInfo.java
+14
-3
未找到文件。
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
浏览文件 @
b861151f
...
...
@@ -14,6 +14,7 @@ import jadx.core.dex.attributes.nodes.LoopInfo;
import
jadx.core.utils.BlockUtils
;
import
jadx.core.utils.EmptyBitSet
;
import
jadx.core.utils.InsnUtils
;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
import
static
jadx
.
core
.
utils
.
Utils
.
lockList
;
...
...
@@ -70,6 +71,9 @@ public class BlockNode extends AttrNode implements IBlock {
successors
=
lockList
(
successors
);
predecessors
=
lockList
(
predecessors
);
dominatesOn
=
lockList
(
dominatesOn
);
if
(
domFrontier
==
null
)
{
throw
new
JadxRuntimeException
(
"Dominance frontier not set for block: "
+
this
);
}
}
/**
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockFinallyExtract.java
浏览文件 @
b861151f
...
...
@@ -8,6 +8,7 @@ import java.util.LinkedList;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
...
...
@@ -194,11 +195,21 @@ public class BlockFinallyExtract extends AbstractVisitor {
laBefore
.
runAnalysis
();
}
int
removeApplied
=
0
;
for
(
BlocksRemoveInfo
removeInfo
:
removes
)
{
if
(!
applyRemove
(
mth
,
removeInfo
))
{
return
false
;
if
(
applyRemove
(
mth
,
removeInfo
))
{
removeApplied
++;
removeInfo
.
setApplied
(
true
);
}
}
if
(
removeApplied
==
0
)
{
return
false
;
}
if
(
removeApplied
!=
removes
.
size
())
{
throw
new
JadxRuntimeException
(
"Some finally instructions failed to remove: "
+
removes
.
stream
().
filter
(
n
->
!
n
.
isApplied
()).
map
(
BlocksRemoveInfo:
:
toString
).
collect
(
Collectors
.
joining
(
","
))
);
}
LiveVarAnalysis
laAfter
=
null
;
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/helpers/BlocksRemoveInfo.java
浏览文件 @
b861151f
...
...
@@ -23,6 +23,8 @@ public final class BlocksRemoveInfo {
private
BlockNode
startPredecessor
;
private
boolean
applied
;
public
BlocksRemoveInfo
(
BlocksPair
start
)
{
this
.
start
=
start
;
}
...
...
@@ -99,13 +101,22 @@ public final class BlocksRemoveInfo {
return
null
;
}
public
boolean
isApplied
()
{
return
applied
;
}
public
void
setApplied
(
boolean
applied
)
{
this
.
applied
=
applied
;
}
@Override
public
String
toString
()
{
return
"BRI
start: "
+
start
return
"BRI
{
start: "
+
start
+
", end: "
+
end
+
",
list
: "
+
processed
+
",
processed
: "
+
processed
+
", outs: "
+
outs
+
", regMap: "
+
regMap
+
", split: "
+
startSplitIndex
;
+
", split: "
+
startSplitIndex
+
"-"
+
endSplitIndex
+
"}"
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录