From dc4aa8c15e31f723901d4a7a37d5ad3b7012469a Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Wed, 17 May 2023 09:15:07 +0200
Subject: [PATCH] [Wasm] Restore binary compatibility of
 PlatformDiagnosticSuppressor

Keep the original shouldReportUnusedParameter method without
 BindingContext parameter

^KT-58188 Fixed
---
 .../kotlin/cfg/ControlFlowInformationProviderImpl.kt     | 3 ++-
 .../resolve/checkers/PlatformDiagnosticSuppressor.kt     | 9 ++++++++-
 .../org/jetbrains/kotlin/js/analyze/suppressWarnings.kt  | 4 +---
 .../kotlin/wasm/analyze/WasmDiagnosticSuppressor.kt      | 3 +++
 .../kotlin/wasm/resolve/WasmPlatformConfigurator.kt      | 1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt b/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
index 3309e5c2967..1a555d6cd77 100644
--- a/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
+++ b/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
@@ -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) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PlatformDiagnosticSuppressor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PlatformDiagnosticSuppressor.kt
index a11e02802c1..a18f9a0ca9e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PlatformDiagnosticSuppressor.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/PlatformDiagnosticSuppressor.kt
@@ -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) }
 }
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt
index 5f57e846bce..1aa32971b0f 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt
@@ -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()
 }
diff --git a/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/analyze/WasmDiagnosticSuppressor.kt b/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/analyze/WasmDiagnosticSuppressor.kt
index 3844668d0ef..e4ecfb2d755 100644
--- a/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/analyze/WasmDiagnosticSuppressor.kt
+++ b/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/analyze/WasmDiagnosticSuppressor.kt
@@ -25,5 +25,8 @@ object WasmDiagnosticSuppressor : PlatformDiagnosticSuppressor {
         return true
     }
 
+    override fun shouldReportUnusedParameter(parameter: VariableDescriptor): Boolean =
+        true
+
     override fun shouldReportNoBody(descriptor: CallableMemberDescriptor): Boolean = true
 }
\ No newline at end of file
diff --git a/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/resolve/WasmPlatformConfigurator.kt b/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/resolve/WasmPlatformConfigurator.kt
index 6ca9c27215e..39e38f3d4e4 100644
--- a/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/resolve/WasmPlatformConfigurator.kt
+++ b/wasm/wasm.frontend/src/org/jetbrains/kotlin/wasm/resolve/WasmPlatformConfigurator.kt
@@ -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