ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stream.sum() used (via StreamApiMigrationInspection); cleanup

Browse Source
This commit is contained in:
Tagir Valeev
2016-09-09 12:47:19 +07:00
parent 947fae191f
commit bc728c9daf
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2014 JetBrains s.r.o. * Copyright 2000-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -135,10 +135,7 @@ public class EliminateLoopsHelper {
statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id)); statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
} }
int postcount = 0; int postcount = statLabeled.values().stream().mapToInt(val -> val ? 1 : 0).sum();
for (Boolean val : statLabeled.values()) {
postcount += val ? 1 : 0;
}
if (precount <= postcount) { if (precount <= postcount) {
return false; return false;

8
src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2015 JetBrains s.r.o. * Copyright 2000-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -172,15 +172,13 @@ public class IrreducibleCFGDeobfuscator {
private static int getStatementSize(Statement statement) { private static int getStatementSize(Statement statement) {
int res = 0; int res;
if (statement.type == Statement.TYPE_BASICBLOCK) { if (statement.type == Statement.TYPE_BASICBLOCK) {
res = ((BasicBlockStatement)statement).getBlock().getSeq().length(); res = ((BasicBlockStatement)statement).getBlock().getSeq().length();
} }
else { else {
for (Statement stat : statement.getStats()) { res = statement.getStats().stream().mapToInt(IrreducibleCFGDeobfuscator::getStatementSize).sum();
res += getStatementSize(stat);
}
} }
return res; return res;