Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
8321d5e3
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,发现更多精彩内容 >>
提交
8321d5e3
编写于
10月 28, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: preserve arg type on PHI insn inline (#718)
上级
64c9ce2a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
14 deletion
+44
-14
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockProcessor.java
...va/jadx/core/dex/visitors/blocksmaker/BlockProcessor.java
+1
-1
jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
...rc/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
+5
-13
jadx-core/src/test/java/jadx/tests/integration/inline/TestConstInline.java
...t/java/jadx/tests/integration/inline/TestConstInline.java
+38
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockProcessor.java
浏览文件 @
8321d5e3
...
...
@@ -677,7 +677,7 @@ public class BlockProcessor extends AbstractVisitor {
InsnNode
insn
=
new
InsnNode
(
returnInsn
.
getType
(),
returnInsn
.
getArgsCount
());
if
(
returnInsn
.
getArgsCount
()
==
1
)
{
RegisterArg
arg
=
(
RegisterArg
)
returnInsn
.
getArg
(
0
);
insn
.
addArg
(
InsnArg
.
reg
(
arg
.
getRegNum
(),
arg
.
getInitType
()
));
insn
.
addArg
(
arg
.
duplicate
(
));
}
insn
.
copyAttributesFrom
(
returnInsn
);
insn
.
setOffset
(
returnInsn
.
getOffset
());
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
浏览文件 @
8321d5e3
...
...
@@ -12,7 +12,6 @@ import jadx.core.dex.attributes.AType;
import
jadx.core.dex.attributes.nodes.PhiListAttr
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.instructions.PhiInsn
;
import
jadx.core.dex.instructions.args.ArgType
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.instructions.args.RegisterArg
;
import
jadx.core.dex.instructions.args.SSAVar
;
...
...
@@ -383,25 +382,18 @@ public class SSATransform extends AbstractVisitor {
List
<
RegisterArg
>
useList
=
resVar
.
getUseList
();
for
(
RegisterArg
useArg
:
new
ArrayList
<>(
useList
))
{
InsnNode
useInsn
=
useArg
.
getParentInsn
();
if
(
useInsn
==
null
||
useInsn
==
phi
)
{
if
(
useInsn
==
null
||
useInsn
==
phi
||
useArg
.
getRegNum
()
!=
arg
.
getRegNum
()
)
{
return
false
;
}
// replace SSAVar in 'useArg' to SSAVar from 'arg'
// no need to replace whole RegisterArg
useArg
.
getSVar
().
removeUse
(
useArg
);
RegisterArg
inlArg
=
arg
.
duplicate
();
if
(!
useInsn
.
replaceArg
(
useArg
,
inlArg
))
{
return
false
;
}
inlArg
.
getSVar
().
use
(
inlArg
);
inlArg
.
setName
(
useArg
.
getName
());
ArgType
type
=
useArg
.
getImmutableType
();
if
(
type
!=
null
)
{
inlArg
.
setType
(
type
);
}
arg
.
getSVar
().
use
(
useArg
);
}
if
(
block
.
contains
(
AType
.
EXC_HANDLER
))
{
// don't inline into exception handler
InsnNode
assignInsn
=
arg
.
getAssignInsn
();
if
(
assignInsn
!=
null
)
{
if
(
assignInsn
!=
null
&&
!
assignInsn
.
isConstInsn
()
)
{
assignInsn
.
add
(
AFlag
.
DONT_INLINE
);
}
}
...
...
jadx-core/src/test/java/jadx/tests/integration/inline/TestConstInline.java
0 → 100644
浏览文件 @
8321d5e3
package
jadx.tests.integration.inline
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
CoreMatchers
.
not
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
public
class
TestConstInline
extends
IntegrationTest
{
public
static
class
TestCls
{
public
boolean
test
()
{
try
{
return
f
(
0
);
}
catch
(
Exception
e
)
{
return
false
;
}
}
public
boolean
f
(
int
i
)
{
return
true
;
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"return f(0);"
));
assertThat
(
code
,
containsOne
(
"return false;"
));
assertThat
(
code
,
not
(
containsString
(
" = "
)));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录