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

Do not update recorded type if it hasn't changed

Browse Source 
It's important for argument that has a type that shouldn't be updated.
Like '(b)' in 'a == (b)', which type is 'Any' (for proper 'equals' resolve).
Type for 'b' shouldn't be updated to 'Any' as well.
This commit is contained in:
Svetlana Isakova
2014-06-23 19:12:15 +04:00
parent 48511206ad
commit dd95439767
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt
+9 -2
View File
@@ -249,7 +249,7 @@ public class CallCompleter(
updatedType = ArgumentTypeResolver.updateResultArgumentTypeIfNotDenotable(context as ResolutionContext<*>, expression) updatedType = ArgumentTypeResolver.updateResultArgumentTypeIfNotDenotable(context as ResolutionContext<*>, expression)
} }
updateRecordedTypeForArgument(updatedType, expression, context.trace) updateRecordedTypeForArgument(updatedType, recordedType, expression, context.trace)
// While the expected type is not known, the function literal arguments are not analyzed (to analyze function literal bodies once), // While the expected type is not known, the function literal arguments are not analyzed (to analyze function literal bodies once),
// but they should be analyzed when the expected type is known (during the call completion). // but they should be analyzed when the expected type is known (during the call completion).
@@ -292,7 +292,14 @@ public class CallCompleter(
return argument?.getCorrespondingCall(bindingContext) return argument?.getCorrespondingCall(bindingContext)
} }
private fun updateRecordedTypeForArgument(updatedType: JetType?, argumentExpression: JetExpression, trace: BindingTrace) { private fun updateRecordedTypeForArgument(
updatedType: JetType?,
recordedType: JetType?,
argumentExpression: JetExpression,
trace: BindingTrace
) {
if (recordedType == updatedType) return
fun deparenthesizeOrGetSelector(expression: JetExpression?): JetExpression? { fun deparenthesizeOrGetSelector(expression: JetExpression?): JetExpression? {
val deparenthesized = JetPsiUtil.deparenthesizeOnce(expression, /* deparenthesizeBinaryExpressionWithTypeRHS = */ false) val deparenthesized = JetPsiUtil.deparenthesizeOnce(expression, /* deparenthesizeBinaryExpressionWithTypeRHS = */ false)
if (deparenthesized != expression) return deparenthesized if (deparenthesized != expression) return deparenthesized