Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
f5d1f288
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,发现更多精彩内容 >>
提交
f5d1f288
编写于
12月 15, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: don't inline constants in synchronized statement (#799)
上级
a2df92dd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
66 addition
and
1 deletion
+66
-1
jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
.../main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
+18
-0
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
...main/java/jadx/core/dex/visitors/regions/RegionMaker.java
+1
-0
jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java
...jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java
+3
-1
jadx-core/src/test/java/jadx/tests/integration/synchronize/TestNestedSynchronize.java
.../tests/integration/synchronize/TestNestedSynchronize.java
+30
-0
jadx-core/src/test/smali/synchronize/TestNestedSynchronize.smali
...re/src/test/smali/synchronize/TestNestedSynchronize.smali
+14
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
浏览文件 @
f5d1f288
...
...
@@ -82,6 +82,10 @@ public class ConstInlineVisitor extends AbstractVisitor {
}
return
;
}
// don't inline const values in synchronized statement
if
(
checkForSynchronizeBlock
(
insn
,
sVar
))
{
return
;
}
}
else
if
(
insnType
==
InsnType
.
CONST_STR
)
{
if
(
sVar
.
isUsedInPhi
())
{
return
;
...
...
@@ -108,6 +112,20 @@ public class ConstInlineVisitor extends AbstractVisitor {
replaceConst
(
mth
,
insn
,
constArg
,
toRemove
);
}
private
static
boolean
checkForSynchronizeBlock
(
InsnNode
insn
,
SSAVar
ssaVar
)
{
for
(
RegisterArg
reg
:
ssaVar
.
getUseList
())
{
InsnNode
parentInsn
=
reg
.
getParentInsn
();
if
(
parentInsn
!=
null
)
{
InsnType
insnType
=
parentInsn
.
getType
();
if
(
insnType
==
InsnType
.
MONITOR_ENTER
||
insnType
==
InsnType
.
MONITOR_EXIT
)
{
insn
.
add
(
AFlag
.
DONT_INLINE
);
return
true
;
}
}
}
return
false
;
}
private
static
boolean
checkForFinallyBlock
(
SSAVar
sVar
)
{
List
<
SSAVar
>
ssaVars
=
sVar
.
getCodeVar
().
getSsaVars
();
if
(
ssaVars
.
size
()
<=
1
)
{
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
浏览文件 @
f5d1f288
...
...
@@ -608,6 +608,7 @@ public class RegionMaker {
visited
.
add
(
block
);
for
(
InsnNode
insn
:
block
.
getInstructions
())
{
if
(
insn
.
getType
()
==
InsnType
.
MONITOR_EXIT
&&
insn
.
getArgsCount
()
>
0
&&
insn
.
getArg
(
0
).
equals
(
arg
))
{
exits
.
add
(
block
);
region
.
getExitInsns
().
add
(
insn
);
...
...
jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java
浏览文件 @
f5d1f288
...
...
@@ -16,6 +16,8 @@ public class JadxClassNodeAssertions extends AbstractAssert<JadxClassNodeAsserti
isNotNull
();
ICodeInfo
code
=
actual
.
getCode
();
assertThat
(
code
).
isNotNull
();
return
new
JadxCodeAssertions
(
code
.
getCodeStr
());
String
codeStr
=
code
.
getCodeStr
();
assertThat
(
codeStr
).
isNotBlank
();
return
new
JadxCodeAssertions
(
codeStr
);
}
}
jadx-core/src/test/java/jadx/tests/integration/synchronize/TestNestedSynchronize.java
0 → 100644
浏览文件 @
f5d1f288
package
jadx.tests.integration.synchronize
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestNestedSynchronize
extends
SmaliTest
{
// @formatter:off
/*
public final void test() {
Object obj = null;
Object obj2 = null;
synchronized (obj) {
synchronized (obj2) {
}
}
}
*/
// @formatter:on
@Test
public
void
test
()
{
assertThat
(
getClassNodeFromSmali
())
.
code
()
.
countString
(
2
,
"synchronized"
);
}
}
jadx-core/src/test/smali/synchronize/TestNestedSynchronize.smali
0 → 100644
浏览文件 @
f5d1f288
.class public final Lsynchronize/TestNestedSynchronize;
.super Ljava/lang/Object;
.source "TestNestedSynchronize.java"
.method public final test()V
.locals 2
const/4 v0, 0
const/4 v1, 0
monitor-enter v0
monitor-enter v1
monitor-exit v1
monitor-exit v0
return-void
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录