Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix merging outputLocals when they are refering to the same Local #785

Merged
merged 2 commits into from
Dec 22, 2023
Merged

fix merging outputLocals when they are refering to the same Local #785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d453781
fix merging outputLocals when they are the same Local
swissiety Dec 22, 2023
ffb873c
dont call changeStackLocal when we already know its the same stacklocal
swissiety Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/OperandMerging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,18 @@
void mergeOutput(@Nonnull Operand outputOperand) {
if (output == null) {
output = outputOperand;
} else {
if (output.stackLocal != null) {
assert outputOperand.stackLocal == null;
} else if (output.stackLocal != null) {
if (outputOperand.stackLocal == null) {
outputOperand.changeStackLocal(output.stackLocal);
} else {
if (output.stackLocal != outputOperand.stackLocal) {
throw new IllegalStateException(

Check warning on line 76 in sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/OperandMerging.java

View check run for this annotation

Codecov / codecov/patch

sootup.java.bytecode/src/main/java/sootup/java/bytecode/frontend/OperandMerging.java#L76 

Added line #L76 was not covered by tests
"Incompatible stacklocal mismatch. There exist multiple, different possible output Locals ("
+ outputOperand.stackLocal
+ ", "
+ output.stackLocal
+ ").");
}
}
}
}
Expand Down