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

Do not generate constructors for annotation classes.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-09-06 11:45:01 +03:00
committed by Dmitry Petrov
parent 4e112b3f88
commit 4eda19b36a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ClassGenerator.kt
+5 -1
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy import org.jetbrains.kotlin.renderer.OverrideRenderingPolicy
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import java.lang.AssertionError import java.lang.AssertionError
import java.util.* import java.util.*
@@ -186,7 +187,10 @@ class ClassGenerator(val declarationGenerator: DeclarationGenerator) : Generator
} }
private fun generatePrimaryConstructor(irClass: IrClassImpl, ktClassOrObject: KtClassOrObject) { private fun generatePrimaryConstructor(irClass: IrClassImpl, ktClassOrObject: KtClassOrObject) {
val primaryConstructorDescriptor = irClass.descriptor.unsubstitutedPrimaryConstructor ?: return val classDescriptor = irClass.descriptor
if (DescriptorUtils.isAnnotationClass(classDescriptor)) return
val primaryConstructorDescriptor = classDescriptor.unsubstitutedPrimaryConstructor ?: return
val irPrimaryConstructor = IrConstructorImpl(ktClassOrObject.startOffset, ktClassOrObject.endOffset, IrDeclarationOrigin.DEFINED, val irPrimaryConstructor = IrConstructorImpl(ktClassOrObject.startOffset, ktClassOrObject.endOffset, IrDeclarationOrigin.DEFINED,
primaryConstructorDescriptor) primaryConstructorDescriptor)
compiler/testData/ir/irText/classes/classes.txt
Vendored
-4
View File
@@ -11,10 +11,6 @@ FILE /classes.kt
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='TestObject' INSTANCE_INITIALIZER_CALL classDescriptor='TestObject'
CLASS ANNOTATION_CLASS TestAnnotationClass CLASS ANNOTATION_CLASS TestAnnotationClass
CONSTRUCTOR public constructor TestAnnotationClass()
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL 'constructor Any()'
INSTANCE_INITIALIZER_CALL classDescriptor='TestAnnotationClass'
CLASS ENUM_CLASS TestEnumClass CLASS ENUM_CLASS TestEnumClass
CONSTRUCTOR private constructor TestEnumClass() CONSTRUCTOR private constructor TestEnumClass()
BLOCK_BODY BLOCK_BODY