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

Too many empty ArrayList stored for arguments

Browse Source
This commit is contained in:
Nikolay Krasko
2016-02-01 20:41:49 +03:00
committed by Nikolay Krasko
parent ff2029035e
commit 99a693a14b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+4 -3
View File
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.types.Variance.*
import org.jetbrains.kotlin.types.typeUtil.createProjection import org.jetbrains.kotlin.types.typeUtil.createProjection
import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.utils.sure
import org.jetbrains.kotlin.utils.toReadOnlyList
private val JAVA_LANG_CLASS_FQ_NAME: FqName = FqName("java.lang.Class") private val JAVA_LANG_CLASS_FQ_NAME: FqName = FqName("java.lang.Class")
@@ -187,12 +188,12 @@ class LazyJavaTypeResolver(
} }
RawSubstitution.computeProjection(parameter, attr, erasedUpperBound) RawSubstitution.computeProjection(parameter, attr, erasedUpperBound)
} }.toReadOnlyList()
} }
if (typeParameters.size != javaType.typeArguments.size) { if (typeParameters.size != javaType.typeArguments.size) {
// Most of the time this means there is an error in the Java code // Most of the time this means there is an error in the Java code
return typeParameters.map { p -> TypeProjectionImpl(ErrorUtils.createErrorType(p.name.asString())) } return typeParameters.map { p -> TypeProjectionImpl(ErrorUtils.createErrorType(p.name.asString())) }.toReadOnlyList()
} }
var howTheProjectionIsUsed = if (attr.howThisTypeIsUsed == SUPERTYPE) SUPERTYPE_ARGUMENT else TYPE_ARGUMENT var howTheProjectionIsUsed = if (attr.howThisTypeIsUsed == SUPERTYPE) SUPERTYPE_ARGUMENT else TYPE_ARGUMENT
return javaType.typeArguments.withIndex().map { return javaType.typeArguments.withIndex().map {
@@ -205,7 +206,7 @@ class LazyJavaTypeResolver(
val parameter = typeParameters[i] val parameter = typeParameters[i]
transformToTypeProjection(javaTypeArgument, howTheProjectionIsUsed.toAttributes(), parameter) transformToTypeProjection(javaTypeArgument, howTheProjectionIsUsed.toAttributes(), parameter)
}.toList() }.toReadOnlyList()
} }
private fun transformToTypeProjection( private fun transformToTypeProjection(