Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
bcfed5b3
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,发现更多精彩内容 >>
提交
bcfed5b3
编写于
4月 14, 2019
作者:
A
Ahmed Ashour
提交者:
skylot
4月 14, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: generics constructor types (PR #594)
上级
4cb9f23a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
23 deletion
+34
-23
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+26
-3
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
+2
-0
jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java
.../tests/integration/invoke/TestCastInOverloadedInvoke.java
+0
-13
jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesUsageWithLoops.java
...ts/integration/variables/TestVariablesUsageWithLoops.java
+6
-7
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
浏览文件 @
bcfed5b3
...
...
@@ -569,6 +569,21 @@ public class InsnGen {
}
else
{
code
.
add
(
"new "
);
useClass
(
code
,
insn
.
getClassType
());
ArgType
argType
=
insn
.
getResult
().
getSVar
().
getCodeVar
().
getType
();
if
(
argType
.
isGeneric
())
{
code
.
add
(
'<'
);
if
(
insn
.
contains
(
AFlag
.
EXPLICIT_GENERICS
))
{
boolean
first
=
true
;
for
(
ArgType
type
:
argType
.
getGenericTypes
())
{
if
(!
first
)
{
code
.
add
(
','
);
}
mgen
.
getClassGen
().
useType
(
code
,
type
);
first
=
false
;
}
}
code
.
add
(
'>'
);
}
}
MethodNode
callMth
=
mth
.
dex
().
resolveMethod
(
insn
.
getCallMth
());
generateMethodArguments
(
code
,
insn
,
0
,
callMth
);
...
...
@@ -749,9 +764,17 @@ public class InsnGen {
if
(
argType
.
equals
(
origType
))
{
return
false
;
}
if
(
origType
.
isGeneric
()
&&
origType
.
getObject
().
equals
(
argType
.
getObject
()))
{
return
false
;
if
(
origType
.
isGeneric
())
{
if
(!
argType
.
isGeneric
()
&&
arg
.
isInsnWrap
())
{
((
InsnWrapArg
)
arg
).
getWrapInsn
().
getResult
().
setType
(
ArgType
.
generic
(
argType
.
getObject
(),
origType
.
getGenericTypes
()));
}
if
(
origType
.
getObject
().
equals
(
argType
.
getObject
()))
{
return
false
;
}
if
(
arg
.
isInsnWrap
())
{
((
InsnWrapArg
)
arg
).
getWrapInsn
().
add
(
AFlag
.
EXPLICIT_GENERICS
);
}
}
code
.
add
(
'('
);
useType
(
code
,
origType
);
...
...
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
浏览文件 @
bcfed5b3
...
...
@@ -48,5 +48,7 @@ public enum AFlag {
FALL_THROUGH
,
EXPLICIT_GENERICS
,
INCONSISTENT_CODE
,
// warning about incorrect decompilation
}
jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java
浏览文件 @
bcfed5b3
...
...
@@ -5,7 +5,6 @@ import java.util.List;
import
org.junit.jupiter.api.Test
;
import
jadx.NotYetImplemented
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
...
...
@@ -55,18 +54,6 @@ public class TestCastInOverloadedInvoke extends IntegrationTest {
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"call(new ArrayList());"
));
assertThat
(
code
,
containsOne
(
"call((List<String>) new ArrayList());"
));
assertThat
(
code
,
containsOne
(
"call((String) obj);"
));
}
@Test
@NotYetImplemented
public
void
testNYI
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"call(new ArrayList<>());"
));
assertThat
(
code
,
containsOne
(
"call((List<String>) new ArrayList<String>());"
));
...
...
jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesUsageWithLoops.java
浏览文件 @
bcfed5b3
...
...
@@ -15,11 +15,10 @@ public class TestVariablesUsageWithLoops extends IntegrationTest {
public
static
class
TestEnhancedFor
{
@SuppressWarnings
(
"rawtypes"
)
public
void
test
()
{
List
list
;
List
<
Object
>
list
;
synchronized
(
this
)
{
list
=
new
ArrayList
();
list
=
new
ArrayList
<>
();
}
for
(
Object
o
:
list
)
{
System
.
out
.
println
(
o
);
...
...
@@ -32,15 +31,15 @@ public class TestVariablesUsageWithLoops extends IntegrationTest {
ClassNode
cls
=
getClassNode
(
TestEnhancedFor
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
" list = new ArrayList"
));
assertThat
(
code
,
containsString
(
" list = new ArrayList
<>
"
));
}
public
static
class
TestForLoop
{
public
void
test
()
{
List
list
;
List
<
Object
>
list
;
synchronized
(
this
)
{
list
=
new
ArrayList
();
list
=
new
ArrayList
<>
();
}
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
System
.
out
.
println
(
i
);
...
...
@@ -53,6 +52,6 @@ public class TestVariablesUsageWithLoops extends IntegrationTest {
ClassNode
cls
=
getClassNode
(
TestForLoop
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
" list = new ArrayList"
));
assertThat
(
code
,
containsString
(
" list = new ArrayList
<>
"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录