Merge branch 'master' into removeWildcards

src/java.base/share/classes/java/util/stream/Collectors.java

@@ -245,24 +245,6 @@ public final class Collectors {
                 CH_ID);
     }
 
-
-    /**
-     * Returns a {@code Collector} that accumulates the input elements into a
-     * new {@code List}. There are no guarantees on the type, mutability,
-     * serializability, or thread-safety of the {@code List} returned; if more
-     * control over the returned {@code List} is required, use {@link #toCollection(Supplier)}.
-     *
-     * @param <T> the type of the input elements
-     * @return a {@code Collector} which collects all the input elements into a
-     * {@code List}, in encounter order
-     */
-    public static <T>
-    Collector<T, ArrayList<Object>, List<T>> toList2() {
-        return new CollectorImpl<>(ArrayList::new, List::add,
-                (left, right) -> { left.addAll(right); return left; },
-                CH_ID);
-    }
-
     /**
      * Returns a {@code Collector} that accumulates the input elements into an
      * <a href="../List.html#unmodifiable">unmodifiable List</a> in encounter
@@ -922,9 +904,8 @@ public final class Collectors {
                 }
             }
         }
-
         return new CollectorImpl<>(
-                OptionalBox::new, OptionalBox::accept,
+                OptionalBox::new, Consumer<T>::accept,
                 (a, b) -> {
                     if (b.present) a.accept(b.value);
                     return a;
@@ -970,7 +951,7 @@ public final class Collectors {
      * @see #reducing(BinaryOperator)
      */
     public static <T, U>
-    Collector<T, ?, U> reducing(U identity,
+    Collector<T, U[], U> reducing(U identity,
                                 Function<? super T, ? extends U> mapper,
                                 BinaryOperator<U> op) {
         return new CollectorImpl<>(

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

@@ -201,7 +201,7 @@ public class BasicJavacTask extends JavacTask {
         PlatformDescription platformProvider = context.get(PlatformDescription.class);
 
         //ANDI: Init our own plugin to count CC's
-        initPlugin(new WildcardFinderPlugin());
+        initPlugin(new WildcardFinderPlugin((s -> Log.instance(context).printRawLines(s))));
         if (platformProvider != null) {
             for (PluginInfo<Plugin> pluginDesc : platformProvider.getPlugins()) {
                 java.util.List<String> options =

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

@@ -1,12 +1,20 @@
 package com.sun.tools.javac.api;
 
 import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.util.*;
 
 import java.io.IOException;
+import java.util.function.Consumer;
 
 public class WildcardFinderPlugin extends TreeScanner<Void, Void> implements Plugin, TaskListener {
+
+    private final Consumer<String> logger;
+
+    public WildcardFinderPlugin(Consumer<String> logger){
+        this.logger = logger;
+    }
     @Override
     public void started(TaskEvent e) {
         TaskListener.super.started(e);
@@ -55,10 +63,51 @@ public class WildcardFinderPlugin extends TreeScanner<Void, Void> implements Plu
         return count;
     }
     public static final String preText = "[ANDI] ";
+
+    @Override
+    public Void visitMemberSelect(MemberSelectTree node, Void unused) {
+        try {
+            var type_field = node.getClass().getField("type");
+            var pos_field = node.getClass().getField("pos");
+            type_field.setAccessible(true);
+            pos_field.setAccessible(true);
+            String typeText = type_field.get(node).toString();
+            int methodPos = pos_field.getInt(node);
+            if(typeText.contains("capture#")){ //we found a capture conversion
+                //System.out.println(node.getClass().getMethod("getStartPosition").invoke(node));
+                logger.accept(preText + "Field-CC: " + typeText + " in " + currentSource + " " + lineOfPosition(currentClassContent,methodPos));
+                var expr = node.getExpression();
+                var expr_type_field = node.getClass().getField("type");
+                expr_type_field.setAccessible(true);
+                String exprTypeText = expr_type_field.get(expr).toString();
+                if(exprTypeText.contains("capture") || exprTypeText.contains("?")){
+                    logger.accept(preText + "Field-CC!: " + typeText + " in " + currentSource + " " + lineOfPosition(currentClassContent,methodPos));
+                }
+            }else{
+                logger.accept(preText + "normal field access");
+            }
+        } catch (Throwable e){
+            //System.out.println("Error in method invocation: " + e.getMessage()+
+            //        " in "+currentSource);i
+        }
+        return super.visitMemberSelect(node, unused);
+    }
+
     @Override
     public Void visitMethodInvocation(MethodInvocationTree node, Void unused) {
         var args = node.getArguments();
+        String methString = "";
+        try{
+            var meth_field = node.getClass().getField("meth");
+            meth_field.setAccessible(true);
+            var meth = meth_field.get(node);
+            var sym_field = meth.getClass().getField("sym");
+            sym_field.setAccessible(true);
+            methString = sym_field.get(meth).toString();
+            //System.out.println(methString);
+        }catch (Throwable e){}
         try {
+            int argumentNumber = 0;
             for(var arg : args){
                 var type_field = arg.getClass().getField("type");
                 var pos_field = arg.getClass().getField("pos");
@@ -66,12 +115,15 @@ public class WildcardFinderPlugin extends TreeScanner<Void, Void> implements Plu
                 pos_field.setAccessible(true);
                 String typeText = type_field.get(arg).toString();
                 int methodPos = pos_field.getInt(node);
-                if(typeText.contains("capture#")){ //we found a capture conversion
+                if(typeText.contains("capture#") && methString.startsWith("<")){ //we found a capture conversion
                     //System.out.println(node.getClass().getMethod("getStartPosition").invoke(node));
-                    System.out.println(preText + "CC: " + typeText + " in " + currentSource + " " + lineOfPosition(currentClassContent,methodPos));
+                    logger.accept(preText + "CC!: "+ "Arg#"+argumentNumber + ": " + typeText + " in " + currentSource + " " + lineOfPosition(currentClassContent,methodPos) + " of method " + methString);
+                }else if(typeText.contains("capture#")) {
+                    logger.accept(preText + "CC: "+ "Arg#"+argumentNumber + ": " + typeText + " in " + currentSource + " " + lineOfPosition(currentClassContent,methodPos) + " of method " + methString);
                 }else{
-                    System.out.println(preText + "normal Method call");
+                    logger.accept(preText + "normal Method call");
                 }
+                argumentNumber++;
             }
         } catch (NoSuchFieldException e) {
             //System.out.println("Argument has no 'type' field");