[FIR] Add VOLATILE_ON_VALUE/VOLATILE_ON_DELEGATE diagnostic
This commit is contained in:
committed by
TeamCityServer
parent
f90b534c4c
commit
7ba8e0d9cc
+2
@@ -19,6 +19,8 @@ object JVM_DIAGNOSTICS_LIST : DiagnosticList("FirJvmErrors") {
|
|||||||
val DECLARATIONS by object : DiagnosticGroup("Declarations") {
|
val DECLARATIONS by object : DiagnosticGroup("Declarations") {
|
||||||
val CONFLICTING_JVM_DECLARATIONS by error<PsiElement>()
|
val CONFLICTING_JVM_DECLARATIONS by error<PsiElement>()
|
||||||
val STRICTFP_ON_CLASS by error<KtAnnotationEntry>()
|
val STRICTFP_ON_CLASS by error<KtAnnotationEntry>()
|
||||||
|
val VOLATILE_ON_VALUE by error<KtAnnotationEntry>()
|
||||||
|
val VOLATILE_ON_DELEGATE by error<KtAnnotationEntry>()
|
||||||
}
|
}
|
||||||
|
|
||||||
val TYPES by object : DiagnosticGroup("Types") {
|
val TYPES by object : DiagnosticGroup("Types") {
|
||||||
|
|||||||
+2
@@ -20,6 +20,8 @@ object FirJvmErrors {
|
|||||||
// Declarations
|
// Declarations
|
||||||
val CONFLICTING_JVM_DECLARATIONS by error0<PsiElement>()
|
val CONFLICTING_JVM_DECLARATIONS by error0<PsiElement>()
|
||||||
val STRICTFP_ON_CLASS by error0<KtAnnotationEntry>()
|
val STRICTFP_ON_CLASS by error0<KtAnnotationEntry>()
|
||||||
|
val VOLATILE_ON_VALUE by error0<KtAnnotationEntry>()
|
||||||
|
val VOLATILE_ON_DELEGATE by error0<KtAnnotationEntry>()
|
||||||
|
|
||||||
// Types
|
// Types
|
||||||
val JAVA_TYPE_MISMATCH by error2<KtExpression, ConeKotlinType, ConeKotlinType>()
|
val JAVA_TYPE_MISMATCH by error2<KtExpression, ConeKotlinType, ConeKotlinType>()
|
||||||
|
|||||||
+7
@@ -8,8 +8,10 @@ package org.jetbrains.kotlin.fir.analysis.jvm.checkers
|
|||||||
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.DeclarationCheckers
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.DeclarationCheckers
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirBasicDeclarationChecker
|
||||||
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirClassChecker
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirClassChecker
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirPropertyChecker
|
||||||
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration.FirJvmExternalDeclarationChecker
|
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration.FirJvmExternalDeclarationChecker
|
||||||
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration.FirStrictfpApplicabilityChecker
|
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration.FirStrictfpApplicabilityChecker
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration.FirVolatileAnnotationChecker
|
||||||
|
|
||||||
object JvmDeclarationCheckers : DeclarationCheckers() {
|
object JvmDeclarationCheckers : DeclarationCheckers() {
|
||||||
override val basicDeclarationCheckers: Set<FirBasicDeclarationChecker>
|
override val basicDeclarationCheckers: Set<FirBasicDeclarationChecker>
|
||||||
@@ -21,4 +23,9 @@ object JvmDeclarationCheckers : DeclarationCheckers() {
|
|||||||
get() = setOf(
|
get() = setOf(
|
||||||
FirStrictfpApplicabilityChecker
|
FirStrictfpApplicabilityChecker
|
||||||
)
|
)
|
||||||
|
|
||||||
|
override val propertyCheckers: Set<FirPropertyChecker>
|
||||||
|
get() = setOf(
|
||||||
|
FirVolatileAnnotationChecker,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+36
@@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.fir.analysis.jvm.checkers.declaration
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.fir.FirRealSourceElementKind
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirPropertyChecker
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirProperty
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.getAnnotationByFqName
|
||||||
|
import org.jetbrains.kotlin.name.FqName
|
||||||
|
|
||||||
|
object FirVolatileAnnotationChecker : FirPropertyChecker() {
|
||||||
|
|
||||||
|
private val VOLATILE_ANNOTATION_FQ_NAME = FqName("kotlin.jvm.Volatile")
|
||||||
|
|
||||||
|
override fun check(declaration: FirProperty, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
|
if (declaration.source?.kind != FirRealSourceElementKind) return
|
||||||
|
|
||||||
|
val fieldAnnotation = declaration.backingFieldSymbol.getAnnotationByFqName(VOLATILE_ANNOTATION_FQ_NAME)
|
||||||
|
if (fieldAnnotation != null && !declaration.isVar) {
|
||||||
|
reporter.reportOn(fieldAnnotation.source, FirJvmErrors.VOLATILE_ON_VALUE, context)
|
||||||
|
}
|
||||||
|
|
||||||
|
val delegateAnnotation = declaration.delegateFieldSymbol?.getAnnotationByFqName(VOLATILE_ANNOTATION_FQ_NAME)
|
||||||
|
if (delegateAnnotation != null) {
|
||||||
|
reporter.reportOn(delegateAnnotation.source, FirJvmErrors.VOLATILE_ON_DELEGATE, context)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.expressions.*
|
|||||||
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
|
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
|
||||||
import org.jetbrains.kotlin.fir.resolve.toSymbol
|
import org.jetbrains.kotlin.fir.resolve.toSymbol
|
||||||
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
|
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
|
||||||
|
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
||||||
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
|
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
|
||||||
import org.jetbrains.kotlin.fir.types.ConeClassLikeType
|
import org.jetbrains.kotlin.fir.types.ConeClassLikeType
|
||||||
import org.jetbrains.kotlin.fir.types.coneType
|
import org.jetbrains.kotlin.fir.types.coneType
|
||||||
@@ -97,6 +98,10 @@ fun FirAnnotationContainer.getAnnotationByFqName(fqName: FqName): FirAnnotationC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun <D> FirBasedSymbol<out D>.getAnnotationByFqName(fqName: FqName): FirAnnotationCall? where D : FirAnnotationContainer, D : FirDeclaration {
|
||||||
|
return fir.getAnnotationByFqName(fqName)
|
||||||
|
}
|
||||||
|
|
||||||
fun FirAnnotationContainer.getAnnotationsByFqName(fqName: FqName): List<FirAnnotationCall> = annotations.getAnnotationsByFqName(fqName)
|
fun FirAnnotationContainer.getAnnotationsByFqName(fqName: FqName): List<FirAnnotationCall> = annotations.getAnnotationsByFqName(fqName)
|
||||||
|
|
||||||
fun List<FirAnnotationCall>.getAnnotationsByFqName(fqName: FqName): List<FirAnnotationCall> {
|
fun List<FirAnnotationCall>.getAnnotationsByFqName(fqName: FqName): List<FirAnnotationCall> {
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
// !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER
|
|
||||||
import kotlin.jvm.Volatile
|
|
||||||
import kotlin.properties.Delegates
|
|
||||||
|
|
||||||
class My {
|
|
||||||
@Volatile val x = 0
|
|
||||||
// ok
|
|
||||||
@Volatile var y = 1
|
|
||||||
|
|
||||||
@delegate:Volatile var z: String by Delegates.observable("?") { prop, old, new -> old.hashCode() }
|
|
||||||
|
|
||||||
@field:Volatile val w = 2
|
|
||||||
}
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// FIR_IDENTICAL
|
||||||
// !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER
|
// !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER
|
||||||
import kotlin.jvm.Volatile
|
import kotlin.jvm.Volatile
|
||||||
import kotlin.properties.Delegates
|
import kotlin.properties.Delegates
|
||||||
|
|||||||
+12
@@ -3445,6 +3445,18 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
|
|||||||
token,
|
token,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
add(FirJvmErrors.VOLATILE_ON_VALUE) { firDiagnostic ->
|
||||||
|
VolatileOnValueImpl(
|
||||||
|
firDiagnostic as FirPsiDiagnostic,
|
||||||
|
token,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
add(FirJvmErrors.VOLATILE_ON_DELEGATE) { firDiagnostic ->
|
||||||
|
VolatileOnDelegateImpl(
|
||||||
|
firDiagnostic as FirPsiDiagnostic,
|
||||||
|
token,
|
||||||
|
)
|
||||||
|
}
|
||||||
add(FirJvmErrors.JAVA_TYPE_MISMATCH) { firDiagnostic ->
|
add(FirJvmErrors.JAVA_TYPE_MISMATCH) { firDiagnostic ->
|
||||||
JavaTypeMismatchImpl(
|
JavaTypeMismatchImpl(
|
||||||
firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
|
firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
|
||||||
|
|||||||
+8
@@ -2402,6 +2402,14 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
|
|||||||
override val diagnosticClass get() = StrictfpOnClass::class
|
override val diagnosticClass get() = StrictfpOnClass::class
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract class VolatileOnValue : KtFirDiagnostic<KtAnnotationEntry>() {
|
||||||
|
override val diagnosticClass get() = VolatileOnValue::class
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class VolatileOnDelegate : KtFirDiagnostic<KtAnnotationEntry>() {
|
||||||
|
override val diagnosticClass get() = VolatileOnDelegate::class
|
||||||
|
}
|
||||||
|
|
||||||
abstract class JavaTypeMismatch : KtFirDiagnostic<KtExpression>() {
|
abstract class JavaTypeMismatch : KtFirDiagnostic<KtExpression>() {
|
||||||
override val diagnosticClass get() = JavaTypeMismatch::class
|
override val diagnosticClass get() = JavaTypeMismatch::class
|
||||||
abstract val expectedType: KtType
|
abstract val expectedType: KtType
|
||||||
|
|||||||
+14
@@ -3885,6 +3885,20 @@ internal class StrictfpOnClassImpl(
|
|||||||
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal class VolatileOnValueImpl(
|
||||||
|
firDiagnostic: FirPsiDiagnostic,
|
||||||
|
override val token: ValidityToken,
|
||||||
|
) : KtFirDiagnostic.VolatileOnValue(), KtAbstractFirDiagnostic<KtAnnotationEntry> {
|
||||||
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal class VolatileOnDelegateImpl(
|
||||||
|
firDiagnostic: FirPsiDiagnostic,
|
||||||
|
override val token: ValidityToken,
|
||||||
|
) : KtFirDiagnostic.VolatileOnDelegate(), KtAbstractFirDiagnostic<KtAnnotationEntry> {
|
||||||
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
|
}
|
||||||
|
|
||||||
internal class JavaTypeMismatchImpl(
|
internal class JavaTypeMismatchImpl(
|
||||||
override val expectedType: KtType,
|
override val expectedType: KtType,
|
||||||
override val actualType: KtType,
|
override val actualType: KtType,
|
||||||
|
|||||||
Reference in New Issue
Block a user