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

Align generic signature for inner classes to work as in Java

Browse Source 
#KT-10397 Fixed

According to JVMS (p. 4.3.4) inner classes should be separated with `$` in generic signature.

Note that in Java, inner types separated with `.` after first parameterized type, and now we preserve the same behaviour. See tests for clarification.
This commit is contained in:
Mikhail Zarechenskiy
2017-04-26 16:23:54 +03:00
parent 14e798a1fc
commit a0d7b703f4
16 changed files with 350 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+21 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -530,25 +530,35 @@ public class KotlinTypeMapper {
List<PossiblyInnerType> innerTypesAsList = possiblyInnerType.segments();
if (innerTypesAsList.size() == 1) {
int indexOfParameterizedType = CollectionsKt.indexOfFirst(innerTypesAsList, innerPart -> !innerPart.getArguments().isEmpty());
if (indexOfParameterizedType < 0 || innerTypesAsList.size() == 1) {
signatureVisitor.writeClassBegin(asmType);
writeGenericArguments(signatureVisitor, possiblyInnerType, mode);
}
else {
ClassDescriptor outermostClass = innerTypesAsList.get(0).getClassDescriptor();
signatureVisitor.writeOuterClassBegin(asmType, mapType(outermostClass.getDefaultType()).getInternalName());
}
PossiblyInnerType outerType = innerTypesAsList.get(indexOfParameterizedType);
for (int i = 0; i < innerTypesAsList.size(); i++) {
PossiblyInnerType innerPart = innerTypesAsList.get(i);
if (i > 0) {
signatureVisitor.writeInnerClass(getJvmShortName(innerPart.getClassDescriptor()));
}
writeGenericArguments(signatureVisitor, innerPart, mode);
signatureVisitor.writeOuterClassBegin(asmType, mapType(outerType.getClassDescriptor()).getInternalName());
writeGenericArguments(signatureVisitor, outerType, mode);
writeInnerParts(innerTypesAsList, signatureVisitor, mode, indexOfParameterizedType + 1); // inner parts separated by `.`
}
signatureVisitor.writeClassEnd();
}
private void writeInnerParts(
@NotNull List<PossiblyInnerType> innerTypesAsList,
@NotNull JvmSignatureWriter signatureVisitor,
@NotNull TypeMappingMode mode,
int index
) {
for (PossiblyInnerType innerPart : innerTypesAsList.subList(index, innerTypesAsList.size())) {
signatureVisitor.writeInnerClass(getJvmShortName(innerPart.getClassDescriptor()));
writeGenericArguments(signatureVisitor, innerPart, mode);
}
}
@NotNull
private static String getJvmShortName(@NotNull ClassDescriptor klass) {
ClassId classId = JavaToKotlinClassMap.INSTANCE.mapKotlinToJava(DescriptorUtils.getFqName(klass));