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

Update type for both version of expression: parenthesis and not

Browse Source
This commit is contained in:
Victor Petukhov
2021-05-21 15:12:47 +03:00
parent c0ad1c9b18
commit ac222fdb41
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
+5 -2
View File
@@ -355,6 +355,7 @@ class KotlinToResolvedCallTransformer(
} ?: return null } ?: return null
val recordedType = context.trace.getType(deparenthesized) val recordedType = context.trace.getType(deparenthesized)
val recordedTypeForParenthesized = context.trace.getType(expression)
var updatedType = convertedArgumentType ?: getResolvedCallForArgumentExpression(deparenthesized, context)?.run { var updatedType = convertedArgumentType ?: getResolvedCallForArgumentExpression(deparenthesized, context)?.run {
makeNullableTypeIfSafeReceiver(resultingDescriptor.returnType, context) makeNullableTypeIfSafeReceiver(resultingDescriptor.returnType, context)
@@ -384,7 +385,7 @@ class KotlinToResolvedCallTransformer(
context.trace.report(Errors.SIGNED_CONSTANT_CONVERTED_TO_UNSIGNED.on(deparenthesized)) context.trace.report(Errors.SIGNED_CONSTANT_CONVERTED_TO_UNSIGNED.on(deparenthesized))
} }
updatedType = updateRecordedTypeForArgument(updatedType, recordedType, expression, context) updatedType = updateRecordedTypeForArgument(updatedType, recordedType, recordedTypeForParenthesized, expression, context)
dataFlowAnalyzer.checkType(updatedType, deparenthesized, context, reportErrorDuringTypeCheck) dataFlowAnalyzer.checkType(updatedType, deparenthesized, context, reportErrorDuringTypeCheck)
@@ -410,10 +411,12 @@ class KotlinToResolvedCallTransformer(
private fun updateRecordedTypeForArgument( private fun updateRecordedTypeForArgument(
updatedType: KotlinType?, updatedType: KotlinType?,
recordedType: KotlinType?, recordedType: KotlinType?,
recordedTypeForParenthesized: KotlinType?,
argumentExpression: KtExpression, argumentExpression: KtExpression,
context: BasicCallResolutionContext, context: BasicCallResolutionContext,
): KotlinType? { ): KotlinType? {
if ((!ErrorUtils.containsErrorType(recordedType) && recordedType == updatedType) || updatedType == null) return updatedType if ((!ErrorUtils.containsErrorType(recordedType) && recordedType == updatedType && recordedType == recordedTypeForParenthesized) || updatedType == null)
return updatedType
val expressions = ArrayList<KtExpression>().also { expressions -> val expressions = ArrayList<KtExpression>().also { expressions ->
var expression: KtExpression? = argumentExpression var expression: KtExpression? = argumentExpression