diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java index 085dfb7f5c3..ef5faad65c5 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java @@ -176,7 +176,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen { if(bridge.getDescriptor().equals(delegate.getDescriptor())) return; - final MethodVisitor mv = cv.newMethod(fun, ACC_PUBLIC, "invoke", bridge.getDescriptor(), state.getTypeMapper().genericSignature(funDescriptor), new String[0]); + final MethodVisitor mv = cv.newMethod(fun, ACC_PUBLIC, "invoke", bridge.getDescriptor(), null, new String[0]); if (cv.generateCode()) { mv.visitCode(); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java index fdd99201f77..587570af1a5 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java @@ -392,36 +392,6 @@ public class JetTypeMapper { return new Method(name, returnType, parameterTypes.toArray(new Type[parameterTypes.size()])); } - public String genericSignature(FunctionDescriptor f) { - StringBuffer answer = new StringBuffer(); - final List typeParameters = f.getTypeParameters(); - if (!typeParameters.isEmpty()) { - answer.append('<'); - for (TypeParameterDescriptor p : typeParameters) { - appendTypeParameterSignature(answer, p); - } - answer.append('>'); - } - - answer.append('('); - for (ValueParameterDescriptor p : f.getValueParameters()) { - appendType(answer, p.getOutType()); - } - answer.append(')'); - - appendType(answer, f.getReturnType()); - - return answer.toString(); - } - - private void appendType(StringBuffer answer, JetType type) { - answer.append(mapType(type).getDescriptor()); // TODO: type parameter references! - } - - private static void appendTypeParameterSignature(StringBuffer answer, TypeParameterDescriptor p) { - answer.append(p.getName()); // TODO: BOUND! - } - public Method mapGetterSignature(PropertyDescriptor descriptor, OwnerKind kind) { Type returnType = mapType(descriptor.getOutType()); String name = PropertyCodegen.getterName(descriptor.getName());