Compilation fixes

jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt

@@ -66,7 +66,7 @@ abstract class IdePlatformKind {
 
 
         fun <Args : CommonCompilerArguments> platformByCompilerArguments(arguments: Args): TargetPlatform? =
-            ALL_KINDS.firstNotNullResult { it.platformByCompilerArguments(arguments) }
+            ALL_KINDS.firstNotNullOfOrNull { it.platformByCompilerArguments(arguments) }
 
     }
 }
@@ -76,7 +76,7 @@ val TargetPlatform.idePlatformKind: IdePlatformKind
         when {
             list.size == 1 -> list.first()
             list.size > 1 -> list.first().also {
-                Logger.getInstance(IdePlatformKind.javaClass).warn("Found more than one IdePlatformKind [$list] for target [$this].")
+                Logger.getInstance(IdePlatformKind.Companion::class.java).warn("Found more than one IdePlatformKind [$list] for target [$this].")
             }
             else -> error("Unknown platform $this")
         }

jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt

@@ -76,7 +76,6 @@ class CompilerArgumentsContentProspectorTest {
             CommonCompilerArguments::noCheckActual,
             CommonCompilerArguments::newInference,
             CommonCompilerArguments::inlineClasses,
-            CommonCompilerArguments::polymorphicSignature,
             CommonCompilerArguments::legacySmartCastAfterTry,
             CommonCompilerArguments::effectSystem,
             CommonCompilerArguments::readDeserializedContracts,
@@ -112,7 +111,6 @@ class CompilerArgumentsContentProspectorTest {
         private val commonCompilerArgumentsArrayProperties = listOf(
             CommonCompilerArguments::pluginOptions,
             CommonCompilerArguments::pluginClasspaths,
-            CommonCompilerArguments::experimental,
             CommonCompilerArguments::useExperimental,
             CommonCompilerArguments::optIn,
             CommonCompilerArguments::commonSources,
@@ -140,17 +138,14 @@ class CompilerArgumentsContentProspectorTest {
             K2JVMCompilerArguments::noCallAssertions,
             K2JVMCompilerArguments::noReceiverAssertions,
             K2JVMCompilerArguments::noParamAssertions,
-            K2JVMCompilerArguments::strictJavaNullabilityAssertions,
             K2JVMCompilerArguments::noOptimize,
             K2JVMCompilerArguments::inheritMultifileParts,
             K2JVMCompilerArguments::useTypeTable,
-            K2JVMCompilerArguments::skipRuntimeVersionCheck,
             K2JVMCompilerArguments::useOldClassFilesReading,
             K2JVMCompilerArguments::singleModule,
             K2JVMCompilerArguments::suppressMissingBuiltinsError,
             K2JVMCompilerArguments::useJavac,
             K2JVMCompilerArguments::compileJava,
-            K2JVMCompilerArguments::noExceptionOnExplicitEqualsForBoxedNull,
             K2JVMCompilerArguments::disableStandardScript,
             K2JVMCompilerArguments::strictMetadataVersionSemantics,
             K2JVMCompilerArguments::suppressDeprecatedJvmTargetWarning,
@@ -162,7 +157,6 @@ class CompilerArgumentsContentProspectorTest {
             K2JVMCompilerArguments::noKotlinNothingValueException,
             K2JVMCompilerArguments::noResetJarTimestamps,
             K2JVMCompilerArguments::noUnifiedNullChecks,
-            K2JVMCompilerArguments::useOldSpilledVarTypeAnalysis,
             K2JVMCompilerArguments::useOldInlineClassesManglingScheme,
             K2JVMCompilerArguments::enableJvmPreview,
         )
@@ -176,7 +170,6 @@ class CompilerArgumentsContentProspectorTest {
             K2JVMCompilerArguments::jvmTarget,
             K2JVMCompilerArguments::abiStability,
             K2JVMCompilerArguments::javaModulePath,
-            K2JVMCompilerArguments::constructorCallNormalizationMode,
             K2JVMCompilerArguments::assertionsMode,
             K2JVMCompilerArguments::buildFile,
             K2JVMCompilerArguments::declarationsOutputPath,
@@ -223,7 +216,6 @@ class CompilerArgumentsContentProspectorTest {
             K2JSCompilerArguments::irProduceKlibFile,
             K2JSCompilerArguments::irProduceJs,
             K2JSCompilerArguments::irDce,
-            K2JSCompilerArguments::irDceDriven,
             K2JSCompilerArguments::irDcePrintReachabilityInfo,
             K2JSCompilerArguments::irPropertyLazyInitialization,
             K2JSCompilerArguments::irOnly,