Skip to content

Commit 022e4f0

Browse files
turbanoffVicente Romero
authored andcommitted
8275242: Remove redundant stream() call before forEach in jdk.compiler
Reviewed-by: vromero
1 parent 0bfc204 commit 022e4f0

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ public void visitVarDef(JCVariableDecl tree) {
980980
}
981981
}.scan(env.enclClass);
982982
//revert changes done by the visitor:
983-
toClear.stream().forEach(c -> {
983+
toClear.forEach(c -> {
984984
chk.clearLocalClassNameIndexes(c);
985985
chk.removeCompiled(c);
986986
});

src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,27 @@
5656
import com.sun.tools.javac.comp.Env;
5757
import com.sun.tools.javac.resources.CompilerProperties.Errors;
5858
import com.sun.tools.javac.tree.JCTree;
59-
import com.sun.tools.javac.tree.TreeInfo;
59+
import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
60+
import com.sun.tools.javac.tree.JCTree.JCAnnotation;
61+
import com.sun.tools.javac.tree.JCTree.JCArrayTypeTree;
6062
import com.sun.tools.javac.tree.JCTree.JCBlock;
6163
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
6264
import com.sun.tools.javac.tree.JCTree.JCExpression;
65+
import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
6366
import com.sun.tools.javac.tree.JCTree.JCLambda;
67+
import com.sun.tools.javac.tree.JCTree.JCMemberReference;
6468
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
6569
import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
70+
import com.sun.tools.javac.tree.JCTree.JCNewArray;
6671
import com.sun.tools.javac.tree.JCTree.JCNewClass;
6772
import com.sun.tools.javac.tree.JCTree.JCTypeApply;
73+
import com.sun.tools.javac.tree.JCTree.JCTypeIntersection;
74+
import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
75+
import com.sun.tools.javac.tree.JCTree.JCTypeUnion;
6876
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
77+
import com.sun.tools.javac.tree.JCTree.Tag;
78+
import com.sun.tools.javac.tree.TreeInfo;
6979
import com.sun.tools.javac.tree.TreeScanner;
70-
import com.sun.tools.javac.tree.JCTree.*;
7180
import com.sun.tools.javac.util.Assert;
7281
import com.sun.tools.javac.util.Context;
7382
import com.sun.tools.javac.util.List;
@@ -1132,7 +1141,7 @@ public void visitClassDef(JCClassDecl tree) {
11321141
}
11331142
scan(tree.defs);
11341143
if (tree.sym.isRecord()) {
1135-
tree.sym.getRecordComponents().stream().forEach(rc -> scan(rc.accessorMeth));
1144+
tree.sym.getRecordComponents().forEach(rc -> scan(rc.accessorMeth));
11361145
}
11371146
}
11381147

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrRecover.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void visitClassDef(JCClassDecl tree) {
193193
attr.new ResultInfo(todo.resultInfo.pkind, todo.resultInfo.pt.getReturnType(), todo.resultInfo.checkContext, todo.resultInfo.checkMode),
194194
todo.env, args, pats,
195195
todo.resultInfo.pt.getTypeArguments());
196-
rollback.stream().forEach(Runnable::run);
196+
rollback.forEach(Runnable::run);
197197
} else {
198198
owntype = basicMethodInvocationRecovery(todo.tree, todo.site, todo.errSym, todo.env, todo.resultInfo);
199199
}

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.Collections;
2929
import java.util.EnumSet;
3030
import java.util.HashMap;
31-
import java.util.HashSet;
3231
import java.util.LinkedHashMap;
3332
import java.util.LinkedHashSet;
3433
import java.util.Map;
@@ -393,7 +392,7 @@ class ReachabilityVisitor extends Types.UnaryVisitor<Void> {
393392
Map<Type, Set<Type>> minMap = new LinkedHashMap<>();
394393

395394
void scan(List<Type> roots) {
396-
roots.stream().forEach(this::visit);
395+
roots.forEach(this::visit);
397396
}
398397

399398
@Override

src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import java.util.Map.Entry;
3838
import java.util.function.Predicate;
3939
import java.util.regex.*;
40-
import java.util.stream.Collectors;
4140

4241
import javax.annotation.processing.*;
4342
import javax.lang.model.SourceVersion;
@@ -46,7 +45,6 @@
4645
import javax.tools.JavaFileManager;
4746
import javax.tools.JavaFileObject;
4847
import javax.tools.JavaFileObject.Kind;
49-
import javax.tools.StandardJavaFileManager;
5048

5149
import static javax.tools.StandardLocation.*;
5250

@@ -1642,7 +1640,7 @@ public void visitClassDef(JCClassDecl node) {
16421640
List<? extends RecordComponent> recordComponents = node.sym.getRecordComponents();
16431641
for (RecordComponent rc : recordComponents) {
16441642
List<JCAnnotation> originalAnnos = rc.getOriginalAnnos();
1645-
originalAnnos.stream().forEach(a -> visitAnnotation(a));
1643+
originalAnnos.forEach(a -> visitAnnotation(a));
16461644
}
16471645
// we should empty the list of permitted subclasses for next round
16481646
node.sym.permitted = List.nil();

0 commit comments

Comments
 (0)