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

Ability to generate light classes when a type parameter appears in supertypes

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-04 17:44:47 +04:00
parent 70f6041c70
commit db2ad06e9c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+12 -8
View File
@@ -347,13 +347,15 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
for (JetDelegationSpecifier specifier : myClass.getDelegationSpecifiers()) { for (JetDelegationSpecifier specifier : myClass.getDelegationSpecifiers()) {
JetType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference()); JetType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference());
assert superType != null : "No supertype for class: " + myClass.getText(); assert superType != null : "No supertype for class: " + myClass.getText();
ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor(); ClassifierDescriptor classifierDescriptor = superType.getConstructor().getDeclarationDescriptor();
if (isInterface(superClassDescriptor)) { if (classifierDescriptor instanceof ClassDescriptor) {
interfaceSupertypes.add(superType); ClassDescriptor superClassDescriptor = (ClassDescriptor) classifierDescriptor;
if (isInterface(superClassDescriptor)) {
interfaceSupertypes.add(superType);
assert superClassDescriptor != null : "should be already checked by isInterface()"; if (JvmAbi.K_OBJECT.equalsTo(DescriptorUtils.getFqName(superClassDescriptor))) {
if (JvmAbi.K_OBJECT.equalsTo(DescriptorUtils.getFqName(superClassDescriptor))) { explicitKObject = true;
explicitKObject = true; }
} }
} }
} }
@@ -400,8 +402,10 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
assert superType != null : assert superType != null :
String.format("No type recorded for \n---\n%s\n---\n", JetPsiUtil.getElementTextWithContext(specifier)); String.format("No type recorded for \n---\n%s\n---\n", JetPsiUtil.getElementTextWithContext(specifier));
ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor(); ClassifierDescriptor classifierDescriptor = superType.getConstructor().getDeclarationDescriptor();
assert superClassDescriptor != null; if (!(classifierDescriptor instanceof ClassDescriptor)) continue;
ClassDescriptor superClassDescriptor = (ClassDescriptor) classifierDescriptor;
if (!isInterface(superClassDescriptor)) { if (!isInterface(superClassDescriptor)) {
superClassType = superType; superClassType = superType;
superClassAsmType = typeMapper.mapClass(superClassDescriptor); superClassAsmType = typeMapper.mapClass(superClassDescriptor);