Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
13609a5c
J
jadx
项目概览
2301_76393173
/
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,发现更多精彩内容 >>
提交
13609a5c
编写于
8月 09, 2020
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: allow to inline variables around 'monitor-exit' in synchronized block
上级
d6ad21f6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
5 deletion
+34
-5
jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
...java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
+9
-4
jadx-core/src/main/java/jadx/core/utils/RegionUtils.java
jadx-core/src/main/java/jadx/core/utils/RegionUtils.java
+22
-0
jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized4.java
...jadx/tests/integration/synchronize/TestSynchronized4.java
+3
-1
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
浏览文件 @
13609a5c
...
...
@@ -21,6 +21,7 @@ import jadx.core.dex.visitors.ModVisitor;
import
jadx.core.utils.BlockUtils
;
import
jadx.core.utils.InsnList
;
import
jadx.core.utils.InsnRemover
;
import
jadx.core.utils.RegionUtils
;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
@JadxVisitor
(
...
...
@@ -109,7 +110,7 @@ public class CodeShrinkVisitor extends AbstractVisitor {
BlockNode
assignBlock
=
BlockUtils
.
getBlockByInsn
(
mth
,
assignInsn
);
if
(
assignBlock
!=
null
&&
assignInsn
!=
arg
.
getParentInsn
()
&&
canMoveBetweenBlocks
(
assignInsn
,
assignBlock
,
block
,
argsInfo
.
getInsn
()))
{
&&
canMoveBetweenBlocks
(
mth
,
assignInsn
,
assignBlock
,
block
,
argsInfo
.
getInsn
()))
{
if
(
assignInline
)
{
assignInline
(
mth
,
arg
,
assignInsn
,
assignBlock
);
}
else
{
...
...
@@ -150,7 +151,7 @@ public class CodeShrinkVisitor extends AbstractVisitor {
return
replaced
;
}
private
static
boolean
canMoveBetweenBlocks
(
InsnNode
assignInsn
,
BlockNode
assignBlock
,
private
static
boolean
canMoveBetweenBlocks
(
MethodNode
mth
,
InsnNode
assignInsn
,
BlockNode
assignBlock
,
BlockNode
useBlock
,
InsnNode
useInsn
)
{
if
(!
BlockUtils
.
isPathExists
(
assignBlock
,
useBlock
))
{
return
false
;
...
...
@@ -176,8 +177,12 @@ public class CodeShrinkVisitor extends AbstractVisitor {
for
(
BlockNode
block
:
pathsBlocks
)
{
if
(
block
.
contains
(
AFlag
.
DONT_GENERATE
))
{
if
(
BlockUtils
.
checkLastInsnType
(
block
,
InsnType
.
MONITOR_EXIT
))
{
// don't move from synchronized block
return
false
;
if
(
RegionUtils
.
isBlocksInSameRegion
(
mth
,
assignBlock
,
useBlock
))
{
// allow move inside same synchronized region
}
else
{
// don't move from synchronized block
return
false
;
}
}
// skip checks for not generated blocks
continue
;
...
...
jadx-core/src/main/java/jadx/core/utils/RegionUtils.java
浏览文件 @
13609a5c
...
...
@@ -19,6 +19,8 @@ import jadx.core.dex.nodes.IBranchRegion;
import
jadx.core.dex.nodes.IContainer
;
import
jadx.core.dex.nodes.IRegion
;
import
jadx.core.dex.nodes.InsnNode
;
import
jadx.core.dex.nodes.MethodNode
;
import
jadx.core.dex.regions.Region
;
import
jadx.core.dex.trycatch.CatchAttr
;
import
jadx.core.dex.trycatch.ExceptionHandler
;
import
jadx.core.dex.trycatch.TryCatchBlock
;
...
...
@@ -329,6 +331,26 @@ public class RegionUtils {
}
}
/**
* Check if two blocks in same region on same level
* TODO: Add 'region' annotation to all blocks to speed up checks
*/
public
static
boolean
isBlocksInSameRegion
(
MethodNode
mth
,
BlockNode
firstBlock
,
BlockNode
secondBlock
)
{
Region
region
=
mth
.
getRegion
();
if
(
region
==
null
)
{
return
false
;
}
IContainer
firstContainer
=
getBlockContainer
(
region
,
firstBlock
);
if
(
firstContainer
instanceof
IRegion
)
{
if
(
firstContainer
instanceof
IBranchRegion
)
{
return
false
;
}
List
<
IContainer
>
subBlocks
=
((
IRegion
)
firstContainer
).
getSubBlocks
();
return
subBlocks
.
contains
(
secondBlock
);
}
return
false
;
}
public
static
boolean
isDominatedBy
(
BlockNode
dom
,
IContainer
cont
)
{
if
(
dom
==
cont
)
{
return
true
;
...
...
jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized4.java
浏览文件 @
13609a5c
...
...
@@ -26,6 +26,8 @@ public class TestSynchronized4 extends SmaliTest {
public
void
test
()
{
assertThat
(
getClassNodeFromSmali
())
.
code
()
.
containsOne
(
"synchronized (this.obj) {"
);
.
containsOne
(
"synchronized (this.obj) {"
)
.
containsOne
(
"return call(this.obj, i);"
)
.
containsOne
(
"return getField() == null;"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录