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

Merge branch 'master' into removeWildcards

Browse Source
This commit is contained in:
Andreas Stadelmeier 2024-12-17 16:35:03 +01:00
commit 7c06bd67df
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 =

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

@ -5,8 +5,15 @@ 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);
@ -58,7 +65,18 @@ public class WildcardFinderPlugin extends TreeScanner<Void, Void> implements Plu
@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 +84,13 @@ 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{
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");