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

[FIR] Use Function<R> as super type for all FunctionNtypes

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-01-24 11:35:37 +03:00
parent 099d737e86
commit 7d8363d6aa
37 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/StandardClassIds.kt
+2
View File
@@ -40,6 +40,8 @@ object StandardClassIds {
val Comparable = "Comparable".baseId()
val Number = "Number".baseId()
val Function = "Function".baseId()
fun byName(name: String) = name.baseId()
fun reflectByName(name: String) = name.reflectId()
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/impl/FirBuiltinSymbolProvider.kt
+10 -2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
import org.jetbrains.kotlin.fir.scopes.impl.nestedClassifierScope
import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.StandardClassIds
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
@@ -250,18 +251,25 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider:
}
val superTypes = when (kind) {
FunctionClassDescriptor.Kind.Function ->
listOf(
FirResolvedTypeRefImpl(
source = null,
ConeClassLikeLookupTagImpl(StandardClassIds.Function)
.constructClassType(arrayOf(typeArguments.last().type), isNullable = false)
)
)
FunctionClassDescriptor.Kind.Function,
FunctionClassDescriptor.Kind.SuspendFunction ->
listOf(session.builtinTypes.anyType)
FunctionClassDescriptor.Kind.KFunction ->
listOf(createSuperType(FunctionClassDescriptor.Kind.Function))
FunctionClassDescriptor.Kind.KSuspendFunction ->
listOf(createSuperType(FunctionClassDescriptor.Kind.SuspendFunction))
}
replaceSuperTypeRefs(superTypes)
}
}
}
compiler/fir/resolve/testData/resolve/stdlib/problems/functionAndFunctionN.kt → compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
fun takeAnyFun(function: Function<*>) {}
fun test(block: () -> Unit) {
<!INAPPLICABLE_CANDIDATE!>takeAnyFun<!>(block)
takeAnyFun(block)
}
compiler/fir/resolve/testData/resolve/stdlib/problems/functionAndFunctionN.txt → compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.txt
Vendored
+1 -1
View File
@@ -2,5 +2,5 @@ FILE: functionAndFunctionN.kt
public final fun takeAnyFun(function: R|kotlin/Function<*>|): R|kotlin/Unit| {
}
public final fun test(block: R|() -> kotlin/Unit|): R|kotlin/Unit| {
<Inapplicable(INAPPLICABLE): [/takeAnyFun]>#(R|<local>/block|)
R|/takeAnyFun|(R|<local>/block|)
}
compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithStdlibTestGenerated.java
Generated
+5 -5
View File
@@ -83,6 +83,11 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
runTest("compiler/fir/resolve/testData/resolve/stdlib/factoryFunctionOverloads.kt");
}
@TestMetadata("functionAndFunctionN.kt")
public void testFunctionAndFunctionN() throws Exception {
runTest("compiler/fir/resolve/testData/resolve/stdlib/functionAndFunctionN.kt");
}
@TestMetadata("functionX.kt")
public void testFunctionX() throws Exception {
runTest("compiler/fir/resolve/testData/resolve/stdlib/functionX.kt");
@@ -607,11 +612,6 @@ public class FirDiagnosticsWithStdlibTestGenerated extends AbstractFirDiagnostic
runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.kt");
}
@TestMetadata("functionAndFunctionN.kt")
public void testFunctionAndFunctionN() throws Exception {
runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/functionAndFunctionN.kt");
}
@TestMetadata("inapplicableRemoveAll.kt")
public void testInapplicableRemoveAll() throws Exception {
runTest("compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.kt");
compiler/testData/diagnostics/tests/smartCasts/kt32358_2.fir.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ inline fun <R> callIt(fn: () -> R): R = TODO()
inline fun <R> callItContracted(fn: () -> R): R {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(fn, InvocationKind.EXACTLY_ONCE)
callsInPlace(fn, InvocationKind.EXACTLY_ONCE)
}
TODO()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/breakContinuesInInlinedLambda.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/expressionBody.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/implicitCastToAnyInReturnType.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/inlinedLambdaAlwaysThrows.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun myRun(block: () -> Unit): Unit {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/irrelevantUnknownClosure.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun myRun(block: () -> Unit): Unit {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/labeledReturns.fir.kt
Vendored
+2 -2
View File
@@ -6,14 +6,14 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
inline fun <T, R> T.myLet(block: (T) -> R): R {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block(this)
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchFinally.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nonLocalReturn.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T, R> T.myLet(block: (T) -> R): R {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block(this)
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nonReturningInlinedLambda.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun myRun(block: () -> Unit): Unit {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/safeCallAndInPlaceReturn.fir.kt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ import kotlin.contracts.*
inline fun <T> Any?.myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/severalJumpOutsFromInlinedLambda.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun myRun(block: () -> Unit) {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatch.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/tryCatchFinally.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/typeMismatch.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/unreachableCode.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
inline fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/atLeastOnce/valDefiniteReassignment.fir.kt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> runTwice(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.AT_LEAST_ONCE)
callsInPlace(block, InvocationKind.AT_LEAST_ONCE)
}
block()
return block();
@@ -14,7 +14,7 @@ fun <T> runTwice(block: () -> T): T {
fun <T> runOnce(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block();
};
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/atLeastOnce/varDefiniteInitialization.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> runTwice(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.AT_LEAST_ONCE)
callsInPlace(block, InvocationKind.AT_LEAST_ONCE)
}
block()
return block();
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/atLeastOnce/varIndefiniteIntialization.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> runTwice(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.AT_LEAST_ONCE)
callsInPlace(block, InvocationKind.AT_LEAST_ONCE)
}
block()
return block();
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteInitialization.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valDefiniteReassignment.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/valIndefiniteInitialization.fir.kt
Vendored
+2 -2
View File
@@ -6,14 +6,14 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
fun myRepeat(n: Int, action: () -> Unit) {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(action)
callsInPlace(action)
}
for (i in 1..n) action()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/varDefiniteInitalization.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/varIndefiniteInitialization.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> myRun(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/exactlyOnce/withReceiver.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T, R> T.myLet(block: (T) -> R): R {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
return block(this)
}
compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/initialization/unknown/unknownInvocations.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun <T> inPlace(block: () -> T): T {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block)
callsInPlace(block)
}
return block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/notFirstStatement.fir.kt
Vendored
+4 -4
View File
@@ -15,23 +15,23 @@ fun foo(y: Boolean) {
inline fun case1(block: () -> Unit) {
val contracts = listOf(
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}, contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
)
block()
}
inline fun case_2(block: () -> Unit) = contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
fun case_3(block: () -> Unit) {
class Class {
fun innerFun(block2: () -> Unit) {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block2, InvocationKind.EXACTLY_ONCE)
callsInPlace(block2, InvocationKind.EXACTLY_ONCE)
}
block2()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/fqnContractFunction.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.InvocationKind
inline fun foo(block: () -> Unit) {
kotlin.contracts.contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/contractsOnMembers.fir.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ import kotlin.contracts.*
class Foo {
fun myRun(block: () -> Unit) {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
}
block()
}
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/multieffect/returnsAndCalls.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.contracts.*
fun callsAndInverts(b: Boolean, block: () -> Unit): Boolean {
contract {
<!INAPPLICABLE_CANDIDATE!>callsInPlace<!>(block, InvocationKind.EXACTLY_ONCE)
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
returns(true) implies (!b)
returns(false) implies b
}