Generics in Kotlin codegen (#88) #720

nikitavlaev · 2022-08-12T14:38:23Z

Description

Refactored imports to support kotlin builtins (List, Map, e.t.c).
Added generics propagation using callables.
Added filling generics with Any? and *.
Reworked Kotlin type render.
Fixed assemble model generation in concrete.
Fixed bug with backticks.

Fixes #88

Slides

Type of Change

Please delete options that are not relevant.

New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

How Has This Been Tested?

Automated Testing

All previously disabled tests for Kotlin compilation.

Manual Scenario

Not applicable.

Checklist (remove irrelevant options):

This is the author self-check list

The change followed the style guidelines of the UTBot project
Self-review of the code is passed
The change contains enough commentaries, particularly in hard-to-understand areas
No new warnings
All tests pass locally with my changes

...rc/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt

sergeypospelov · 2022-08-15T18:46:09Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

@@ -760,8 +930,7 @@ open class ClassId @JvmOverloads constructor(
    open val allConstructors: Sequence<ConstructorId>
        get() = jClass.declaredConstructors.asSequence().map { it.executableId }

-    open val typeParameters: TypeParameters
-        get() = TypeParameters()
+    open val typeParameters: TypeParameters = TypeParameters()


Write a comment about issues with reusing ClassIds for different models.

sergeypospelov · 2022-08-15T18:50:57Z

.../src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt

-                            caller[executable](*args.toTypedArray())
+                            caller[executable](
+                                *args.toTypedArray(),
+                                typeParameters = executable.returnType.typeParameters


sergeypospelov · 2022-08-15T18:58:31Z

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt

@@ -692,6 +692,7 @@ internal abstract class CgAbstractRenderer(val context: CgContext, val printer:

    override fun toString(): String = printer.toString()

+    protected abstract fun <T: Import> reorderImports(imports: List<T>): List<T>


Could you explain, please, for what purpose?

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt

sergeypospelov · 2022-08-16T13:51:22Z

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt

                else -> {
                    // we cannot access kClass for BuiltinClassId
                    // we cannot use simple name here because this class can be not imported
-                    if (id is BuiltinClassId) id.name else id.kClass.id.asString()
+                    var main = builtInNameOrNull(id) ?: if (id is BuiltinClassId) id.name else id.kClass.id.asString()


Maybe rewrite it with buildString { ... }

sergeypospelov · 2022-08-16T13:55:52Z

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/UtilMethods.kt

@@ -821,8 +821,8 @@ internal fun CgContextOwner.importUtilMethodDependencies(id: MethodId) {
    for (classId in outerMostTestClass.regularImportsByUtilMethod(id, codegenLanguage)) {
        importIfNeeded(classId)
    }
-    for (methodId in outerMostTestClass.staticImportsByUtilMethod(id)) {
-        collectedImports += StaticImport(methodId.classId.canonicalName, methodId.name)
+    for (methodId in currentTestClass.staticImportsByUtilMethod(id)) {


sergeypospelov · 2022-08-16T14:02:43Z

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestFlow.kt

+        }.map { processGenerics(it, engine.methodUnderTest.callable) }
+    }
+
+    private fun processGenericsForEnvironmentModels(models: EnvironmentModels, callable: KCallable<*>) {


Maybe move it to another file?

sergeypospelov · 2022-08-16T14:02:53Z

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestFlow.kt

+        }
+    }
+
+    private fun processGenerics(result: UtResult, callable: KCallable<*>): UtResult {


sergeypospelov · 2022-08-16T14:14:48Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+    override fun processGenerics(type: KType) {
+       classId.typeParameters.fromType(type)
+    }


Add TODO on propagating generics into fields and mocks.

sergeypospelov · 2022-08-16T14:26:34Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

@@ -505,6 +531,150 @@ data class UtAssembleModel(
    val finalInstantiationModel
        get() = instantiationChain.lastOrNull()

+    private fun TypeTree.cmp(other: TypeTree): Boolean {


Move to another module

sergeypospelov · 2022-08-16T14:31:16Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt


-class WildcardTypeParameter : TypeParameters(emptyList())
+class WildcardTypeParameter: ClassId("org.utbot.framework.plugin.api.WildcardTypeParameter")


Why not Object?

sergeypospelov · 2022-08-16T14:39:34Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+        // TODO might cause problems with type params when program synthesis comes
+        // assume that last statement is constructor call
+        instantiationChain.lastOrNull()?.let inst@ { lastStatement ->
+            (lastStatement as? UtExecutableCallModel)?.let {


Add explicit identifier for it

sergeypospelov · 2022-08-16T14:40:17Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+                    }
+
+                    it.params.mapIndexed { i, param ->
+                        function?.parameters?.getOrNull(i)?.type?.let { it1 -> param.processGenerics(it1) }


sergeypospelov · 2022-08-16T14:51:24Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+                        }
+                        is Method -> {
+                            try {
+                                val f = Method::class.java.getDeclaredField("signature")


Move to ReflectionUtil.kt

sergeypospelov · 2022-08-16T14:55:06Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+                                parsedSignature.parameterTypes.forEachIndexed { paramId, param ->
+                                    if (param::class != parsedSignature.returnType::class) return@forEachIndexed
+
+                                    param as? TypeArgument ?: error("Only TypeArgument is expected")


sergeypospelov · 2022-08-16T14:57:16Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+                                // check if parameter types are equal to return types
+                                // e.g. <T:Ljava/lang/Object;>(Ljava/util/List<TT;>;)Ljava/util/List<TT;>;
+                                parsedSignature.parameterTypes.forEachIndexed { paramId, param ->
+                                    if (param::class != parsedSignature.returnType::class) return@forEachIndexed


sergeypospelov · 2022-08-16T15:08:07Z

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt

+            }
+        }
+
+        for (model in modificationsChain) {


Maybe mark it as hack?

Refactored imports to support kotlin builtins (List, Map, e.t.c). Added generics propagation using callables. Added filling generics with Any? and *. Reworked Kotlin type render. Fixed assemble model generation in concrete. Fixed bug with backticks.

sergeypospelov · 2022-10-03T09:09:06Z

We need to refactor our type system to safely support generic types. Now the have very implicit and error prone realization.

nikitavlaev requested review from Damtev and EgorkaKulikov August 12, 2022 14:38

nikitavlaev force-pushed the nikitavlaev/kotlin-codegen-generics branch from a35be48 to a456874 Compare August 14, 2022 22:01

nikitavlaev requested review from sergeypospelov and removed request for EgorkaKulikov and Damtev August 15, 2022 12:22

nikitavlaev self-assigned this Aug 15, 2022

nikitavlaev force-pushed the nikitavlaev/kotlin-codegen-generics branch 2 times, most recently from 47fb89f to b2ed51f Compare August 15, 2022 16:34

sergeypospelov reviewed Aug 15, 2022

View reviewed changes

...rc/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt Outdated Show resolved Hide resolved

sergeypospelov reviewed Aug 15, 2022

View reviewed changes

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt Outdated Show resolved Hide resolved

nikitavlaev force-pushed the nikitavlaev/kotlin-codegen-generics branch from b2ed51f to af60704 Compare August 16, 2022 12:59

sergeypospelov reviewed Aug 16, 2022

View reviewed changes

sergeypospelov requested changes Aug 16, 2022

View reviewed changes

nikitavlaev force-pushed the nikitavlaev/kotlin-codegen-generics branch 2 times, most recently from 39d0e5f to 3fabd2b Compare August 17, 2022 06:55

Generics in Kotlin codegen (#88)

5900dc3

Refactored imports to support kotlin builtins (List, Map, e.t.c). Added generics propagation using callables. Added filling generics with Any? and *. Reworked Kotlin type render. Fixed assemble model generation in concrete. Fixed bug with backticks.

nikitavlaev force-pushed the nikitavlaev/kotlin-codegen-generics branch from 3fabd2b to 5900dc3 Compare September 4, 2022 20:14

nikitavlaev requested a review from sergeypospelov September 4, 2022 20:56

sergeypospelov closed this Oct 3, 2022

Damtev mentioned this pull request Oct 4, 2022

Fixed unavailable mock classes #1066

Merged

6 tasks

		@@ -692,6 +692,7 @@ internal abstract class CgAbstractRenderer(val context: CgContext, val printer:

		override fun toString(): String = printer.toString()

		protected abstract fun <T: Import> reorderImports(imports: List<T>): List<T>


		class WildcardTypeParameter : TypeParameters(emptyList())
		class WildcardTypeParameter: ClassId("org.utbot.framework.plugin.api.WildcardTypeParameter")

Generics in Kotlin codegen (#88) #720

Generics in Kotlin codegen (#88) #720

Uh oh!

Conversation

nikitavlaev commented Aug 12, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of Change

How Has This Been Tested?

Automated Testing

Manual Scenario

Checklist (remove irrelevant options):

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sergeypospelov commented Oct 3, 2022

Uh oh!

Uh oh!

nikitavlaev commented Aug 12, 2022 •

edited

Loading