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

Extract and use name-mapping method in JetTypeMapper

Browse Source 
It doesn't ever make sense to create JVM method signatures with names that come
directly from descriptors; we need to map some of them (<get-?> for property
accessors, <anonymous> for local functions/lambdas)
This commit is contained in:
Alexander Udalov
2013-12-23 20:56:31 +04:00
parent 8e753e6efd
commit 135accea1d
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+19 -7
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.codegen.signature.JvmMethodParameterKind;
import org.jetbrains.jet.codegen.signature.JvmMethodParameterSignature;
import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
@@ -547,13 +548,24 @@ public class JetTypeMapper extends BindingTraceAware {
}
@NotNull
public JvmMethodSignature mapSignature(@NotNull FunctionDescriptor f, boolean needGenericSignature, @NotNull OwnerKind kind) {
String name = f.getName().asString();
if (f instanceof PropertyAccessorDescriptor) {
boolean isGetter = f instanceof PropertyGetterDescriptor;
name = getPropertyAccessorName(((PropertyAccessorDescriptor) f).getCorrespondingProperty(), isGetter);
private static String mapFunctionName(@NotNull FunctionDescriptor descriptor) {
if (descriptor instanceof PropertyAccessorDescriptor) {
return getPropertyAccessorName(((PropertyAccessorDescriptor) descriptor).getCorrespondingProperty(),
descriptor instanceof PropertyGetterDescriptor);
}
return mapSignature(name, f, needGenericSignature, kind);
else if (isLocalNamedFun(descriptor) ||
descriptor instanceof AnonymousFunctionDescriptor ||
descriptor instanceof ExpressionAsFunctionDescriptor) {
return "invoke";
}
else {
return descriptor.getName().asString();
}
}
@NotNull
public JvmMethodSignature mapSignature(@NotNull FunctionDescriptor f, boolean needGenericSignature, @NotNull OwnerKind kind) {
return mapSignature(mapFunctionName(f), f, needGenericSignature, kind);
}
@NotNull
@@ -563,7 +575,7 @@ public class JetTypeMapper extends BindingTraceAware {
@NotNull
public JvmMethodSignature mapSignature(@NotNull FunctionDescriptor f) {
return mapSignature(f.getName(), f);
return mapSignature(mapFunctionName(f), f, false, OwnerKind.IMPLEMENTATION);
}
@NotNull