From bb27d5c283f717fab1627f94aa4c855a8a1a4c13 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 17 May 2013 14:07:06 +0400 Subject: [PATCH] Class resolution simplified (effectively dead code eliminated) --- .../serialization/NameResolver.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java index dc727f18197..cfb1d683bb8 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java @@ -54,25 +54,7 @@ public class NameResolver { ProtoBuf.QualifiedNameTable.QualifiedName fqNameProto = qualifiedNames.getQualifiedNames(fqNameIndex); assert fqNameProto.getKind() == ProtoBuf.QualifiedNameTable.QualifiedName.Kind.CLASS : "Not a class fqName: " + getFqName(fqNameIndex); - if (fqNameProto.hasParentQualifiedName()) { - int parentFqNameIndex = fqNameProto.getParentQualifiedName(); - ProtoBuf.QualifiedNameTable.QualifiedName parentFqNameProto = qualifiedNames.getQualifiedNames(parentFqNameIndex); - switch (fqNameProto.getKind()) { - case CLASS: - return classResolver.findClass(getFqName(fqNameIndex)); - case PACKAGE: - Name name = getName(fqNameProto.getShortName()); - ClassDescriptor outerClass = getClassDescriptor(parentFqNameIndex); - if (outerClass == null) return null; - - return (ClassDescriptor) outerClass.getUnsubstitutedInnerClassesScope().getClassifier(name); - } - throw new IllegalStateException("Unknown kind: " + fqNameProto); - } - else { - FqName fqName = FqName.topLevel(getName(fqNameProto.getShortName())); - return classResolver.findClass(fqName); - } + return classResolver.findClass(getFqName(fqNameIndex)); } @NotNull