Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
545cd4ec
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,体验更适合开发者的 AI 搜索 >>
提交
545cd4ec
编写于
8月 10, 2020
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: don't inline 'null' object to make code compilable (#964)
上级
444ea9ec
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
115 addition
and
47 deletion
+115
-47
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
+1
-0
jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
.../main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
+43
-45
jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
...java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
+5
-1
jadx-core/src/main/java/jadx/core/utils/Utils.java
jadx-core/src/main/java/jadx/core/utils/Utils.java
+1
-1
jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode2.java
...st/java/jadx/tests/integration/others/TestWrongCode2.java
+65
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
浏览文件 @
545cd4ec
...
...
@@ -15,6 +15,7 @@ public enum AFlag {
DONT_WRAP
,
DONT_INLINE
,
DONT_INLINE_CONST
,
DONT_GENERATE
,
// process as usual, but don't output to generated code
COMMENT_OUT
,
// process as usual, but comment insn in generated code
REMOVE
,
// can be completely removed
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
浏览文件 @
545cd4ec
...
...
@@ -10,7 +10,6 @@ import jadx.core.dex.instructions.ConstStringNode;
import
jadx.core.dex.instructions.IndexInsnNode
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.instructions.InvokeNode
;
import
jadx.core.dex.instructions.InvokeType
;
import
jadx.core.dex.instructions.args.ArgType
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.instructions.args.LiteralArg
;
...
...
@@ -73,17 +72,8 @@ public class ConstInlineVisitor extends AbstractVisitor {
return
;
}
long
lit
=
((
LiteralArg
)
constArg
).
getLiteral
();
if
(
lit
==
0
&&
checkObjectInline
(
sVar
))
{
if
(
sVar
.
getUseCount
()
==
1
)
{
InsnNode
assignInsn
=
insn
.
getResult
().
getAssignInsn
();
if
(
assignInsn
!=
null
)
{
assignInsn
.
add
(
AFlag
.
DONT_INLINE
);
}
}
return
;
}
// don't inline const values in synchronized statement
if
(
checkForSynchronizeBlock
(
insn
,
sVar
))
{
if
(
lit
==
0
&&
forbidNullInlines
(
sVar
))
{
// all usages forbids inlining
return
;
}
}
else
if
(
insnType
==
InsnType
.
CONST_STR
)
{
...
...
@@ -117,20 +107,6 @@ 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
)
{
...
...
@@ -153,37 +129,60 @@ public class ConstInlineVisitor extends AbstractVisitor {
}
/**
* Don't inline null object if:
* - used as instance arg in invoke instruction
* - used in 'array.length'
* Don't inline null object
*/
private
static
boolean
checkObjectInline
(
SSAVar
sVar
)
{
for
(
RegisterArg
useArg
:
sVar
.
getUseList
())
{
private
static
boolean
forbidNullInlines
(
SSAVar
sVar
)
{
List
<
RegisterArg
>
useList
=
sVar
.
getUseList
();
if
(
useList
.
isEmpty
())
{
return
false
;
}
int
k
=
0
;
for
(
RegisterArg
useArg
:
useList
)
{
InsnNode
insn
=
useArg
.
getParentInsn
();
if
(
insn
==
null
)
{
continue
;
}
InsnType
insnType
=
insn
.
getType
();
if
(
insnType
==
InsnType
.
INVOKE
)
{
InvokeNode
inv
=
(
InvokeNode
)
insn
;
if
(
inv
.
getInvokeType
()
!=
InvokeType
.
STATIC
&&
inv
.
getArg
(
0
)
==
useArg
)
{
return
true
;
}
}
else
if
(
insnType
==
InsnType
.
ARRAY_LENGTH
)
{
if
(
insn
.
getArg
(
0
)
==
useArg
)
{
return
true
;
}
if
(!
canUseNull
(
insn
,
useArg
))
{
useArg
.
add
(
AFlag
.
DONT_INLINE_CONST
);
k
++;
}
}
return
false
;
return
k
==
useList
.
size
()
;
}
private
static
int
replaceConst
(
MethodNode
mth
,
InsnNode
constInsn
,
InsnArg
constArg
,
List
<
InsnNode
>
toRemove
)
{
private
static
boolean
canUseNull
(
InsnNode
insn
,
RegisterArg
useArg
)
{
switch
(
insn
.
getType
())
{
case
INVOKE:
return
((
InvokeNode
)
insn
).
getInstanceArg
()
!=
useArg
;
case
ARRAY_LENGTH:
case
AGET:
case
APUT:
case
IGET:
case
SWITCH:
case
MONITOR_ENTER:
case
MONITOR_EXIT:
case
INSTANCE_OF:
return
insn
.
getArg
(
0
)
!=
useArg
;
case
IPUT:
return
insn
.
getArg
(
1
)
!=
useArg
;
}
return
true
;
}
private
static
void
replaceConst
(
MethodNode
mth
,
InsnNode
constInsn
,
InsnArg
constArg
,
List
<
InsnNode
>
toRemove
)
{
SSAVar
ssaVar
=
constInsn
.
getResult
().
getSVar
();
if
(
ssaVar
.
getUseCount
()
==
0
)
{
toRemove
.
add
(
constInsn
);
return
;
}
List
<
RegisterArg
>
useList
=
new
ArrayList
<>(
ssaVar
.
getUseList
());
int
replaceCount
=
0
;
for
(
RegisterArg
arg
:
useList
)
{
if
(
arg
.
contains
(
AFlag
.
DONT_INLINE_CONST
))
{
continue
;
}
if
(
replaceArg
(
mth
,
arg
,
constArg
,
constInsn
,
toRemove
))
{
replaceCount
++;
}
...
...
@@ -191,7 +190,6 @@ public class ConstInlineVisitor extends AbstractVisitor {
if
(
replaceCount
==
useList
.
size
())
{
toRemove
.
add
(
constInsn
);
}
return
replaceCount
;
}
private
static
boolean
replaceArg
(
MethodNode
mth
,
RegisterArg
arg
,
InsnArg
constArg
,
InsnNode
constInsn
,
List
<
InsnNode
>
toRemove
)
{
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
浏览文件 @
545cd4ec
...
...
@@ -93,10 +93,14 @@ public class CodeShrinkVisitor extends AbstractVisitor {
}
List
<
RegisterArg
>
useList
=
sVar
.
getUseList
();
if
(!
useList
.
isEmpty
())
{
InsnNode
parentInsn
=
useList
.
get
(
0
).
getParentInsn
();
RegisterArg
useArg
=
useList
.
get
(
0
);
InsnNode
parentInsn
=
useArg
.
getParentInsn
();
if
(
parentInsn
!=
null
&&
parentInsn
.
contains
(
AFlag
.
DONT_GENERATE
))
{
return
;
}
if
(!
assignInline
&&
useArg
.
contains
(
AFlag
.
DONT_INLINE_CONST
))
{
return
;
}
}
int
assignPos
=
insnList
.
getIndex
(
assignInsn
);
...
...
jadx-core/src/main/java/jadx/core/utils/Utils.java
浏览文件 @
545cd4ec
...
...
@@ -58,7 +58,7 @@ public class Utils {
if
(
objects
==
null
)
{
return
""
;
}
return
listToString
(
objects
,
joiner
,
Object:
:
toString
);
return
listToString
(
objects
,
joiner
,
Object
s
:
:
toString
);
}
public
static
<
T
>
String
listToString
(
Iterable
<
T
>
objects
,
Function
<
T
,
String
>
toStr
)
{
...
...
jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode2.java
0 → 100644
浏览文件 @
545cd4ec
package
jadx.tests.integration.others
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestWrongCode2
extends
IntegrationTest
{
public
static
class
TestCls
{
@SuppressWarnings
(
"ConstantConditions"
)
public
String
test
()
{
A
a
=
null
;
a
.
str
=
""
;
return
a
.
str
;
}
@SuppressWarnings
(
"ConstantConditions"
)
public
int
test2
()
{
int
[]
a
=
null
;
a
[
1
]
=
2
;
return
a
[
0
];
}
@SuppressWarnings
({
"ConstantConditions"
,
"SynchronizationOnLocalVariableOrMethodParameter"
})
public
boolean
test3
()
{
A
a
=
null
;
synchronized
(
a
)
{
return
true
;
}
}
public
boolean
test4
()
{
return
null
instanceof
A
;
}
// everything is 'A' :)
@SuppressWarnings
({
"MethodName"
,
"LocalVariableName"
})
// ignore checkstyle
public
A
A
()
{
A
A
=
A
();
A
.
A
=
A
;
return
A
;
}
@SuppressWarnings
(
"MemberName"
)
public
static
class
A
{
public
String
str
;
public
A
A
;
}
}
@Test
public
void
test
()
{
assertThat
(
getClassNode
(
TestCls
.
class
))
.
code
()
.
containsOne
(
"return a.str;"
);
}
@Test
public
void
testNoDebug
()
{
noDebugInfo
();
getClassNode
(
TestCls
.
class
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录