# HG changeset patch # User Roland Schatz # Date 1450272139 -3600 # Node ID d223936249bdff90a2e37def83b27249fd64397b # Parent f59bbe75e773230dc946add1b8ae8c31d62174f7 Use more meaningful names for generated plugin classes. diff -r f59bbe75e773 -r d223936249bd graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/GeneratedPlugin.java --- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/GeneratedPlugin.java Tue Dec 15 18:28:51 2015 +0100 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/GeneratedPlugin.java Wed Dec 16 14:22:19 2015 +0100 @@ -46,15 +46,26 @@ protected final ExecutableElement intrinsicMethod; private boolean needInjectionProvider; + private String pluginName; + public GeneratedPlugin(ExecutableElement intrinsicMethod) { this.intrinsicMethod = intrinsicMethod; this.needInjectionProvider = false; + this.pluginName = intrinsicMethod.getEnclosingElement().getSimpleName() + "_" + intrinsicMethod.getSimpleName(); + } + + public String getPluginName() { + return pluginName; } - public void generate(ProcessingEnvironment env, PrintWriter out, int idx) { + public void setPluginName(String pluginName) { + this.pluginName = pluginName; + } + + public void generate(ProcessingEnvironment env, PrintWriter out) { out.printf(" // class: %s\n", intrinsicMethod.getEnclosingElement()); out.printf(" // method: %s\n", intrinsicMethod); - out.printf(" private static final class Plugin%d extends GeneratedInvocationPlugin {\n", idx); + out.printf(" private static final class %s extends GeneratedInvocationPlugin {\n", pluginName); out.printf("\n"); out.printf(" @Override\n"); out.printf(" public boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] args) {\n"); @@ -64,13 +75,13 @@ InjectedDependencies deps = createExecute(env, out); out.printf(" }\n"); - createPrivateMembers(out, deps, idx); + createPrivateMembers(out, deps); out.printf(" }\n"); } - public void register(PrintWriter out, int idx) { - out.printf(" plugins.register(new Plugin%d(", idx); + public void register(PrintWriter out) { + out.printf(" plugins.register(new %s(", pluginName); if (needInjectionProvider) { out.printf("injection"); } @@ -109,7 +120,7 @@ } } - private void createPrivateMembers(PrintWriter out, InjectedDependencies deps, int idx) { + private void createPrivateMembers(PrintWriter out, InjectedDependencies deps) { if (!deps.isEmpty()) { out.printf("\n"); for (Dependency dep : deps) { @@ -117,7 +128,7 @@ } out.printf("\n"); - out.printf(" private Plugin%d(InjectionProvider injection) {\n", idx); + out.printf(" private %s(InjectionProvider injection) {\n", pluginName); for (Dependency dep : deps) { out.printf(" this.%s = %s;\n", dep.name, dep.inject(intrinsicMethod)); } diff -r f59bbe75e773 -r d223936249bd graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/PluginGenerator.java --- a/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/PluginGenerator.java Tue Dec 15 18:28:51 2015 +0100 +++ b/graal/com.oracle.graal.replacements.verifier/src/com/oracle/graal/replacements/verifier/PluginGenerator.java Wed Dec 16 14:22:19 2015 +0100 @@ -25,16 +25,25 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.function.Function; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeVariable; +import javax.lang.model.type.WildcardType; import javax.tools.Diagnostic; import javax.tools.JavaFileObject; @@ -58,6 +67,7 @@ public void generateAll(ProcessingEnvironment env) { for (Entry> entry : plugins.entrySet()) { + disambiguateNames(entry.getValue()); createPluginFactory(env, entry.getKey(), entry.getValue()); } } @@ -72,6 +82,71 @@ return prev; } + private static void disambiguateWith(List plugins, Function genName) { + plugins.sort(Comparator.comparing(GeneratedPlugin::getPluginName)); + + GeneratedPlugin current = plugins.get(0); + String currentName = current.getPluginName(); + + for (int i = 1; i < plugins.size(); i++) { + GeneratedPlugin next = plugins.get(i); + if (currentName.equals(next.getPluginName())) { + if (current != null) { + current.setPluginName(genName.apply(current)); + current = null; + } + next.setPluginName(genName.apply(next)); + } else { + current = next; + currentName = current.getPluginName(); + } + } + } + + private static void appendSimpleTypeName(StringBuilder ret, TypeMirror type) { + switch (type.getKind()) { + case DECLARED: + DeclaredType declared = (DeclaredType) type; + TypeElement element = (TypeElement) declared.asElement(); + ret.append(element.getSimpleName()); + break; + case TYPEVAR: + appendSimpleTypeName(ret, ((TypeVariable) type).getUpperBound()); + break; + case WILDCARD: + appendSimpleTypeName(ret, ((WildcardType) type).getExtendsBound()); + break; + case ARRAY: + appendSimpleTypeName(ret, ((ArrayType) type).getComponentType()); + ret.append("Array"); + break; + default: + ret.append(type); + } + } + + private static void disambiguateNames(List plugins) { + // if we have more than one method with the same name, disambiguate with the argument types + disambiguateWith(plugins, plugin -> { + StringBuilder ret = new StringBuilder(plugin.getPluginName()); + for (VariableElement param : plugin.intrinsicMethod.getParameters()) { + ret.append('_'); + appendSimpleTypeName(ret, param.asType()); + } + return ret.toString(); + }); + + // since we're using simple names for argument types, we could still have a collision + disambiguateWith(plugins, new Function() { + + private int idx = 0; + + public String apply(GeneratedPlugin plugin) { + return plugin.getPluginName() + "_" + (idx++); + } + }); + } + private static void createPluginFactory(ProcessingEnvironment env, Element topLevelClass, List plugins) { PackageElement pkg = (PackageElement) topLevelClass.getEnclosingElement(); @@ -89,10 +164,9 @@ out.printf("\n"); out.printf("@ServiceProvider(NodeIntrinsicPluginFactory.class)\n"); out.printf("public class %s implements NodeIntrinsicPluginFactory {\n", genClassName); - int idx = 0; for (GeneratedPlugin plugin : plugins) { out.printf("\n"); - plugin.generate(env, out, idx++); + plugin.generate(env, out); } out.printf("\n"); createPluginFactoryMethod(out, plugins); @@ -128,9 +202,8 @@ private static void createPluginFactoryMethod(PrintWriter out, List plugins) { out.printf(" public void registerPlugins(InvocationPlugins plugins, InjectionProvider injection) {\n"); - int idx = 0; for (GeneratedPlugin plugin : plugins) { - plugin.register(out, idx++); + plugin.register(out); } out.printf(" }\n"); }