Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
03f03f85
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,发现更多精彩内容 >>
提交
03f03f85
编写于
11月 01, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: replace removed synthetic constructor
上级
2b00a8a4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
91 addition
and
0 deletion
+91
-0
jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java
...java/jadx/core/dex/instructions/mods/ConstructorInsn.java
+11
-0
jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
...core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
+41
-0
jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
+5
-0
jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java
...st/java/jadx/tests/integration/inner/TestInnerClass4.java
+34
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java
浏览文件 @
03f03f85
...
...
@@ -52,6 +52,13 @@ public class ConstructorInsn extends InsnNode {
setSourceLine
(
invoke
.
getSourceLine
());
}
public
ConstructorInsn
(
MethodInfo
callMth
,
CallType
callType
,
RegisterArg
instanceArg
)
{
super
(
InsnType
.
CONSTRUCTOR
,
callMth
.
getArgsCount
());
this
.
callMth
=
callMth
;
this
.
callType
=
callType
;
this
.
instanceArg
=
instanceArg
;
}
public
MethodInfo
getCallMth
()
{
return
callMth
;
}
...
...
@@ -64,6 +71,10 @@ public class ConstructorInsn extends InsnNode {
return
callMth
.
getDeclClass
();
}
public
CallType
getCallType
()
{
return
callType
;
}
public
boolean
isNewInstance
()
{
return
callType
==
CallType
.
CONSTRUCTOR
;
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
浏览文件 @
03f03f85
package
jadx.core.dex.visitors
;
import
jadx.core.codegen.TypeGen
;
import
jadx.core.deobf.NameMapper
;
import
jadx.core.dex.attributes.AType
;
import
jadx.core.dex.info.MethodInfo
;
...
...
@@ -143,6 +144,10 @@ public class ModVisitor extends AbstractVisitor {
if
(
co
.
isNewInstance
())
{
removeAssignChain
(
instArgAssignInsn
,
remover
,
InsnType
.
NEW_INSTANCE
);
}
ConstructorInsn
replace
=
processConstructor
(
mth
,
co
);
if
(
replace
!=
null
)
{
replaceInsn
(
block
,
insnNumber
,
replace
);
}
}
}
else
if
(
inv
.
getArgsCount
()
>
0
)
{
for
(
int
j
=
0
;
j
<
inv
.
getArgsCount
();
j
++)
{
...
...
@@ -157,6 +162,42 @@ public class ModVisitor extends AbstractVisitor {
}
}
/**
* Replace call of synthetic constructor
*/
private
static
ConstructorInsn
processConstructor
(
MethodNode
mth
,
ConstructorInsn
co
)
{
MethodNode
callMth
=
mth
.
dex
().
resolveMethod
(
co
.
getCallMth
());
if
(
callMth
!=
null
&&
callMth
.
getAccessFlags
().
isSynthetic
()
&&
allArgsNull
(
co
))
{
// if all arguments is null => replace with default constructor
ClassNode
classNode
=
mth
.
dex
().
resolveClass
(
callMth
.
getParentClass
().
getClassInfo
());
boolean
passThis
=
co
.
getArgsCount
()
>=
1
&&
co
.
getArg
(
0
).
isThis
();
String
ctrId
=
"<init>("
+
(
passThis
?
TypeGen
.
signature
(
co
.
getArg
(
0
).
getType
())
:
""
)
+
")V"
;
MethodNode
defCtr
=
classNode
.
searchMethodByName
(
ctrId
);
if
(
defCtr
!=
null
)
{
ConstructorInsn
newInsn
=
new
ConstructorInsn
(
defCtr
.
getMethodInfo
(),
co
.
getCallType
(),
co
.
getInstanceArg
());
newInsn
.
setResult
(
co
.
getResult
());
return
newInsn
;
}
}
return
null
;
}
private
static
boolean
allArgsNull
(
InsnNode
insn
)
{
for
(
InsnArg
insnArg
:
insn
.
getArguments
())
{
if
(
insnArg
.
isLiteral
())
{
LiteralArg
lit
=
(
LiteralArg
)
insnArg
;
if
(
lit
.
getLiteral
()
!=
0
)
{
return
false
;
}
}
else
if
(!
insnArg
.
isThis
())
{
return
false
;
}
}
return
true
;
}
/**
* Remove instructions on 'move' chain until instruction with type 'insnType'
*/
...
...
jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
浏览文件 @
03f03f85
...
...
@@ -121,6 +121,11 @@ public abstract class IntegrationTest extends TestUtils {
public
boolean
isShowInconsistentCode
()
{
return
true
;
}
@Override
public
int
getThreadsCount
()
{
return
1
;
}
},
new
File
(
outDir
));
}
...
...
jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java
0 → 100644
浏览文件 @
03f03f85
package
jadx.tests.integration.inner
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
org.junit.Test
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestInnerClass4
extends
IntegrationTest
{
public
static
class
TestCls
{
public
class
C
{
public
String
c
;
private
C
()
{
this
.
c
=
"c"
;
}
}
private
String
test
()
{
return
new
C
().
c
;
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"return new C().c;"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录