From ffd0119a467191cca16eebbb705c1266f56e9cc1 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 13 May 2011 18:58:35 +0200 Subject: [PATCH] use standard method index --- .../org/jetbrains/jet/codegen/ExpressionCodegen.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 5a08b679067..a8db4e34835 100644 --- a/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -1330,9 +1330,8 @@ public class ExpressionCodegen extends JetVisitor { if (declarationDescriptor instanceof TypeParameterDescriptor) { DeclarationDescriptor containingDeclaration = declarationDescriptor.getContainingDeclaration(); if (containingDeclaration == contextType && contextType instanceof ClassDescriptor) { - int index = indexOfTypeParameter((ClassDescriptor) contextType, (TypeParameterDescriptor) declarationDescriptor); loadTypeInfo((ClassDescriptor) contextType, v); - v.iconst(index); + v.iconst(((TypeParameterDescriptor) declarationDescriptor).getIndex()); v.invokevirtual("jet/typeinfo/TypeInfo", "getTypeParameter", "(I)Ljet/typeinfo/TypeInfo;"); return; } @@ -1361,15 +1360,6 @@ public class ExpressionCodegen extends JetVisitor { } } - private int indexOfTypeParameter(ClassDescriptor classDescriptor, TypeParameterDescriptor typeParameterDescriptor) { - List parameters = classDescriptor.getTypeConstructor().getParameters(); - int index = parameters.indexOf(typeParameterDescriptor); - if (index < 0) { - throw new UnsupportedOperationException("can't find type parameter index"); - } - return index; - } - private static class CompilationException extends RuntimeException { } }