Delete TargetPlatform.builtins

Replace it's usages with relevant singleton reference

compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt

@@ -21,10 +21,10 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl
 import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate
 import org.jetbrains.kotlin.cfg.pseudocode.getExpectedTypePredicate
 import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue
+import org.jetbrains.kotlin.platform.JvmBuiltIns
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import java.util.*
 
 abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
@@ -51,7 +51,7 @@ abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
 
         fun valueDecl(value: PseudoValue): String {
             val typePredicate = expectedTypePredicateMap.getOrPut(value) {
-                getExpectedTypePredicate(value, bindingContext, JvmPlatform.builtIns)
+                getExpectedTypePredicate(value, bindingContext, JvmBuiltIns.Instance)
             }
             return "${value.debugName}: $typePredicate"
         }

compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
+import org.jetbrains.kotlin.platform.JvmBuiltIns;
 import org.jetbrains.kotlin.script.KotlinScriptDefinition;
 import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider;
 import org.jetbrains.kotlin.script.ScriptParameter;
@@ -37,7 +37,7 @@ public class ScriptGenTest extends CodegenTestCase {
     private static final KotlinScriptDefinition FIB_SCRIPT_DEFINITION =
             new TestScriptDefinition(
                     ".lang.kt",
-                    singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE.getBuiltIns().getIntType()))
+                    singletonList(new ScriptParameter(Name.identifier("num"), JvmBuiltIns.getInstance().getIntType()))
             );
     private static final KotlinScriptDefinition NO_PARAM_SCRIPT_DEFINITION =
             new TestScriptDefinition(

compiler/tests/org/jetbrains/kotlin/jvm/compiler/FlexibleTypeAssertionsEnabledTest.kt

@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.jvm.compiler
 
 import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
+import org.jetbrains.kotlin.platform.JvmBuiltIns
 import org.jetbrains.kotlin.test.KotlinTestWithEnvironmentManagement
 
 class FlexibleTypeAssertionsEnabledTest : KotlinTestWithEnvironmentManagement() {
 
     fun testAssertionsAreOn() {
-        val builtIns = JvmPlatform.builtIns
+        val builtIns = JvmBuiltIns.Instance
 
         try {
             LazyJavaTypeResolver.FlexibleJavaClassifierTypeFactory.create(

compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt

@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.resolve.typeApproximation
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.diagnostics.Severity
+import org.jetbrains.kotlin.platform.JvmBuiltIns
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.inference.createCapturedType
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -65,7 +65,7 @@ class CapturedTypeApproximationTest : KotlinTestWithEnvironment() {
         }
 
         fun createTestSubstitutions(typeParameters: List<TypeParameterDescriptor>) = run {
-            val builtIns = JvmPlatform.builtIns
+            val builtIns = JvmBuiltIns.Instance
             val intType = builtIns.intType
             val stringType = builtIns.stringType
             val t = typeParameters[0]

compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java

@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.config.ContentRootsKt;
 import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
+import org.jetbrains.kotlin.platform.JvmBuiltIns;
 import org.jetbrains.kotlin.script.KotlinScriptDefinition;
 import org.jetbrains.kotlin.script.ScriptParameter;
 import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -105,6 +105,6 @@ public class ScriptTest {
 
     @NotNull
     private static List<ScriptParameter> numIntParam() {
-        return Collections.singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE.getBuiltIns().getIntType()));
+        return Collections.singletonList(new ScriptParameter(Name.identifier("num"), JvmBuiltIns.getInstance().getIntType()));
     }
 }

compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java

@@ -19,12 +19,12 @@ package org.jetbrains.kotlin.types;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor;
+import org.jetbrains.kotlin.platform.JvmBuiltIns;
 import org.jetbrains.kotlin.psi.KtNamedFunction;
 import org.jetbrains.kotlin.psi.KtPsiFactoryKt;
 import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver;
 import org.jetbrains.kotlin.resolve.OverloadUtil;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory;
-import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -163,7 +163,7 @@ public class KotlinOverloadTest extends KotlinTestWithEnvironment {
 
     private FunctionDescriptor makeFunction(String funDecl) {
         KtNamedFunction function = KtPsiFactoryKt.KtPsiFactory(getProject()).createFunction(funDecl);
-        LexicalScope scope = TypeTestUtilsKt.builtInPackageAsLexicalScope(JvmPlatform.INSTANCE.getBuiltIns());
+        LexicalScope scope = TypeTestUtilsKt.builtInPackageAsLexicalScope(JvmBuiltIns.getInstance());
         return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, KotlinTestUtils.DUMMY_TRACE, DataFlowInfoFactory.EMPTY);
     }
 }