azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Duplicate signature generation fixed for collection classes

Browse Source 
wWe used to generate a throwing stub clear();V twice, when something extended both Collection and Map
This commit is contained in:
Andrey Breslav
2014-06-16 22:12:49 +04:00
parent 2351c53dce
commit e27f3a9ab7
1 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+23 -16
View File
@@ -535,12 +535,17 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
} }
} }
private void generateMethodStub( private class MethodStubGenerator {
private final Set<String> generatedSignatures = new HashSet<String>();
public void generate(
@NotNull String name, @NotNull String name,
@NotNull String desc, @NotNull String desc,
@NotNull ClassifierDescriptor returnedClassifier, @NotNull ClassifierDescriptor returnedClassifier,
@NotNull ClassifierDescriptor... valueParameterClassifiers @NotNull ClassifierDescriptor... valueParameterClassifiers
) { ) {
// avoid generating same signature twice
if (!generatedSignatures.add(name + desc)) return;
if (JvmCodegenUtil.getDeclaredFunctionByRawSignature( if (JvmCodegenUtil.getDeclaredFunctionByRawSignature(
descriptor, Name.identifier(name), returnedClassifier, valueParameterClassifiers) == null) { descriptor, Name.identifier(name), returnedClassifier, valueParameterClassifiers) == null) {
int access = descriptor.getKind() == ClassKind.TRAIT ? int access = descriptor.getKind() == ClassKind.TRAIT ?
@@ -554,47 +559,49 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
} }
} }
} }
}
private void generateBuiltinMethodStubs() { private void generateBuiltinMethodStubs() {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
MethodStubGenerator methodStubs = new MethodStubGenerator();
if (isSubclass(descriptor, builtIns.getCollection())) { if (isSubclass(descriptor, builtIns.getCollection())) {
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getCollection(), 0); ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getCollection(), 0);
generateMethodStub("add", "(Ljava/lang/Object;)Z", builtIns.getBoolean(), classifier); methodStubs.generate("add", "(Ljava/lang/Object;)Z", builtIns.getBoolean(), classifier);
generateMethodStub("remove", "(Ljava/lang/Object;)Z", builtIns.getBoolean(), builtIns.getAny()); methodStubs.generate("remove", "(Ljava/lang/Object;)Z", builtIns.getBoolean(), builtIns.getAny());
generateMethodStub("addAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection()); methodStubs.generate("addAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection());
generateMethodStub("removeAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection()); methodStubs.generate("removeAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection());
generateMethodStub("retainAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection()); methodStubs.generate("retainAll", "(Ljava/util/Collection;)Z", builtIns.getBoolean(), builtIns.getCollection());
generateMethodStub("clear", "()V", builtIns.getUnit()); methodStubs.generate("clear", "()V", builtIns.getUnit());
} }
if (isSubclass(descriptor, builtIns.getList())) { if (isSubclass(descriptor, builtIns.getList())) {
ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getList(), 0); ClassifierDescriptor classifier = getSubstituteForTypeParameterOf(builtIns.getList(), 0);
generateMethodStub("set", "(ILjava/lang/Object;)Ljava/lang/Object;", classifier, builtIns.getInt(), classifier); methodStubs.generate("set", "(ILjava/lang/Object;)Ljava/lang/Object;", classifier, builtIns.getInt(), classifier);
generateMethodStub("add", "(ILjava/lang/Object;)V", builtIns.getUnit(), builtIns.getInt(), classifier); methodStubs.generate("add", "(ILjava/lang/Object;)V", builtIns.getUnit(), builtIns.getInt(), classifier);
generateMethodStub("remove", "(I)Ljava/lang/Object;", classifier, builtIns.getInt()); methodStubs.generate("remove", "(I)Ljava/lang/Object;", classifier, builtIns.getInt());
} }
if (isSubclass(descriptor, builtIns.getMap())) { if (isSubclass(descriptor, builtIns.getMap())) {
ClassifierDescriptor keyClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 0); ClassifierDescriptor keyClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 0);
ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 1); ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMap(), 1);
generateMethodStub("put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, keyClassifier, methodStubs.generate("put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, keyClassifier,
valueClassifier); valueClassifier);
generateMethodStub("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, builtIns.getAny()); methodStubs.generate("remove", "(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, builtIns.getAny());
generateMethodStub("putAll", "(Ljava/util/Map;)V", builtIns.getUnit(), builtIns.getMap()); methodStubs.generate("putAll", "(Ljava/util/Map;)V", builtIns.getUnit(), builtIns.getMap());
generateMethodStub("clear", "()V", builtIns.getUnit()); methodStubs.generate("clear", "()V", builtIns.getUnit());
} }
if (isSubclass(descriptor, builtIns.getMapEntry())) { if (isSubclass(descriptor, builtIns.getMapEntry())) {
ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMapEntry(), 1); ClassifierDescriptor valueClassifier = getSubstituteForTypeParameterOf(builtIns.getMapEntry(), 1);
generateMethodStub("setValue", "(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, valueClassifier); methodStubs.generate("setValue", "(Ljava/lang/Object;)Ljava/lang/Object;", valueClassifier, valueClassifier);
} }
if (isSubclass(descriptor, builtIns.getIterator())) { if (isSubclass(descriptor, builtIns.getIterator())) {
generateMethodStub("remove", "()V", builtIns.getUnit()); methodStubs.generate("remove", "()V", builtIns.getUnit());
} }
} }