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

Mark implicit receiver as captured if the function is expression

Browse Source 
#KT-40260 Fixed
 #KT-42280 Fixed
This commit is contained in:
Ilmir Usmanov
2020-09-30 21:00:26 +02:00
parent 3078bd7b67
commit 5e02a4efd7
10 changed files with 141 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -6523,11 +6523,21 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines");
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
+3 -1
View File
@@ -887,7 +887,9 @@ class ControlFlowInformationProvider private constructor(
}
instruction.next?.let { dfs(it) }
} else if (instruction.element is KtNameReferenceExpression) {
} else if (instruction.element is KtNameReferenceExpression || instruction.element is KtBinaryExpression ||
instruction.element is KtUnaryExpression
) {
val call = instruction.element.getResolvedCall(trace.bindingContext)
if (call is VariableAsFunctionResolvedCall) {
(call.variableCall.dispatchReceiver as? ExtensionReceiver)?.declarationDescriptor?.apply { markIfNeeded() }
compiler/testData/codegen/box/coroutines/captureInfixFun.kt
Vendored
+35
View File
@@ -0,0 +1,35 @@
// WITH_RUNTIME
// WITH_COROUTINES
import helpers.*
import kotlin.coroutines.*
fun builder(c: suspend Context.() -> Unit) {
c.startCoroutine(Context(), EmptyContinuation)
}
class Foo {
fun foo() {
val fionaClient = Any()
coVerify { fionaClient was Called }
}
}
object Called
var res = "FAIL"
class Context {
infix fun Any.was(called: Called) {
res = "OK"
}
}
fun coVerify(verifyBlock: suspend Context.() -> Unit) {
builder(verifyBlock)
}
fun box(): String {
Foo().foo()
return res
}
compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
// WITH_RUNTIME
// WITH_COROUTINES
import helpers.*
import kotlin.coroutines.*
fun builder(c: suspend Context.() -> Unit) {
c.startCoroutine(Context(), EmptyContinuation)
}
class Foo {
fun foo() {
val fionaClient = Any()
coVerify { !fionaClient }
}
}
var res = "FAIL"
class Context {
operator fun Any.not() {
res = "OK"
}
}
fun coVerify(verifyBlock: suspend Context.() -> Unit) {
builder(verifyBlock)
}
fun box(): String {
Foo().foo()
return res
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -6593,11 +6593,21 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines.experimental");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+10
View File
@@ -6593,11 +6593,21 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines.experimental");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+10
View File
@@ -6523,11 +6523,21 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines");
js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+10
View File
@@ -5403,11 +5403,21 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+10
View File
@@ -5403,11 +5403,21 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+10
View File
@@ -5403,11 +5403,21 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/builderInferenceAndGenericArrayAcessCall.kt");
}
@TestMetadata("captureInfixFun.kt")
public void testCaptureInfixFun() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureInfixFun.kt");
}
@TestMetadata("captureMutableLocalVariableInsideCoroutineBlock.kt")
public void testCaptureMutableLocalVariableInsideCoroutineBlock() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureMutableLocalVariableInsideCoroutineBlock.kt");
}
@TestMetadata("captureUnaryOperator.kt")
public void testCaptureUnaryOperator() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/captureUnaryOperator.kt");
}
@TestMetadata("capturedVarInSuspendLambda.kt")
public void testCapturedVarInSuspendLambda_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/capturedVarInSuspendLambda.kt", "kotlin.coroutines");