Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Jamie Mansfield
asm
Commits
9a421251
Commit
9a421251
authored
Jun 24, 2018
by
Eric Bruneton
Browse files
Merge branch 'retronymm/asm-topic/merge-opt'
parents
bf708d5c
9412ed77
Changes
1
Hide whitespace changes
Inline
Side-by-side
asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/SourceInterpreter.java
View file @
9a421251
...
...
@@ -200,7 +200,7 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements Opcod
return
new
SourceValue
(
Math
.
min
(
value1
.
size
,
value2
.
size
),
setUnion
);
}
}
if
(
value1
.
size
!=
value2
.
size
||
!
value1
.
insns
.
containsAll
(
value2
.
insns
))
{
if
(
value1
.
size
!=
value2
.
size
||
!
containsAll
(
value1
.
insns
,
value2
.
insns
))
{
HashSet
<
AbstractInsnNode
>
setUnion
=
new
HashSet
<
AbstractInsnNode
>();
setUnion
.
addAll
(
value1
.
insns
);
setUnion
.
addAll
(
value2
.
insns
);
...
...
@@ -208,4 +208,11 @@ public class SourceInterpreter extends Interpreter<SourceValue> implements Opcod
}
return
value1
;
}
private
static
<
E
>
boolean
containsAll
(
final
Set
<
E
>
self
,
final
Set
<
E
>
other
)
{
if
(
self
.
size
()
<
other
.
size
())
{
return
false
;
}
return
self
.
containsAll
(
other
);
}
}
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