stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8275242: Remove redundant stream() call before forEach in jdk.compiler

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Andrey Turbanov 2021-12-17 18:52:37 +00:00 committed by Vicente Romero
parent 0bfc204a78
commit 022e4f0f1c
5 changed files with 16 additions and 10 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac
api
JavacTrees.java
code
TypeAnnotations.java
comp
AttrRecover.javaInferenceContext.java
processing
JavacProcessingEnvironment.java

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

@ -980,7 +980,7 @@ public class JavacTrees extends DocTrees {
}
}.scan(env.enclClass);
//revert changes done by the visitor:
toClear.stream().forEach(c -> {
toClear.forEach(c -> {
chk.clearLocalClassNameIndexes(c);
chk.removeCompiled(c);
});

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

@ -56,18 +56,27 @@ import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
import com.sun.tools.javac.resources.CompilerProperties.Errors;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
import com.sun.tools.javac.tree.JCTree.JCAnnotation;
import com.sun.tools.javac.tree.JCTree.JCArrayTypeTree;
import com.sun.tools.javac.tree.JCTree.JCBlock;
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.JCTree.JCExpression;
import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
import com.sun.tools.javac.tree.JCTree.JCLambda;
import com.sun.tools.javac.tree.JCTree.JCMemberReference;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
import com.sun.tools.javac.tree.JCTree.JCNewArray;
import com.sun.tools.javac.tree.JCTree.JCNewClass;
import com.sun.tools.javac.tree.JCTree.JCTypeApply;
import com.sun.tools.javac.tree.JCTree.JCTypeIntersection;
import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
import com.sun.tools.javac.tree.JCTree.JCTypeUnion;
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
import com.sun.tools.javac.tree.JCTree.Tag;
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.TreeScanner;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List;
@ -1132,7 +1141,7 @@ public class TypeAnnotations {
}
scan(tree.defs);
if (tree.sym.isRecord()) {
tree.sym.getRecordComponents().stream().forEach(rc -> scan(rc.accessorMeth));
tree.sym.getRecordComponents().forEach(rc -> scan(rc.accessorMeth));
}
}

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

@ -193,7 +193,7 @@ public class AttrRecover {
attr.new ResultInfo(todo.resultInfo.pkind, todo.resultInfo.pt.getReturnType(), todo.resultInfo.checkContext, todo.resultInfo.checkMode),
todo.env, args, pats,
todo.resultInfo.pt.getTypeArguments());
rollback.stream().forEach(Runnable::run);
rollback.forEach(Runnable::run);
} else {
owntype = basicMethodInvocationRecovery(todo.tree, todo.site, todo.errSym, todo.env, todo.resultInfo);
}

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

@ -28,7 +28,6 @@ package com.sun.tools.javac.comp;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
@ -393,7 +392,7 @@ public class InferenceContext {
Map<Type, Set<Type>> minMap = new LinkedHashMap<>();
void scan(List<Type> roots) {
roots.stream().forEach(this::visit);
roots.forEach(this::visit);
}
@Override

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

@ -37,7 +37,6 @@ import java.util.*;
import java.util.Map.Entry;
import java.util.function.Predicate;
import java.util.regex.*;
import java.util.stream.Collectors;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
@ -46,7 +45,6 @@ import javax.lang.model.util.*;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.StandardJavaFileManager;
import static javax.tools.StandardLocation.*;
@ -1642,7 +1640,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
List<? extends RecordComponent> recordComponents = node.sym.getRecordComponents();
for (RecordComponent rc : recordComponents) {
List<JCAnnotation> originalAnnos = rc.getOriginalAnnos();
originalAnnos.stream().forEach(a -> visitAnnotation(a));
originalAnnos.forEach(a -> visitAnnotation(a));
}
// we should empty the list of permitted subclasses for next round
node.sym.permitted = List.nil();