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

[Wasm] Restore binary compatibility of PlatformDiagnosticSuppressor

Browse Source 
Keep the original shouldReportUnusedParameter method without
 BindingContext parameter

^KT-58188 Fixed
This commit is contained in:
Svyatoslav Kuzmich
2023-05-17 09:15:07 +02:00
committed by teamcity
parent e39d9c2c35
commit dc4aa8c15e
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
+2 -1
View File
@@ -780,7 +780,8 @@ class ControlFlowInformationProviderImpl private constructor(
if (functionDescriptor.isExpect || functionDescriptor.isActual ||
functionDescriptor.isEffectivelyExternal() ||
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor, trace.bindingContext)
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor, trace.bindingContext) ||
!diagnosticSuppressor.shouldReportUnusedParameter(variableDescriptor)
) return
when (val owner = element.parent.parent) {
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PlatformDiagnosticSuppressor.kt
+8 -1
View File
@@ -25,11 +25,15 @@ import org.jetbrains.kotlin.resolve.BindingContext
@DefaultImplementation(PlatformDiagnosticSuppressor.Default::class)
interface PlatformDiagnosticSuppressor : PlatformSpecificExtension<PlatformDiagnosticSuppressor>{
fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean
// Function without binding context is kept for binary compatibility
// Diagnostic should be suppressed if any of two overloads return false
fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean
fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean
object Default : PlatformDiagnosticSuppressor {
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean = true
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean = true
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
@@ -40,6 +44,9 @@ class CompositePlatformDiagnosticSuppressor(private val suppressors: List<Platfo
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean =
suppressors.all { it.shouldReportUnusedParameter(parameter, bindingContext) }
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean =
suppressors.all { it.shouldReportUnusedParameter(parameter) }
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean =
suppressors.all { it.shouldReportNoBody(descriptor) }
}
js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt
+1 -3
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.VariableDescriptor
import org.jetbrains.kotlin.name.JsStandardClassIds
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.checkers.PlatformDiagnosticSuppressor
private val nativeAnnotations = JsStandardClassIds.Annotations.nativeAnnotations.map { it.asSingleFqName() }
@@ -36,8 +35,7 @@ private fun DeclarationDescriptor.isLexicallyInsideJsNative(): Boolean {
}
object JsNativeDiagnosticSuppressor : PlatformDiagnosticSuppressor {
override fun shouldReportUnusedParameter(parameter: VariableDescriptor, bindingContext: BindingContext): Boolean =
!parameter.isLexicallyInsideJsNative()
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean = !parameter.isLexicallyInsideJsNative()
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = !descriptor.isLexicallyInsideJsNative()
}
wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/analyze/WasmDiagnosticSuppressor.kt
+3
View File
@@ -25,5 +25,8 @@ object WasmDiagnosticSuppressor : PlatformDiagnosticSuppressor {
return true
}
override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean =
true
override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
}
wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/resolve/WasmPlatformConfigurator.kt
+1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.wasm.resolve
import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.container.useImpl
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.js.analyze.JsNativeDiagnosticSuppressor
import org.jetbrains.kotlin.js.naming.NameSuggestion
import org.jetbrains.kotlin.js.naming.WasmNameSuggestion
import org.jetbrains.kotlin.js.resolve.ExtensionFunctionToExternalIsInlinable