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

Make type parameter nullable as it should be

Browse Source 
This change is needed, because in NI we perform a more strict check
This commit is contained in:
Mikhail Zarechenskiy
2018-03-27 13:39:39 +03:00
parent 3592b19fa4
commit 152a9a21f9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
+1 -1
View File
@@ -85,7 +85,7 @@ open class InliningContext(
fun subInlineWithClassRegeneration( fun subInlineWithClassRegeneration(
generator: NameGenerator, generator: NameGenerator,
newTypeMappings: MutableMap<String, String>, newTypeMappings: MutableMap<String, String?>,
callSiteInfo: InlineCallSiteInfo callSiteInfo: InlineCallSiteInfo
): InliningContext = RegeneratedClassContext( ): InliningContext = RegeneratedClassContext(
this, expressionMap, state, generator, TypeRemapper.createFrom(typeRemapper, newTypeMappings), this, expressionMap, state, generator, TypeRemapper.createFrom(typeRemapper, newTypeMappings),
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt
+1 -1
View File
@@ -53,7 +53,7 @@ class MethodInliner(
//keeps order //keeps order
private val transformations = ArrayList<TransformationInfo>() private val transformations = ArrayList<TransformationInfo>()
//current state //current state
private val currentTypeMapping = HashMap<String, String>() private val currentTypeMapping = HashMap<String, String?>()
private val result = InlineResult.create() private val result = InlineResult.create()
private var lambdasFinallyBlocks: Int = 0 private var lambdasFinallyBlocks: Int = 0
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TypeRemapper.kt
+4 -4
View File
@@ -22,7 +22,7 @@ class TypeParameter(val oldName: String, val newName: String?, val isReified: Bo
//typeMapping data could be changed outside through method processing //typeMapping data could be changed outside through method processing
class TypeRemapper private constructor( class TypeRemapper private constructor(
private val typeMapping: MutableMap<String, String>, private val typeMapping: MutableMap<String, String?>,
val parent: TypeRemapper? = null, val parent: TypeRemapper? = null,
private val isRootInlineLambda: Boolean = false private val isRootInlineLambda: Boolean = false
) { ) {
@@ -65,7 +65,7 @@ class TypeRemapper private constructor(
companion object { companion object {
@JvmStatic @JvmStatic
fun createRoot(formalTypeParameters: TypeParameterMappings?): TypeRemapper { fun createRoot(formalTypeParameters: TypeParameterMappings?): TypeRemapper {
return TypeRemapper(HashMap<String, String>()).apply { return TypeRemapper(HashMap<String, String?>()).apply {
formalTypeParameters?.forEach { formalTypeParameters?.forEach {
registerTypeParameter(it) registerTypeParameter(it)
} }
@@ -73,7 +73,7 @@ class TypeRemapper private constructor(
} }
@JvmStatic @JvmStatic
fun createFrom(mappings: MutableMap<String, String>): TypeRemapper { fun createFrom(mappings: MutableMap<String, String?>): TypeRemapper {
return TypeRemapper(mappings) return TypeRemapper(mappings)
} }
@@ -83,7 +83,7 @@ class TypeRemapper private constructor(
return TypeRemapper(createNewAndMerge(parentRemapper, mappings), parentRemapper, isRootInlineLambda) return TypeRemapper(createNewAndMerge(parentRemapper, mappings), parentRemapper, isRootInlineLambda)
} }
private fun createNewAndMerge(remapper: TypeRemapper, additionalTypeMappings: Map<String, String?>): MutableMap<String, String> { private fun createNewAndMerge(remapper: TypeRemapper, additionalTypeMappings: Map<String, String?>): MutableMap<String, String?> {
return HashMap(remapper.typeMapping).apply { return HashMap(remapper.typeMapping).apply {
this += additionalTypeMappings this += additionalTypeMappings
} }