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

JVM_IR: do not generate main() when extension main is present

Browse Source 
Extension methods with signature C.main() should not cause generation
of main(args: Array<String>).
This commit is contained in:
Georgy Bronnikov
2019-12-17 18:45:46 +03:00
parent 9d0c736f0e
commit 0d8036bb14
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/MainMethodGenerationLowering.kt
+5 -1
View File
@@ -68,7 +68,11 @@ internal class MainMethodGenerationLowering(val context: JvmBackendContext) : Cl
}
private fun IrSimpleFunction.isParameterlessMainMethod(): Boolean =
typeParameters.isEmpty() && valueParameters.isEmpty() && returnType.isUnit() && name.asString() == "main"
typeParameters.isEmpty() &&
extensionReceiverParameter == null &&
valueParameters.isEmpty() &&
returnType.isUnit() &&
name.asString() == "main"
private fun IrSimpleFunction.isMainMethod(): Boolean {
compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnExtensionReceiver.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun Any.main() {}
// 0 main (\[Ljava/lang/String;)V
compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
Generated
+5
View File
@@ -3696,6 +3696,11 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/parameterlessMain"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("dontGenerateOnExtensionReceiver.kt")
public void testDontGenerateOnExtensionReceiver() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnExtensionReceiver.kt");
}
@TestMetadata("dontGenerateOnJvmNameMain.kt")
public void testDontGenerateOnJvmNameMain() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnJvmNameMain.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
Generated
+5
View File
@@ -3614,6 +3614,11 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/parameterlessMain"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("dontGenerateOnExtensionReceiver.kt")
public void testDontGenerateOnExtensionReceiver() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnExtensionReceiver.kt");
}
@TestMetadata("dontGenerateOnJvmNameMain.kt")
public void testDontGenerateOnJvmNameMain() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnJvmNameMain.kt");