Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
61675275
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,发现更多精彩内容 >>
提交
61675275
编写于
4月 21, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: fix some issues reported by sonar
上级
dc004f37
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
63 deletion
+3
-63
jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java
...in/java/jadx/core/dex/regions/conditions/IfCondition.java
+1
-1
jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/ProcessVariables.java
...core/dex/visitors/regions/variables/ProcessVariables.java
+2
-62
未找到文件。
jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java
浏览文件 @
61675275
...
...
@@ -298,7 +298,7 @@ public final class IfCondition {
if
(
mode
!=
other
.
mode
)
{
return
false
;
}
return
Objects
.
equals
(
other
.
args
,
other
.
args
)
return
Objects
.
equals
(
args
,
other
.
args
)
&&
Objects
.
equals
(
compare
,
other
.
compare
);
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/ProcessVariables.java
浏览文件 @
61675275
...
...
@@ -103,10 +103,8 @@ public class ProcessVariables extends AbstractVisitor {
if
(
checkDeclareAtAssign
(
usageList
,
mergedUsage
))
{
return
;
}
// search closest region for declare
if
(
searchDeclareRegion
(
mergedUsage
,
codeVar
))
{
return
;
}
// TODO: search closest region for declare
// region not found, declare at method start
declareVarInRegion
(
mth
.
getRegion
(),
codeVar
);
}
...
...
@@ -233,38 +231,6 @@ public class ProcessVariables extends AbstractVisitor {
return
true
;
}
private
boolean
searchDeclareRegion
(
VarUsage
u
,
CodeVar
codeVar
)
{
/*
Set<IRegion> set = u.getUseRegions();
for (Iterator<IRegion> it = set.iterator(); it.hasNext(); ) {
IRegion r = it.next();
IRegion parent = r.getParent();
if (parent != null && set.contains(parent)) {
it.remove();
}
}
IRegion region = null;
if (!set.isEmpty()) {
region = set.iterator().next();
} else if (!u.getAssigns().isEmpty()) {
region = u.getAssigns().iterator().next();
}
if (region == null) {
return false;
}
IRegion parent = region;
while (parent != null) {
if (canDeclareAt(u, region)) {
declareVarInRegion(region, codeVar);
return true;
}
region = parent;
parent = region.getParent();
}
*/
return
false
;
}
private
static
void
declareVarInRegion
(
IContainer
region
,
CodeVar
var
)
{
if
(
var
.
isDeclared
())
{
LOG
.
warn
(
"Try to declare already declared variable: {}"
,
var
);
...
...
@@ -278,30 +244,4 @@ public class ProcessVariables extends AbstractVisitor {
dv
.
addVar
(
var
);
var
.
setDeclared
(
true
);
}
private
static
boolean
isAllRegionsAfter
(
IRegion
region
,
Set
<
IRegion
>
others
)
{
IRegion
parent
=
region
.
getParent
();
if
(
parent
==
null
)
{
return
true
;
}
// lazy init for
int
regionIndex
=
-
2
;
List
<
IContainer
>
subBlocks
=
Collections
.
emptyList
();
for
(
IRegion
r
:
others
)
{
if
(
parent
==
r
.
getParent
())
{
// on same level, check order by index
if
(
regionIndex
==
-
2
)
{
subBlocks
=
parent
.
getSubBlocks
();
regionIndex
=
subBlocks
.
indexOf
(
region
);
}
int
rIndex
=
subBlocks
.
indexOf
(
r
);
if
(
regionIndex
>
rIndex
)
{
return
false
;
}
}
else
if
(!
RegionUtils
.
isRegionContainsRegion
(
region
,
r
))
{
return
false
;
}
}
return
true
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录