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

Deprecate ClassBuilderInterceptorExtension

Browse Source 
ClassGeneratorExtension is supposed to be used instead.
This commit is contained in:
Alexander Udalov
2023-03-06 16:49:36 +01:00
parent 163a052f98
commit 4f380e876c
8 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ClassBuilderInterceptorExtension.kt
+9 -1
View File
@@ -14,6 +14,8 @@
* limitations under the License.
*/
@file:Suppress("DEPRECATION_ERROR")
package org.jetbrains.kotlin.codegen.extensions
import org.jetbrains.kotlin.codegen.ClassBuilderFactory
@@ -21,6 +23,12 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
import org.jetbrains.kotlin.resolve.BindingContext
@Deprecated(
"This extension is only supported in K1 and will not work properly in K2. " +
"Please migrate to org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension or " +
"org.jetbrains.kotlin.backend.jvm.extensions.ClassGeneratorExtension.",
level = DeprecationLevel.ERROR
)
interface ClassBuilderInterceptorExtension {
companion object : ProjectExtensionDescriptor<ClassBuilderInterceptorExtension>(
"org.jetbrains.kotlin.classBuilderFactoryInterceptorExtension", ClassBuilderInterceptorExtension::class.java)
@@ -31,4 +39,4 @@ interface ClassBuilderInterceptorExtension {
diagnostics: DiagnosticSink
): ClassBuilderFactory
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+4 -5
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.codegen.*
import org.jetbrains.kotlin.codegen.binding.CodegenBinding
import org.jetbrains.kotlin.codegen.context.CodegenContext
import org.jetbrains.kotlin.codegen.context.RootContext
import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
import org.jetbrains.kotlin.codegen.extensions.ClassFileFactoryFinalizerExtension
import org.jetbrains.kotlin.codegen.inline.GlobalInlineContext
import org.jetbrains.kotlin.codegen.inline.InlineCache
@@ -405,14 +404,14 @@ class GenerationState private constructor(
this.factory = ClassFileFactory(this, interceptedBuilderFactory, finalizers)
}
@Suppress("UNCHECKED_CAST")
private fun loadClassBuilderInterceptors(): List<ClassBuilderInterceptorExtension> {
@Suppress("UNCHECKED_CAST", "DEPRECATION_ERROR")
private fun loadClassBuilderInterceptors(): List<org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension> {
// Using Class.forName here because we're in the old JVM backend, and we need to load extensions declared in the JVM IR backend.
val adapted = Class.forName("org.jetbrains.kotlin.backend.jvm.extensions.ClassBuilderExtensionAdapter")
.getDeclaredMethod("getExtensions", Project::class.java)
.invoke(null, project) as List<ClassBuilderInterceptorExtension>
.invoke(null, project) as List<org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension>
return ClassBuilderInterceptorExtension.getInstances(project) + adapted
return org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension.getInstances(project) + adapted
}
fun beforeCompile() {