[NI] Report unstable smart cast directly instead of using SmartCastManager
Fix compilation errors, revealed by this fix. SmartCastManager is unnecessary for error reporting, intermediate diagnostics from the NI contain all required infromation. When SmartCastManager is used it leads to missing unstable smart casts in case of expressions with captured types. This happens, because data flow info is recorded for original expression without captured types, which is used as a key. DataFlowValues created from receivers with captured types can't be used to retrieve that info. ^KT-39010 Fixed
This commit is contained in:
+2
-2
@@ -76,7 +76,7 @@ class IntegerLiteralTypeApproximationTransformer(
|
||||
// check black box tests
|
||||
// e.g. Byte doesn't have `and` in member scope. It's an extension
|
||||
if (resultSymbol == null) return functionCall.compose()
|
||||
functionCall.resultType = data?.let { functionCall.resultType.resolvedTypeFromPrototype(it) } ?: resultSymbol.fir.returnTypeRef
|
||||
functionCall.resultType = data?.let { functionCall.resultType.resolvedTypeFromPrototype(it) } ?: resultSymbol!!.fir.returnTypeRef
|
||||
// If the original call has argument mapping, values in that mapping refer to value parameters in that original symbol. We should
|
||||
// map those original value parameters back to indices, and then renew the argument mapping with new value parameters in the result
|
||||
// symbol. Otherwise, while putting the value argument to the converted IR call, it will encounter an unknown value parameter,
|
||||
@@ -84,7 +84,7 @@ class IntegerLiteralTypeApproximationTransformer(
|
||||
val newArgumentMapping =
|
||||
functionCall.argumentMapping?.mapValues { (_, oldValueParameter) ->
|
||||
val index = operator.valueParameters.indexOf(oldValueParameter)
|
||||
if (index != -1) resultSymbol.fir.valueParameters[index] else oldValueParameter
|
||||
if (index != -1) resultSymbol!!.fir.valueParameters[index] else oldValueParameter
|
||||
}
|
||||
return functionCall.transformCalleeReference(
|
||||
StoreCalleeReference,
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@ abstract class AbstractFirUseSiteMemberScope(
|
||||
createFunctionCopy(firSimpleFunction, newSymbol).apply {
|
||||
resolvePhase = firSimpleFunction.resolvePhase
|
||||
typeParameters += firSimpleFunction.typeParameters
|
||||
valueParameters += firSimpleFunction.valueParameters.zip(foundFir.valueParameters)
|
||||
valueParameters += firSimpleFunction.valueParameters.zip(foundFir!!.valueParameters)
|
||||
.map { (overrideParameter, overriddenParameter) ->
|
||||
if (overriddenParameter.defaultValue != null)
|
||||
createValueParameterCopy(overrideParameter, overriddenParameter.defaultValue).apply {
|
||||
|
||||
Reference in New Issue
Block a user