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

Optimization. Do not create objects for flexible type capabilities.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-04-21 19:53:44 +03:00
parent 75d7390a94
commit c25e2e34a2
3 changed files with 36 additions and 31 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
+14 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 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.
@@ -290,19 +290,22 @@ class LazyJavaTypeResolver(
override val id: String get() = "kotlin.jvm.PlatformType"
override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>, jetType: KotlinType, flexibility: Flexibility): T? {
@Suppress("UNCHECKED_CAST")
return when (capabilityClass) {
CustomTypeVariable::class.java, Specificity::class.java -> Impl(flexibility) as T
else -> null
}
override fun createFlexibleType(lowerBound: KotlinType, upperBound: KotlinType): KotlinType {
if (lowerBound == upperBound) return lowerBound
return Impl(lowerBound, upperBound)
}
private class Impl(lowerBound: KotlinType, upperBound: KotlinType) :
DelegatingFlexibleType(lowerBound, upperBound, FlexibleJavaClassifierTypeCapabilities), CustomTypeVariable, Specificity {
private class Impl(val flexibility: Flexibility) : CustomTypeVariable, Specificity {
private val lowerBound: KotlinType get() = flexibility.lowerBound
private val upperBound: KotlinType get() = flexibility.upperBound
override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>): T? {
@Suppress("UNCHECKED_CAST")
return when (capabilityClass) {
CustomTypeVariable::class.java, Specificity::class.java -> this as T
else -> super.getCapability(capabilityClass)
}
}
override val isTypeVariable: Boolean = lowerBound.getConstructor() == upperBound.getConstructor()
&& lowerBound.getConstructor().getDeclarationDescriptor() is TypeParameterDescriptor