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

Minor. Add not-nullable upper bound

Browse Source
This commit is contained in:
Denis Zharkov
2016-02-10 11:26:02 +03:00
parent 45bf300144
commit 6d98909c7a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt
+4 -4
View File
@@ -36,14 +36,14 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.firstOverridden
import org.jetbrains.kotlin.utils.singletonOrEmptyList import org.jetbrains.kotlin.utils.singletonOrEmptyList
import java.util.* import java.util.*
class BridgeForBuiltinSpecial<Signature>( class BridgeForBuiltinSpecial<Signature : Any>(
val from: Signature, val to: Signature, val from: Signature, val to: Signature,
val isSpecial: Boolean = false, val isSpecial: Boolean = false,
val isDelegateToSuper: Boolean = false val isDelegateToSuper: Boolean = false
) )
object BuiltinSpecialBridgesUtil { object BuiltinSpecialBridgesUtil {
@JvmStatic fun <Signature> generateBridgesForBuiltinSpecial( @JvmStatic fun <Signature : Any> generateBridgesForBuiltinSpecial(
function: FunctionDescriptor, function: FunctionDescriptor,
signatureByDescriptor: (FunctionDescriptor) -> Signature signatureByDescriptor: (FunctionDescriptor) -> Signature
): Set<BridgeForBuiltinSpecial<Signature>> { ): Set<BridgeForBuiltinSpecial<Signature>> {
@@ -92,7 +92,7 @@ object BuiltinSpecialBridgesUtil {
return bridges return bridges
} }
@JvmStatic fun <Signature> FunctionDescriptor.shouldHaveTypeSafeBarrier( @JvmStatic fun <Signature : Any> FunctionDescriptor.shouldHaveTypeSafeBarrier(
signatureByDescriptor: (FunctionDescriptor) -> Signature signatureByDescriptor: (FunctionDescriptor) -> Signature
): Boolean { ): Boolean {
if (BuiltinMethodsWithSpecialGenericSignature.getDefaultValueForOverriddenBuiltinFunction(this) == null) return false if (BuiltinMethodsWithSpecialGenericSignature.getDefaultValueForOverriddenBuiltinFunction(this) == null) return false
@@ -114,7 +114,7 @@ private fun findSuperImplementationForStubDelegation(function: FunctionDescripto
private fun findAllReachableDeclarations(functionDescriptor: FunctionDescriptor): MutableSet<FunctionDescriptor> = private fun findAllReachableDeclarations(functionDescriptor: FunctionDescriptor): MutableSet<FunctionDescriptor> =
findAllReachableDeclarations(DescriptorBasedFunctionHandle(functionDescriptor)).map { it.descriptor }.toMutableSet() findAllReachableDeclarations(DescriptorBasedFunctionHandle(functionDescriptor)).map { it.descriptor }.toMutableSet()
private fun <Signature> needGenerateSpecialBridge( private fun <Signature : Any> needGenerateSpecialBridge(
functionDescriptor: FunctionDescriptor, functionDescriptor: FunctionDescriptor,
reachableDeclarations: Collection<FunctionDescriptor>, reachableDeclarations: Collection<FunctionDescriptor>,
signatureByDescriptor: (FunctionDescriptor) -> Signature, signatureByDescriptor: (FunctionDescriptor) -> Signature,