MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 05:21:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-decompiler] IDEA-346312 adapt patches

Browse Source 
- fix switch in more working way

GitOrigin-RevId: 485da13352e66780cf9a83dab105d3ecddbb6c60
This commit is contained in:
Mikhail Pyltsin
2024-09-13 19:34:21 +02:00
committed by intellij-monorepo-bot
parent f0c639a4a2
commit 7e62370666
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
View File

@@ -89,7 +89,7 @@ public final class InitializerProcessor {
for (MethodWrapper method : wrapper.getMethods()) {
if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) {
Statement firstData = Statements.findFirstData(method.root);
if (firstData == null || firstData.getExprents().isEmpty()) {
if (firstData == null || firstData.getExprents() == null || firstData.getExprents().isEmpty()) {
return;
}

6
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
View File

@@ -18,7 +18,6 @@ public final class EliminateLoopsHelper {
if(ret) {
SequenceHelper.condenseSequences(root);
StackVarsProcessor.simplifyStackVars(root, mt, cl);
Set<Integer> setReorderedIfs = new HashSet<>();
@@ -82,10 +81,9 @@ public final class EliminateLoopsHelper {
for (Statement statement : switchStatement.getCaseStatements()) {
allEdges.addAll(statement.getAllSuccessorEdges());
}
Statement finalParentloop = parentloop;
//not a good workaround, but there is not another key, because edges are broken at this moment
if (allEdges.stream()
.anyMatch(edge -> edge.getType() == StatEdge.EdgeType.BREAK &&
edge.closure == finalParentloop)) {
.anyMatch(edge -> edge.closure.type == Statement.StatementType.DO)) {
return false;
}
}