Support overload ambiguity resolution for callable references by expected type.

Resolve callable references taking into account expected callable types.

This affects call resolution procedure (resolve 'foo' in for 'foo(::bar)') similar to the approach used for function literals:

* During "shape arguments" phase of call resolution, callable references are resolved in independent context without expected type. If the callable reference is ambiguous, its shape type is a function placeholder type without parameter types and return type information. Otherwise, it is a reflection type for the resolved function or property. Upper-level call is resolved without taking into account ambiguous callable references.

* During "complete call" phase of call resolution, resolve callable reference arguments to actual descriptors (if possible), and update constraint system for the given call accordingly.

 #KT-6982 Fixed
 #KT-5780 Fixed

This commit is contained in:

Dmitry Petrov

2015-07-14 17:53:12 +03:00

parent b3a2ee2148

commit 6437a4bdc6

51 changed files with 1057 additions and 247 deletions

									
										compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt
									
Vendored

		+1
		-1
	
												View File
												
				@@ -5,5 +5,5 @@ fun foo(<!UNUSED_PARAMETER!>x<!>: Any, y: Int) = y

				fun main() {

				    ::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>

				    val fooRef: (Int, Any) -> Unit = ::<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>

				    val fooRef: (Int, Any) -> Unit = ::<!NONE_APPLICABLE!>foo<!>

				}