Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
a617a77d
Commit
a617a77d
authored
Apr 08, 2013
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix variable declaration for multiple assigns
parent
62a28c8e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
16 deletions
+35
-16
ProcessVariables.java
...main/java/jadx/dex/visitors/regions/ProcessVariables.java
+21
-16
TestCF.java
src/samples/java/jadx/samples/TestCF.java
+14
-0
No files found.
src/main/java/jadx/dex/visitors/regions/ProcessVariables.java
View file @
a617a77d
...
@@ -29,6 +29,7 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -29,6 +29,7 @@ public class ProcessVariables extends AbstractVisitor {
private
static
class
Usage
{
private
static
class
Usage
{
private
RegisterArg
arg
;
private
RegisterArg
arg
;
private
IRegion
argRegion
;
private
final
Set
<
IRegion
>
usage
=
new
HashSet
<
IRegion
>(
2
);
private
final
Set
<
IRegion
>
usage
=
new
HashSet
<
IRegion
>(
2
);
private
final
Set
<
IRegion
>
assigns
=
new
HashSet
<
IRegion
>(
2
);
private
final
Set
<
IRegion
>
assigns
=
new
HashSet
<
IRegion
>(
2
);
...
@@ -40,6 +41,14 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -40,6 +41,14 @@ public class ProcessVariables extends AbstractVisitor {
return
arg
;
return
arg
;
}
}
public
void
setArgRegion
(
IRegion
argRegion
)
{
this
.
argRegion
=
argRegion
;
}
public
IRegion
getArgRegion
()
{
return
argRegion
;
}
public
Set
<
IRegion
>
getAssigns
()
{
public
Set
<
IRegion
>
getAssigns
()
{
return
assigns
;
return
assigns
;
}
}
...
@@ -72,11 +81,12 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -72,11 +81,12 @@ public class ProcessVariables extends AbstractVisitor {
Usage
u
=
usageMap
.
get
(
result
);
Usage
u
=
usageMap
.
get
(
result
);
if
(
u
==
null
)
{
if
(
u
==
null
)
{
u
=
new
Usage
();
u
=
new
Usage
();
u
.
setArg
(
result
);
usageMap
.
put
(
result
,
u
);
usageMap
.
put
(
result
,
u
);
}
}
if
(
u
.
getArg
()
==
null
)
if
(
u
.
getArg
()
==
null
)
{
u
.
setArg
(
result
);
u
.
setArg
(
result
);
u
.
setArgRegion
(
curRegion
);
}
u
.
getAssigns
().
add
(
curRegion
);
u
.
getAssigns
().
add
(
curRegion
);
}
}
// args
// args
...
@@ -95,28 +105,23 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -95,28 +105,23 @@ public class ProcessVariables extends AbstractVisitor {
};
};
DepthRegionTraverser
.
traverseAll
(
mth
,
collect
);
DepthRegionTraverser
.
traverseAll
(
mth
,
collect
);
List
<
RegisterArg
>
mthArgs
=
mth
.
getArguments
(
true
);
// reduce assigns map
// reduce assigns map
List
<
RegisterArg
>
mthArgs
=
mth
.
getArguments
(
true
);
for
(
Iterator
<
Entry
<
RegisterArg
,
Usage
>>
it
=
usageMap
.
entrySet
().
iterator
();
it
.
hasNext
();)
{
for
(
Iterator
<
Entry
<
RegisterArg
,
Usage
>>
it
=
usageMap
.
entrySet
().
iterator
();
it
.
hasNext
();)
{
Entry
<
RegisterArg
,
Usage
>
entry
=
it
.
next
();
Entry
<
RegisterArg
,
Usage
>
entry
=
it
.
next
();
Usage
u
=
entry
.
getValue
();
Usage
u
=
entry
.
getValue
();
RegisterArg
r
=
u
.
getArg
();
RegisterArg
r
=
u
.
getArg
();
if
(
u
.
getAssigns
().
isEmpty
())
{
// if no assigns or method argument => remove
if
(
u
.
getAssigns
().
isEmpty
()
||
mthArgs
.
indexOf
(
r
)
!=
-
1
)
{
it
.
remove
();
it
.
remove
();
continue
;
continue
;
}
}
int
i
;
if
((
i
=
mthArgs
.
indexOf
(
r
))
!=
-
1
)
{
// if (mthArgs.get(i).getTypedVar() == r.getTypedVar()) {
it
.
remove
();
continue
;
// }
}
// check if we can declare variable at current assigns
// check if we can declare variable at current assigns
for
(
IRegion
assignRegion
:
u
.
getAssigns
())
{
for
(
IRegion
assignRegion
:
u
.
getAssigns
())
{
if
(
canDeclareInRegion
(
u
,
assignRegion
))
{
if
(
u
.
getArgRegion
()
==
assignRegion
&&
canDeclareInRegion
(
u
,
assignRegion
))
{
r
.
getParentInsn
().
getAttributes
().
add
(
new
DeclareVariableAttr
());
r
.
getParentInsn
().
getAttributes
().
add
(
new
DeclareVariableAttr
());
it
.
remove
();
it
.
remove
();
break
;
break
;
...
@@ -130,8 +135,8 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -130,8 +135,8 @@ public class ProcessVariables extends AbstractVisitor {
// find common region which contains all usage regions
// find common region which contains all usage regions
Set
<
IRegion
>
set
=
u
.
getUseRegions
();
Set
<
IRegion
>
set
=
u
.
getUseRegions
();
for
(
Iterator
it
=
set
.
iterator
();
it
.
hasNext
();)
{
for
(
Iterator
<
IRegion
>
it
=
set
.
iterator
();
it
.
hasNext
();)
{
IRegion
r
=
(
IRegion
)
it
.
next
();
IRegion
r
=
it
.
next
();
IRegion
parent
=
r
.
getParent
();
IRegion
parent
=
r
.
getParent
();
if
(
parent
!=
null
&&
set
.
contains
(
parent
))
if
(
parent
!=
null
&&
set
.
contains
(
parent
))
it
.
remove
();
it
.
remove
();
...
@@ -159,8 +164,8 @@ public class ProcessVariables extends AbstractVisitor {
...
@@ -159,8 +164,8 @@ public class ProcessVariables extends AbstractVisitor {
}
}
private
void
declareVar
(
IContainer
region
,
RegisterArg
arg
)
{
private
void
declareVar
(
IContainer
region
,
RegisterArg
arg
)
{
DeclareVariableAttr
dv
=
(
DeclareVariableAttr
)
region
.
getAttributes
().
get
(
DeclareVariableAttr
dv
=
AttributeType
.
DECLARE_VARIABLE
);
(
DeclareVariableAttr
)
region
.
getAttributes
().
get
(
AttributeType
.
DECLARE_VARIABLE
);
if
(
dv
==
null
)
{
if
(
dv
==
null
)
{
dv
=
new
DeclareVariableAttr
(
new
ArrayList
<
RegisterArg
>());
dv
=
new
DeclareVariableAttr
(
new
ArrayList
<
RegisterArg
>());
region
.
getAttributes
().
add
(
dv
);
region
.
getAttributes
().
add
(
dv
);
...
...
src/samples/java/jadx/samples/TestCF.java
View file @
a617a77d
...
@@ -149,6 +149,18 @@ public class TestCF extends AbstractTest {
...
@@ -149,6 +149,18 @@ public class TestCF extends AbstractTest {
return
Math
.
abs
(
r
);
return
Math
.
abs
(
r
);
}
}
public
int
testIfElse2
(
String
str
)
{
String
a
;
if
(
str
.
length
()
==
5
)
{
a
=
new
String
(
"1"
);
a
.
trim
();
a
.
length
();
}
a
=
new
String
(
"22"
);
a
.
toLowerCase
();
return
a
.
length
();
}
public
void
testInfiniteLoop
()
{
public
void
testInfiniteLoop
()
{
while
(
true
)
{
while
(
true
)
{
System
.
out
.
println
(
"test"
);
System
.
out
.
println
(
"test"
);
...
@@ -194,6 +206,8 @@ public class TestCF extends AbstractTest {
...
@@ -194,6 +206,8 @@ public class TestCF extends AbstractTest {
assertEquals
(
c
.
testIfElse
(
"b"
),
20
);
assertEquals
(
c
.
testIfElse
(
"b"
),
20
);
assertEquals
(
c
.
testIfElse
(
"c"
),
10
);
assertEquals
(
c
.
testIfElse
(
"c"
),
10
);
assertEquals
(
c
.
testIfElse2
(
"12345"
),
2
);
return
true
;
return
true
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment