diff --git a/.idea/runConfigurations/Generate_Compiler_Tests.xml b/.idea/runConfigurations/Generate_Compiler_Tests.xml
index 44a573c3fb5..621873a8928 100644
--- a/.idea/runConfigurations/Generate_Compiler_Tests.xml
+++ b/.idea/runConfigurations/Generate_Compiler_Tests.xml
@@ -10,12 +10,11 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":compiler:generateTests" />
+          <option value=":compiler:tests-for-compiler-generator:generateTests" />
           <option value=":compiler:tests-java8:generateTests" />
           <option value=":compiler:tests-against-klib:generateTests" />
           <option value=":js:js.tests:generateTests" />
           <option value=":core:descriptors.runtime:generateTests" />
-          <option value=":compiler:tests-common-new:generateTests" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/build.gradle.kts b/build.gradle.kts
index af636074a10..9409019b664 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -293,6 +293,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:checkers",
     ":compiler:fir:entrypoint",
     ":compiler:fir:analysis-tests",
+    ":compiler:fir:analysis-tests:legacy-fir-tests",
     ":wasm:wasm.ir"
 )
 
@@ -667,6 +668,7 @@ tasks {
         dependsOn(":compiler:fir:raw-fir:psi2fir:test")
         dependsOn(":compiler:fir:raw-fir:light-tree2fir:test")
         dependsOn(":compiler:fir:analysis-tests:test")
+        dependsOn(":compiler:fir:analysis-tests:legacy-fir-tests:test")
         dependsOn(":compiler:fir:fir2ir:test")
     }
 
@@ -676,6 +678,7 @@ tasks {
             ":compiler:fir:raw-fir:psi2fir:test",
             ":compiler:fir:raw-fir:light-tree2fir:test",
             ":compiler:fir:analysis-tests:test",
+            ":compiler:fir:analysis-tests:legacy-fir-tests:test",
             ":compiler:fir:fir2ir:test",
             ":plugins:fir:fir-plugin-prototype:test"
         )
@@ -711,7 +714,6 @@ tasks {
     }
 
     register("miscCompilerTest") {
-        dependsOn("wasmCompilerTest")
         dependsOn("nativeCompilerTest")
         dependsOn("firCompilerTest")
 
diff --git a/buildSrc/src/main/kotlin/pluginMarkers.kt b/buildSrc/src/main/kotlin/pluginMarkers.kt
index 8509609ec01..41bf7e5477e 100644
--- a/buildSrc/src/main/kotlin/pluginMarkers.kt
+++ b/buildSrc/src/main/kotlin/pluginMarkers.kt
@@ -20,6 +20,10 @@ internal const val PLUGIN_MARKER_SUFFIX = ".gradle.plugin"
 
 @OptIn(ExperimentalStdlibApi::class)
 fun Project.publishPluginMarkers(withEmptyJars: Boolean = true) {
+
+    fun Project.isSonatypePublish(): Boolean =
+        hasProperty("isSonatypePublish") && property("isSonatypePublish") as Boolean
+
     val pluginDevelopment = extensions.getByType<PluginBundleExtension>()
     val publishingExtension = extensions.getByType<PublishingExtension>()
     val mainPublication = publishingExtension.publications[KotlinBuildPublishingPlugin.PUBLICATION_NAME] as MavenPublication
@@ -32,7 +36,12 @@ fun Project.publishPluginMarkers(withEmptyJars: Boolean = true) {
 
         tasks.named<PublishToMavenRepository>(
             "publish${markerPublication.name.capitalize(Locale.ROOT)}PublicationTo${KotlinBuildPublishingPlugin.REPOSITORY_NAME}Repository"
-        ).configureRepository()
+        ).apply {
+            configureRepository()
+            configure {
+                onlyIf { !isSonatypePublish() }
+            }
+        }
     }
 }
 
diff --git a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/VersionIndependentOpcodes.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/VersionIndependentOpcodes.kt
new file mode 100644
index 00000000000..8c4d80e2a62
--- /dev/null
+++ b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/VersionIndependentOpcodes.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 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.codegen
+
+import org.jetbrains.org.objectweb.asm.Opcodes
+
+// This object should help compiling against different ASM versions in different bunch versions
+object VersionIndependentOpcodes {
+    const val ACC_RECORD = Opcodes.ACC_RECORD
+}
diff --git a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/VersionIndependentOpcodes.kt.201 b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/VersionIndependentOpcodes.kt.201
new file mode 100644
index 00000000000..2b2b7422592
--- /dev/null
+++ b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/VersionIndependentOpcodes.kt.201
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 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.codegen
+
+import org.jetbrains.org.objectweb.asm.Opcodes
+
+// This object should help compiling against different ASM versions from different bunch versions
+object VersionIndependentOpcodes {
+    const val ACC_RECORD = 0
+}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderRecord.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderRecord.kt
new file mode 100644
index 00000000000..eaf3adc8077
--- /dev/null
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderRecord.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2020 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.codegen
+
+fun ClassBuilder.addRecordComponent(name: String, desc: String, signature: String?) {
+    newRecordComponent(name, desc, signature)
+}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderRecord.kt.201 b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderRecord.kt.201
new file mode 100644
index 00000000000..72d66859291
--- /dev/null
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderRecord.kt.201
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2010-2020 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.codegen
+
+fun ClassBuilder.addRecordComponent(name: String, desc: String, signature: String?) {
+    // newRecordComponent(name, desc, signature)
+}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index caa9fedb583..a7063ee9de6 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -223,7 +223,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         }
 
         if (JvmAnnotationUtilKt.isJvmRecord(descriptor)) {
-            access |= ACC_RECORD;
+            access |= VersionIndependentOpcodes.ACC_RECORD;
         }
 
         v.defineClass(
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java.201 b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java.201
deleted file mode 100644
index f2c8aa9d96d..00000000000
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java.201
+++ /dev/null
@@ -1,1248 +0,0 @@
-/*
- * Copyright 2010-2020 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.codegen;
-
-import com.intellij.openapi.progress.ProcessCanceledException;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.ArrayUtil;
-import kotlin.Unit;
-import kotlin.collections.CollectionsKt;
-import kotlin.jvm.functions.Function2;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap;
-import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap.PlatformMutabilityMapping;
-import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
-import org.jetbrains.kotlin.codegen.binding.MutableClosure;
-import org.jetbrains.kotlin.codegen.context.*;
-import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension;
-import org.jetbrains.kotlin.codegen.serialization.JvmSerializerExtension;
-import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
-import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter;
-import org.jetbrains.kotlin.codegen.state.GenerationState;
-import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
-import org.jetbrains.kotlin.config.LanguageFeature;
-import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
-import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor;
-import org.jetbrains.kotlin.load.kotlin.TypeMappingMode;
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
-import org.jetbrains.kotlin.metadata.ProtoBuf;
-import org.jetbrains.kotlin.name.ClassId;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.name.Name;
-import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.psi.synthetics.SyntheticClassOrObjectDescriptor;
-import org.jetbrains.kotlin.resolve.*;
-import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt;
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
-import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall;
-import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
-import org.jetbrains.kotlin.resolve.jvm.annotations.JvmAnnotationUtilKt;
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
-import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmClassSignature;
-import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature;
-import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
-import org.jetbrains.kotlin.resolve.scopes.MemberScope;
-import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver;
-import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver;
-import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
-import org.jetbrains.kotlin.serialization.DescriptorSerializer;
-import org.jetbrains.kotlin.types.KotlinType;
-import org.jetbrains.org.objectweb.asm.FieldVisitor;
-import org.jetbrains.org.objectweb.asm.MethodVisitor;
-import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
-import org.jetbrains.org.objectweb.asm.commons.Method;
-
-import java.util.*;
-
-import static org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES;
-import static org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF;
-import static org.jetbrains.kotlin.codegen.AsmUtil.CAPTURED_THIS_FIELD;
-import static org.jetbrains.kotlin.codegen.CodegenUtilKt.isGenericToArray;
-import static org.jetbrains.kotlin.codegen.CodegenUtilKt.isNonGenericToArray;
-import static org.jetbrains.kotlin.codegen.DescriptorAsmUtil.*;
-import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*;
-import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
-import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.getDelegatedLocalVariableMetadata;
-import static org.jetbrains.kotlin.load.java.DescriptorsJvmAbiUtil.*;
-import static org.jetbrains.kotlin.load.java.JvmAbi.HIDDEN_INSTANCE_FIELD;
-import static org.jetbrains.kotlin.load.java.JvmAbi.INSTANCE_FIELD;
-import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_GET;
-import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_SET;
-import static org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull;
-import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
-import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
-import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE;
-import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
-import static org.jetbrains.kotlin.types.Variance.INVARIANT;
-import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.isLocalFunction;
-import static org.jetbrains.org.objectweb.asm.Opcodes.*;
-import static org.jetbrains.org.objectweb.asm.Type.getObjectType;
-
-public class ImplementationBodyCodegen extends ClassBodyCodegen {
-    public static final String ENUM_VALUES_FIELD_NAME = "$VALUES";
-    private Type superClassAsmType;
-    @NotNull
-    private SuperClassInfo superClassInfo;
-    private final Type classAsmType;
-    private final boolean isLocal;
-
-    private List<PropertyAndDefaultValue> companionObjectPropertiesToCopy;
-
-    private final DelegationFieldsInfo delegationFieldsInfo;
-
-    private final List<Function2<ImplementationBodyCodegen, ClassBuilder, Unit>> additionalTasks = new ArrayList<>();
-
-    private final DescriptorSerializer serializer;
-
-    private final ConstructorCodegen constructorCodegen;
-
-    public ImplementationBodyCodegen(
-            @NotNull KtPureClassOrObject aClass,
-            @NotNull ClassContext context,
-            @NotNull ClassBuilder v,
-            @NotNull GenerationState state,
-            @Nullable MemberCodegen<?> parentCodegen,
-            boolean isLocal
-    ) {
-        super(aClass, context, v, state, parentCodegen);
-        this.classAsmType = getObjectType(typeMapper.classInternalName(descriptor));
-        this.isLocal = isLocal;
-
-        this.delegationFieldsInfo =
-                new DelegationFieldsInfo(classAsmType, descriptor, state, bindingContext)
-                        .getDelegationFieldsInfo(myClass.getSuperTypeListEntries());
-
-        JvmSerializerExtension extension = new JvmSerializerExtension(v.getSerializationBindings(), state);
-        this.serializer = DescriptorSerializer.create(
-                descriptor, extension,
-                parentCodegen instanceof ImplementationBodyCodegen
-                ? ((ImplementationBodyCodegen) parentCodegen).serializer
-                : DescriptorSerializer.createTopLevel(extension),
-                state.getProject()
-        );
-
-        this.constructorCodegen = new ConstructorCodegen(
-                descriptor, context, functionCodegen, this,
-                this, state, kind, v, classAsmType, myClass, bindingContext
-        );
-    }
-
-    @Override
-    protected void generateDeclaration() {
-        superClassInfo = SuperClassInfo.getSuperClassInfo(descriptor, typeMapper);
-        superClassAsmType = superClassInfo.getType();
-
-        JvmClassSignature signature = signature();
-
-        boolean isAbstract = false;
-        boolean isInterface = false;
-        boolean isFinal = false;
-        boolean isAnnotation = false;
-        boolean isEnum = false;
-
-        ClassKind kind = descriptor.getKind();
-
-        Modality modality = descriptor.getModality();
-
-        if (modality == Modality.ABSTRACT || modality == Modality.SEALED) {
-            isAbstract = true;
-        }
-
-        if (kind == ClassKind.INTERFACE) {
-            isAbstract = true;
-            isInterface = true;
-        }
-        else if (kind == ClassKind.ANNOTATION_CLASS) {
-            isAbstract = true;
-            isInterface = true;
-            isAnnotation = true;
-        }
-        else if (kind == ClassKind.ENUM_CLASS) {
-            isAbstract = hasAbstractMembers(descriptor);
-            isEnum = true;
-        }
-
-        if (modality != Modality.OPEN && !isAbstract) {
-            isFinal = kind == ClassKind.OBJECT ||
-                      // Light-class mode: Do not make enum classes final since PsiClass corresponding to enum is expected to be inheritable from
-                      !(kind == ClassKind.ENUM_CLASS && !state.getClassBuilderMode().generateBodies);
-        }
-
-        int access = 0;
-
-        if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES && !DescriptorUtils.isTopLevelDeclaration(descriptor)) {
-            // !ClassBuilderMode.generateBodies means we are generating light classes & looking at a nested or inner class
-            // Light class generation is implemented so that Cls-classes only read bare code of classes,
-            // without knowing whether these classes are inner or not (see ClassStubBuilder.EMPTY_STRATEGY)
-            // Thus we must write full accessibility flags on inner classes in this mode
-            access |= getVisibilityAccessFlag(descriptor);
-            // Same for STATIC
-            if (!descriptor.isInner()) {
-                access |= ACC_STATIC;
-            }
-        }
-        else {
-            access |= getVisibilityAccessFlagForClass(descriptor);
-        }
-        if (isAbstract) {
-            access |= ACC_ABSTRACT;
-        }
-        if (isInterface) {
-            access |= ACC_INTERFACE; // ACC_SUPER
-        }
-        else {
-            access |= ACC_SUPER;
-        }
-        if (isFinal) {
-            access |= ACC_FINAL;
-        }
-        if (isAnnotation) {
-            access |= ACC_ANNOTATION;
-        }
-        if (KotlinBuiltIns.isDeprecated(descriptor)) {
-            access |= ACC_DEPRECATED;
-        }
-        if (isEnum) {
-            for (KtDeclaration declaration : myClass.getDeclarations()) {
-                if (declaration instanceof KtEnumEntry) {
-                    if (enumEntryNeedSubclass(bindingContext, (KtEnumEntry) declaration)) {
-                        access &= ~ACC_FINAL;
-                    }
-                }
-            }
-            access |= ACC_ENUM;
-        }
-
-        v.defineClass(
-                myClass.getPsiOrParent(),
-                state.getClassFileVersion(),
-                access,
-                signature.getName(),
-                signature.getJavaGenericSignature(),
-                signature.getSuperclassName(),
-                ArrayUtil.toStringArray(signature.getInterfaces())
-        );
-
-        v.visitSource(myClass.getContainingKtFile().getName(), null);
-
-        initDefaultSourceMappingIfNeeded();
-
-        writeEnclosingMethod();
-
-        AnnotationCodegen.forClass(v.getVisitor(), this, state).genAnnotations(descriptor, null, null);
-
-        generateEnumEntries();
-    }
-
-    @Override
-    protected void generateDefaultImplsIfNeeded() {
-        if (isInterface(descriptor) && !isLocal) {
-            Type defaultImplsType = state.getTypeMapper().mapDefaultImpls(descriptor);
-            ClassBuilder defaultImplsBuilder =
-                    state.getFactory().newVisitor(JvmDeclarationOriginKt.DefaultImpls(myClass.getPsiOrParent(), descriptor), defaultImplsType, myClass.getContainingKtFile());
-
-            CodegenContext parentContext = context.getParentContext();
-            assert parentContext != null : "Parent context of interface declaration should not be null";
-
-            ClassContext defaultImplsContext = parentContext.intoDefaultImplsClass(descriptor, (ClassContext) context, state);
-            new InterfaceImplBodyCodegen(myClass, defaultImplsContext, defaultImplsBuilder, state, this).generate();
-        }
-    }
-
-    @Override
-    protected void generateErasedInlineClassIfNeeded() {
-        if (!(myClass instanceof KtClass)) return;
-        if (!InlineClassesUtilsKt.isInlineClass(descriptor)) return;
-
-        ClassContext erasedInlineClassContext = context.intoWrapperForErasedInlineClass(descriptor, state);
-        new ErasedInlineClassBodyCodegen((KtClass) myClass, erasedInlineClassContext, v, state, this).generate();
-    }
-
-    @Override
-    protected void generateUnboxMethodForInlineClass() {
-        if (!(myClass instanceof KtClass)) return;
-        if (!InlineClassesUtilsKt.isInlineClass(descriptor)) return;
-
-        Type ownerType = typeMapper.mapClass(descriptor);
-        ValueParameterDescriptor inlinedValue = InlineClassesUtilsKt.underlyingRepresentation(this.descriptor);
-        if (inlinedValue == null) return;
-
-        Type valueType = typeMapper.mapType(inlinedValue.getType());
-        SimpleFunctionDescriptor functionDescriptor = InlineClassDescriptorResolver.createUnboxFunctionDescriptor(this.descriptor);
-        assert functionDescriptor != null : "FunctionDescriptor for unbox method should be not null during codegen";
-
-        functionCodegen.generateMethod(
-                JvmDeclarationOriginKt.UnboxMethodOfInlineClass(functionDescriptor), functionDescriptor,
-                new FunctionGenerationStrategy.CodegenBased(state) {
-                    @Override
-                    public void doGenerateBody(
-                            @NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature
-                    ) {
-                        InstructionAdapter iv = codegen.v;
-                        iv.load(0, OBJECT_TYPE);
-                        iv.getfield(ownerType.getInternalName(), inlinedValue.getName().asString(), valueType.getDescriptor());
-                        iv.areturn(valueType);
-                    }
-                }
-        );
-    }
-
-    @Override
-    protected void generateKotlinMetadataAnnotation() {
-        ProtoBuf.Class classProto = serializer.classProto(descriptor).build();
-
-        WriteAnnotationUtilKt.writeKotlinMetadata(v, state, KotlinClassHeader.Kind.CLASS, 0, av -> {
-            writeAnnotationData(av, serializer, classProto);
-            return Unit.INSTANCE;
-        });
-    }
-
-    private void writeEnclosingMethod() {
-        // Do not emit enclosing method in "light-classes mode" since currently we generate local light classes as if they're top level
-        if (!state.getClassBuilderMode().generateBodies) {
-            return;
-        }
-
-        //JVMS7: A class must have an EnclosingMethod attribute if and only if it is a local class or an anonymous class.
-        if (isAnonymousObject(descriptor) || !(descriptor.getContainingDeclaration() instanceof ClassOrPackageFragmentDescriptor)) {
-            writeOuterClassAndEnclosingMethod();
-        }
-    }
-
-    private static final Map<FqName, String> KOTLIN_MARKER_INTERFACES = new HashMap<>();
-
-    static {
-        for (PlatformMutabilityMapping platformMutabilityMapping : JavaToKotlinClassMap.INSTANCE.getMutabilityMappings()) {
-            KOTLIN_MARKER_INTERFACES.put(
-                    platformMutabilityMapping.getKotlinReadOnly().asSingleFqName(),
-                    "kotlin/jvm/internal/markers/KMappedMarker");
-
-            ClassId mutableClassId = platformMutabilityMapping.getKotlinMutable();
-            KOTLIN_MARKER_INTERFACES.put(
-                    mutableClassId.asSingleFqName(),
-                    "kotlin/jvm/internal/markers/K" + mutableClassId.getRelativeClassName().asString()
-                            .replace("MutableEntry", "Entry") // kotlin.jvm.internal.markers.KMutableMap.Entry for some reason
-                            .replace(".", "$")
-            );
-        }
-    }
-
-    @NotNull
-    private JvmClassSignature signature() {
-        return signature(descriptor, classAsmType, superClassInfo, typeMapper);
-    }
-
-    @NotNull
-    public static JvmClassSignature signature(
-            @NotNull ClassDescriptor descriptor,
-            @NotNull Type classAsmType,
-            @NotNull SuperClassInfo superClassInfo,
-            @NotNull KotlinTypeMapper typeMapper
-    ) {
-        JvmSignatureWriter sw = new BothSignatureWriter(BothSignatureWriter.Mode.CLASS);
-
-        typeMapper.writeFormalTypeParameters(descriptor.getDeclaredTypeParameters(), sw);
-
-        sw.writeSuperclass();
-        if (superClassInfo.getKotlinType() == null) {
-            sw.writeClassBegin(superClassInfo.getType());
-            sw.writeClassEnd();
-        }
-        else {
-            typeMapper.mapSupertype(superClassInfo.getKotlinType(), sw);
-        }
-        sw.writeSuperclassEnd();
-
-        LinkedHashSet<String> superInterfaces = new LinkedHashSet<>();
-        Set<String> kotlinMarkerInterfaces = new LinkedHashSet<>();
-
-        for (KotlinType supertype : descriptor.getTypeConstructor().getSupertypes()) {
-            if (isJvmInterface(supertype.getConstructor().getDeclarationDescriptor())) {
-                FqName kotlinInterfaceName = DescriptorUtils.getFqName(supertype.getConstructor().getDeclarationDescriptor()).toSafe();
-
-                sw.writeInterface();
-                Type jvmInterfaceType = typeMapper.mapSupertype(supertype, sw);
-                sw.writeInterfaceEnd();
-                String jvmInterfaceInternalName = jvmInterfaceType.getInternalName();
-
-                superInterfaces.add(jvmInterfaceInternalName);
-
-                String kotlinMarkerInterfaceInternalName = KOTLIN_MARKER_INTERFACES.get(kotlinInterfaceName);
-                if (kotlinMarkerInterfaceInternalName != null) {
-                    if (typeMapper.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES) {
-                        sw.writeInterface();
-                        Type kotlinCollectionType = typeMapper.mapType(supertype, sw, TypeMappingMode.SUPER_TYPE_KOTLIN_COLLECTIONS_AS_IS);
-                        sw.writeInterfaceEnd();
-                        superInterfaces.add(kotlinCollectionType.getInternalName());
-                    }
-
-                    kotlinMarkerInterfaces.add(kotlinMarkerInterfaceInternalName);
-                }
-            }
-        }
-
-        for (String kotlinMarkerInterface : kotlinMarkerInterfaces) {
-            sw.writeInterface();
-            sw.writeAsmType(getObjectType(kotlinMarkerInterface));
-            sw.writeInterfaceEnd();
-        }
-
-        superInterfaces.addAll(kotlinMarkerInterfaces);
-
-        return new JvmClassSignature(classAsmType.getInternalName(), superClassInfo.getType().getInternalName(),
-                                     new ArrayList<>(superInterfaces), sw.makeJavaGenericSignature());
-    }
-
-    @Override
-    protected void generateSyntheticPartsBeforeBody() {
-        generatePropertyMetadataArrayFieldIfNeeded(classAsmType);
-    }
-
-    @Override
-    protected void generateSyntheticPartsAfterBody() {
-        generateFieldForSingleton();
-
-        initializeObjects();
-
-        generateCompanionObjectBackingFieldCopies();
-
-        generateDelegatesToDefaultImpl();
-
-        generateDelegates(delegationFieldsInfo);
-
-        generateSyntheticAccessors();
-
-        generateEnumMethods();
-
-        generateFunctionsForDataClasses();
-
-        generateFunctionsFromAnyForInlineClasses();
-
-        if (state.getClassBuilderMode() != ClassBuilderMode.LIGHT_CLASSES) {
-            new CollectionStubMethodGenerator(typeMapper, descriptor).generate(functionCodegen, v);
-
-            generateToArray();
-        }
-
-
-        if (context.closure != null)
-            genClosureFields(context.closure, v, typeMapper, state.getLanguageVersionSettings());
-
-        for (ExpressionCodegenExtension extension : ExpressionCodegenExtension.Companion.getInstances(state.getProject())) {
-            if (state.getClassBuilderMode() != ClassBuilderMode.LIGHT_CLASSES
-                || extension.getShouldGenerateClassSyntheticPartsInLightClassesMode()
-            ) {
-                extension.generateClassSyntheticParts(this);
-            }
-        }
-    }
-
-    @Override
-    protected void generateConstructors() {
-        try {
-            lookupConstructorExpressionsInClosureIfPresent();
-            constructorCodegen.generatePrimaryConstructor(delegationFieldsInfo, superClassAsmType);
-            if (!InlineClassesUtilsKt.isInlineClass(descriptor) && !(descriptor instanceof SyntheticClassOrObjectDescriptor)) {
-                // Synthetic classes does not have declarations for secondary constructors
-                for (ClassConstructorDescriptor secondaryConstructor : DescriptorUtilsKt.getSecondaryConstructors(descriptor)) {
-                    constructorCodegen.generateSecondaryConstructor(secondaryConstructor, superClassAsmType);
-                }
-            }
-        }
-        catch (CompilationException | ProcessCanceledException e) {
-            throw e;
-        }
-        catch (RuntimeException e) {
-            throw new RuntimeException("Error generating constructors of class " + myClass.getName() + " with kind " + kind, e);
-        }
-    }
-
-    private void generateToArray() {
-        if (descriptor.getKind() == ClassKind.INTERFACE) return;
-
-        KotlinBuiltIns builtIns = DescriptorUtilsKt.getBuiltIns(descriptor);
-        if (!isSubclass(descriptor, builtIns.getCollection())) return;
-
-        if (CollectionsKt.any(DescriptorUtilsKt.getAllSuperclassesWithoutAny(descriptor),
-                              classDescriptor -> !(classDescriptor instanceof JavaClassDescriptor) &&
-                                                 isSubclass(classDescriptor, builtIns.getCollection()))) {
-            return;
-        }
-
-        Collection<? extends SimpleFunctionDescriptor> functions = descriptor.getDefaultType().getMemberScope().getContributedFunctions(
-                Name.identifier("toArray"), NoLookupLocation.FROM_BACKEND
-        );
-        boolean hasGenericToArray = false;
-        boolean hasNonGenericToArray = false;
-        for (FunctionDescriptor function : functions) {
-            hasGenericToArray |= isGenericToArray(function);
-            hasNonGenericToArray |= isNonGenericToArray(function);
-        }
-
-        if (!hasNonGenericToArray) {
-            MethodVisitor mv = v.newMethod(NO_ORIGIN, ACC_PUBLIC, "toArray", "()[Ljava/lang/Object;", null, null);
-
-            InstructionAdapter iv = new InstructionAdapter(mv);
-            mv.visitCode();
-
-            iv.load(0, classAsmType);
-            iv.invokestatic("kotlin/jvm/internal/CollectionToArray", "toArray", "(Ljava/util/Collection;)[Ljava/lang/Object;", false);
-            iv.areturn(Type.getType("[Ljava/lang/Object;"));
-
-            FunctionCodegen.endVisit(mv, "toArray", myClass);
-        }
-
-        if (!hasGenericToArray) {
-            MethodVisitor mv = v.newMethod(
-                    NO_ORIGIN, ACC_PUBLIC, "toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", "<T:Ljava/lang/Object;>([TT;)[TT;", null);
-
-            InstructionAdapter iv = new InstructionAdapter(mv);
-            mv.visitCode();
-
-            iv.load(0, classAsmType);
-            iv.load(1, Type.getType("[Ljava/lang/Object;"));
-
-            iv.invokestatic("kotlin/jvm/internal/CollectionToArray", "toArray",
-                            "(Ljava/util/Collection;[Ljava/lang/Object;)[Ljava/lang/Object;", false);
-            iv.areturn(Type.getType("[Ljava/lang/Object;"));
-
-            FunctionCodegen.endVisit(mv, "toArray", myClass);
-        }
-    }
-
-    public static JvmKotlinType genPropertyOnStack(
-            InstructionAdapter iv,
-            MethodContext context,
-            @NotNull PropertyDescriptor propertyDescriptor,
-            Type classAsmType,
-            int index,
-            GenerationState state
-    ) {
-        iv.load(index, classAsmType);
-        if (couldUseDirectAccessToProperty(propertyDescriptor, /* forGetter = */ true,
-                                               /* isDelegated = */ false, context, state.getShouldInlineConstVals())) {
-            KotlinType kotlinType = propertyDescriptor.getType();
-            Type type = state.getTypeMapper().mapType(kotlinType);
-            String fieldName = ((FieldOwnerContext) context.getParentContext()).getFieldName(propertyDescriptor, false);
-            iv.getfield(classAsmType.getInternalName(), fieldName, type.getDescriptor());
-            return new JvmKotlinType(type, kotlinType);
-        }
-        else {
-            PropertyGetterDescriptor getter = propertyDescriptor.getGetter();
-
-            //noinspection ConstantConditions
-            Method method = state.getTypeMapper().mapAsmMethod(getter);
-            iv.invokevirtual(classAsmType.getInternalName(), method.getName(), method.getDescriptor(), false);
-            return new JvmKotlinType(method.getReturnType(), getter.getReturnType());
-        }
-    }
-
-    private void generateFunctionsForDataClasses() {
-        if (!descriptor.isData()) return;
-        if (!(myClass instanceof KtClassOrObject)) return;
-        new DataClassMethodGeneratorImpl((KtClassOrObject)myClass, bindingContext).generate();
-    }
-
-    private void generateFunctionsFromAnyForInlineClasses() {
-        if (!InlineClassesUtilsKt.isInlineClass(descriptor)) return;
-        if (!(myClass instanceof KtClassOrObject)) return;
-        new FunctionsFromAnyGeneratorImpl(
-                (KtClassOrObject) myClass, bindingContext, descriptor, classAsmType, context, v, state
-        ).generate();
-    }
-
-    private class DataClassMethodGeneratorImpl extends DataClassMethodGenerator {
-        private final FunctionsFromAnyGeneratorImpl functionsFromAnyGenerator;
-
-        DataClassMethodGeneratorImpl(
-                KtClassOrObject klass,
-                BindingContext bindingContext
-        ) {
-            super(klass, bindingContext);
-            this.functionsFromAnyGenerator = new FunctionsFromAnyGeneratorImpl(
-                    klass, bindingContext, descriptor, classAsmType, ImplementationBodyCodegen.this.context, v, state
-            );
-        }
-
-        @Override
-        public void generateEqualsMethod(@NotNull FunctionDescriptor function, @NotNull List<? extends PropertyDescriptor> properties) {
-            functionsFromAnyGenerator.generateEqualsMethod(function, properties);
-        }
-
-        @Override
-        public void generateHashCodeMethod(@NotNull FunctionDescriptor function, @NotNull List<? extends PropertyDescriptor> properties) {
-            functionsFromAnyGenerator.generateHashCodeMethod(function, properties);
-        }
-
-        @Override
-        public void generateToStringMethod(@NotNull FunctionDescriptor function, @NotNull List<? extends PropertyDescriptor> properties) {
-            functionsFromAnyGenerator.generateToStringMethod(function, properties);
-        }
-
-        @Override
-        public void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull ValueParameterDescriptor parameter) {
-            PsiElement originalElement = DescriptorToSourceUtils.descriptorToDeclaration(parameter);
-            functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(originalElement, function), function, new FunctionGenerationStrategy() {
-                @Override
-                public void generateBody(
-                        @NotNull MethodVisitor mv,
-                        @NotNull FrameMap frameMap,
-                        @NotNull JvmMethodSignature signature,
-                        @NotNull MethodContext context,
-                        @NotNull MemberCodegen<?> parentCodegen
-                ) {
-                    Type componentType = signature.getReturnType();
-                    InstructionAdapter iv = new InstructionAdapter(mv);
-                    if (!componentType.equals(Type.VOID_TYPE)) {
-                        PropertyDescriptor property =
-                                bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, descriptorToDeclaration(parameter));
-                        assert property != null : "Property descriptor is not found for primary constructor parameter: " + parameter;
-
-                        JvmKotlinType propertyType = genPropertyOnStack(
-                                iv, context, property, ImplementationBodyCodegen.this.classAsmType, 0, state
-                        );
-                        StackValue.coerce(propertyType.getType(), componentType, iv);
-                    }
-                    iv.areturn(componentType);
-                }
-
-                @Override
-                public boolean skipNotNullAssertionsForParameters() {
-                    return false;
-                }
-            });
-        }
-
-        @Override
-        public void generateCopyFunction(
-                @NotNull FunctionDescriptor function,
-                @NotNull List<? extends KtParameter> constructorParameters
-        ) {
-            Type thisDescriptorType = typeMapper.mapType(descriptor);
-
-            functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOriginFromPure(myClass, function), function, new FunctionGenerationStrategy() {
-                @Override
-                public void generateBody(
-                        @NotNull MethodVisitor mv,
-                        @NotNull FrameMap frameMap,
-                        @NotNull JvmMethodSignature signature,
-                        @NotNull MethodContext context,
-                        @NotNull MemberCodegen<?> parentCodegen
-                ) {
-                    InstructionAdapter iv = new InstructionAdapter(mv);
-
-                    iv.anew(thisDescriptorType);
-                    iv.dup();
-
-                    ConstructorDescriptor constructor = getPrimaryConstructorOfDataClass(descriptor);
-                    assert function.getValueParameters().size() == constructor.getValueParameters().size() :
-                            "Number of parameters of copy function and constructor are different. " +
-                            "Copy: " + function.getValueParameters().size() + ", " +
-                            "constructor: " + constructor.getValueParameters().size();
-
-                    MutableClosure closure = ImplementationBodyCodegen.this.context.closure;
-                    if (closure != null) {
-                        pushCapturedFieldsOnStack(iv, closure);
-                    }
-
-                    int parameterIndex = 1; // localVariable 0 = this
-                    for (ValueParameterDescriptor parameterDescriptor : function.getValueParameters()) {
-                        Type type = typeMapper.mapType(parameterDescriptor.getType());
-                        iv.load(parameterIndex, type);
-                        parameterIndex += type.getSize();
-                    }
-
-                    Method constructorAsmMethod = typeMapper.mapAsmMethod(constructor);
-                    iv.invokespecial(thisDescriptorType.getInternalName(), "<init>", constructorAsmMethod.getDescriptor(), false);
-
-                    iv.areturn(thisDescriptorType);
-                }
-
-                @Override
-                public boolean skipNotNullAssertionsForParameters() {
-                    return false;
-                }
-
-                private void pushCapturedFieldsOnStack(InstructionAdapter iv, MutableClosure closure) {
-                    ClassDescriptor captureThis = closure.getCapturedOuterClassDescriptor();
-                    if (captureThis != null) {
-                        iv.load(0, classAsmType);
-                        Type type = typeMapper.mapType(captureThis);
-                        iv.getfield(classAsmType.getInternalName(), CAPTURED_THIS_FIELD, type.getDescriptor());
-                    }
-
-                    KotlinType captureReceiver = closure.getCapturedReceiverFromOuterContext();
-                    if (captureReceiver != null) {
-                        iv.load(0, classAsmType);
-                        Type type = typeMapper.mapType(captureReceiver);
-                        String fieldName = closure.getCapturedReceiverFieldName(bindingContext, state.getLanguageVersionSettings());
-                        iv.getfield(classAsmType.getInternalName(), fieldName, type.getDescriptor());
-                    }
-
-                    for (Map.Entry<DeclarationDescriptor, EnclosedValueDescriptor> entry : closure.getCaptureVariables().entrySet()) {
-                        DeclarationDescriptor declarationDescriptor = entry.getKey();
-                        EnclosedValueDescriptor enclosedValueDescriptor = entry.getValue();
-                        StackValue capturedValue = enclosedValueDescriptor.getInstanceValue();
-                        Type sharedVarType = typeMapper.getSharedVarType(declarationDescriptor);
-                        if (sharedVarType == null) {
-                            sharedVarType = typeMapper.mapType((VariableDescriptor) declarationDescriptor);
-                        }
-                        capturedValue.put(sharedVarType, iv);
-                    }
-                }
-            });
-
-            functionCodegen.generateDefaultIfNeeded(
-                    context.intoFunction(function), function, OwnerKind.IMPLEMENTATION,
-                    (valueParameter, codegen) -> {
-                        assert ((ClassDescriptor) function.getContainingDeclaration()).isData()
-                                : "Function container must have [data] modifier: " + function;
-                        PropertyDescriptor property = bindingContext.get(BindingContext.VALUE_PARAMETER_AS_PROPERTY, valueParameter);
-                        assert property != null : "Copy function doesn't correspond to any property: " + function;
-                        return codegen.intermediateValueForProperty(property, false, null, StackValue.LOCAL_0);
-                    },
-                    null
-            );
-        }
-    }
-
-    @NotNull
-    private static ConstructorDescriptor getPrimaryConstructorOfDataClass(@NotNull ClassDescriptor classDescriptor) {
-        ConstructorDescriptor constructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
-        assert constructor != null : "Data class must have primary constructor: " + classDescriptor;
-        return constructor;
-    }
-
-    private void generateEnumMethods() {
-        if (isEnumClass(descriptor)) {
-            generateEnumValuesMethod();
-            generateEnumValueOfMethod();
-        }
-    }
-
-    private void generateEnumValuesMethod() {
-        Type type = typeMapper.mapType(DescriptorUtilsKt.getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType()));
-
-        FunctionDescriptor valuesFunction =
-                CollectionsKt.single(descriptor.getStaticScope().getContributedFunctions(ENUM_VALUES, NoLookupLocation.FROM_BACKEND));
-        MethodVisitor mv = v.newMethod(
-                JvmDeclarationOriginKt.OtherOriginFromPure(myClass, valuesFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUES.asString(),
-                "()" + type.getDescriptor(), null, null
-        );
-        if (!state.getClassBuilderMode().generateBodies) return;
-
-        mv.visitCode();
-        mv.visitFieldInsn(GETSTATIC, classAsmType.getInternalName(), ENUM_VALUES_FIELD_NAME, type.getDescriptor());
-        mv.visitMethodInsn(INVOKEVIRTUAL, type.getInternalName(), "clone", "()Ljava/lang/Object;", false);
-        mv.visitTypeInsn(CHECKCAST, type.getInternalName());
-        mv.visitInsn(ARETURN);
-        FunctionCodegen.endVisit(mv, "values()", myClass);
-    }
-
-    private void generateEnumValueOfMethod() {
-        FunctionDescriptor valueOfFunction =
-                CollectionsKt.single(descriptor.getStaticScope().getContributedFunctions(ENUM_VALUE_OF, NoLookupLocation.FROM_BACKEND),
-                                     DescriptorUtilsKt::isEnumValueOfMethod);
-        MethodVisitor mv =
-                v.newMethod(JvmDeclarationOriginKt.OtherOriginFromPure(myClass, valueOfFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUE_OF.asString(),
-                            "(Ljava/lang/String;)" + classAsmType.getDescriptor(), null, null);
-        if (!state.getClassBuilderMode().generateBodies) return;
-
-        mv.visitCode();
-        mv.visitLdcInsn(classAsmType);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitMethodInsn(INVOKESTATIC, "java/lang/Enum", "valueOf", "(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;", false);
-        mv.visitTypeInsn(CHECKCAST, classAsmType.getInternalName());
-        mv.visitInsn(ARETURN);
-        FunctionCodegen.endVisit(mv, "valueOf()", myClass);
-    }
-
-    private void generateFieldForSingleton() {
-        if (isCompanionObjectInInterfaceNotIntrinsic(descriptor)) {
-            StackValue.Field field = StackValue.createSingletonViaInstance(descriptor, typeMapper, HIDDEN_INSTANCE_FIELD);
-            //hidden instance in interface companion
-            v.newField(JvmDeclarationOriginKt.OtherOrigin(descriptor),
-                       ACC_SYNTHETIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null);
-        }
-
-        if (isEnumEntry(descriptor) || isCompanionObject(descriptor)) return;
-
-        if (isNonCompanionObject(descriptor)) {
-            StackValue.Field field = StackValue.createSingletonViaInstance(descriptor, typeMapper, INSTANCE_FIELD);
-            FieldVisitor fv = v.newField(
-                    JvmDeclarationOriginKt.OtherOriginFromPure(myClass),
-                    ACC_PUBLIC | ACC_STATIC | ACC_FINAL,
-                    field.name, field.type.getDescriptor(), null, null
-            );
-            AnnotationCodegen.forField(fv, this, state).visitAnnotation(Type.getDescriptor(NotNull.class), false).visitEnd();
-            return;
-        }
-
-        ClassDescriptor companionObjectDescriptor = descriptor.getCompanionObjectDescriptor();
-        if (companionObjectDescriptor == null) {
-            return;
-        }
-
-        @Nullable KtObjectDeclaration companionObject = CollectionsKt.firstOrNull(myClass.getCompanionObjects());
-
-        int properFieldVisibilityFlag = getVisibilityAccessFlag(companionObjectDescriptor);
-        boolean deprecatedFieldForInvisibleCompanionObject =
-                state.getLanguageVersionSettings().supportsFeature(LanguageFeature.DeprecatedFieldForInvisibleCompanionObject);
-        boolean properVisibilityForCompanionObjectInstanceField =
-                state.getLanguageVersionSettings().supportsFeature(LanguageFeature.ProperVisibilityForCompanionObjectInstanceField);
-        boolean hasPrivateOrProtectedProperVisibility = (properFieldVisibilityFlag & (ACC_PRIVATE | ACC_PROTECTED)) != 0;
-        boolean hasPackagePrivateProperVisibility = (properFieldVisibilityFlag & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED)) == 0;
-        boolean fieldShouldBeDeprecated =
-                deprecatedFieldForInvisibleCompanionObject &&
-                !properVisibilityForCompanionObjectInstanceField &&
-                (hasPrivateOrProtectedProperVisibility || hasPackagePrivateProperVisibility ||
-                 isNonIntrinsicPrivateCompanionObjectInInterface(companionObjectDescriptor));
-        boolean fieldIsForcedToBePublic =
-                JvmCodegenUtil.isJvmInterface(descriptor) ||
-                !properVisibilityForCompanionObjectInstanceField;
-        int fieldAccessFlags = ACC_STATIC | ACC_FINAL;
-        if (fieldIsForcedToBePublic) {
-            fieldAccessFlags |= ACC_PUBLIC;
-        }
-        else {
-            fieldAccessFlags |= properFieldVisibilityFlag;
-        }
-        if (fieldShouldBeDeprecated) {
-            fieldAccessFlags |= ACC_DEPRECATED;
-        }
-        if (properVisibilityForCompanionObjectInstanceField &&
-            JvmCodegenUtil.isCompanionObjectInInterfaceNotIntrinsic(companionObjectDescriptor) &&
-            DescriptorVisibilities.isPrivate(companionObjectDescriptor.getVisibility())) {
-            fieldAccessFlags |= ACC_SYNTHETIC;
-        }
-        StackValue.Field field = StackValue.singleton(companionObjectDescriptor, typeMapper);
-        FieldVisitor fv = v.newField(
-                JvmDeclarationOriginKt.OtherOrigin(companionObject == null ? myClass.getPsiOrParent() : companionObject),
-                fieldAccessFlags, field.name, field.type.getDescriptor(), null, null
-        );
-        AnnotationCodegen.forField(fv, this, state).visitAnnotation(Type.getDescriptor(NotNull.class), false).visitEnd();
-        if (fieldShouldBeDeprecated) {
-            AnnotationCodegen.forField(fv, this, state).visitAnnotation(Type.getDescriptor(Deprecated.class), true).visitEnd();
-        }
-    }
-
-    private void initializeObjects() {
-        if (!DescriptorUtils.isObject(descriptor)) return;
-        if (!state.getClassBuilderMode().generateBodies) return;
-
-        boolean isNonCompanionObject = isNonCompanionObject(descriptor);
-        boolean isInterfaceCompanion = isCompanionObjectInInterfaceNotIntrinsic(descriptor);
-        boolean isInterfaceCompanionWithBackingFieldsInOuter = isInterfaceCompanionWithBackingFieldsInOuter(descriptor);
-        boolean isMappedIntrinsicCompanionObject = isMappedIntrinsicCompanionObject(descriptor);
-        boolean isClassCompanionWithBackingFieldsInOuter = isClassCompanionObjectWithBackingFieldsInOuter(descriptor);
-        if (isNonCompanionObject ||
-            (isInterfaceCompanion && !isInterfaceCompanionWithBackingFieldsInOuter) ||
-            isMappedIntrinsicCompanionObject
-        ) {
-            ExpressionCodegen clInitCodegen = createOrGetClInitCodegen();
-            InstructionAdapter v = clInitCodegen.v;
-            markLineNumberForElement(element.getPsiOrParent(), v);
-            v.anew(classAsmType);
-            v.dup();
-            v.invokespecial(classAsmType.getInternalName(), "<init>", "()V", false);
-
-            //local0 emulates this in object constructor
-            int local0Index = clInitCodegen.getFrameMap().enterTemp(classAsmType);
-            assert local0Index == 0 : "Local variable with index 0 in clInit should be used only for singleton instance keeping";
-            StackValue.Local local0 = StackValue.local(0, classAsmType);
-            local0.store(StackValue.onStack(classAsmType), clInitCodegen.v);
-            StackValue.Field singleton =
-                    StackValue.createSingletonViaInstance(
-                            descriptor, typeMapper, isInterfaceCompanion ? HIDDEN_INSTANCE_FIELD : INSTANCE_FIELD
-            );
-            singleton.store(local0, clInitCodegen.v);
-
-            generateInitializers(clInitCodegen);
-
-            if (isInterfaceCompanion) {
-                //initialize singleton instance in outer by hidden instance
-                StackValue.singleton(descriptor, typeMapper).store(
-                        singleton, getParentCodegen().createOrGetClInitCodegen().v, true
-                );
-            }
-        }
-        else if (isClassCompanionWithBackingFieldsInOuter || isInterfaceCompanionWithBackingFieldsInOuter) {
-            ImplementationBodyCodegen parentCodegen = (ImplementationBodyCodegen) getParentCodegen();
-            ExpressionCodegen parentClInitCodegen = parentCodegen.createOrGetClInitCodegen();
-            InstructionAdapter parentVisitor = parentClInitCodegen.v;
-
-            FunctionDescriptor constructor = (FunctionDescriptor) parentCodegen.context.accessibleDescriptor(
-                    CollectionsKt.single(descriptor.getConstructors()), /* superCallExpression = */ null
-            );
-            parentCodegen.generateMethodCallTo(constructor, null, parentVisitor);
-            StackValue instance = StackValue.onStack(parentCodegen.typeMapper.mapClass(descriptor));
-            StackValue.singleton(descriptor, parentCodegen.typeMapper).store(instance, parentVisitor, true);
-
-            generateInitializers(parentClInitCodegen);
-        }
-        else {
-            assert false : "Unknown object type: " + descriptor;
-        }
-    }
-
-    private static boolean isInterfaceCompanionWithBackingFieldsInOuter(@NotNull DeclarationDescriptor declarationDescriptor) {
-        DeclarationDescriptor interfaceClass = declarationDescriptor.getContainingDeclaration();
-        if (!isCompanionObject(declarationDescriptor) || !isJvmInterface(interfaceClass)) return false;
-
-        Collection<DeclarationDescriptor> descriptors = ((ClassDescriptor) declarationDescriptor).getUnsubstitutedMemberScope()
-                .getContributedDescriptors(DescriptorKindFilter.ALL, MemberScope.Companion.getALL_NAME_FILTER());
-        return CollectionsKt.any(descriptors, d -> d instanceof PropertyDescriptor && hasJvmFieldAnnotation((PropertyDescriptor) d));
-    }
-
-    private void generateCompanionObjectBackingFieldCopies() {
-        if (companionObjectPropertiesToCopy == null || companionObjectPropertiesToCopy.isEmpty()) return;
-
-        boolean isPrivateCompanion =
-                DescriptorVisibilities.isPrivate(
-                        ((ClassDescriptor) companionObjectPropertiesToCopy.get(0).descriptor.getContainingDeclaration()).getVisibility());
-
-        int modifiers = ACC_STATIC | ACC_FINAL | ACC_PUBLIC | (isPrivateCompanion ? ACC_DEPRECATED : 0);
-        List<String> additionalVisibleAnnotations =
-                isPrivateCompanion ? Collections.singletonList(CodegenUtilKt.JAVA_LANG_DEPRECATED) : Collections.emptyList();
-        for (PropertyAndDefaultValue info : companionObjectPropertiesToCopy) {
-            PropertyDescriptor property = info.descriptor;
-
-            Type type = typeMapper.mapType(property);
-
-            FieldVisitor fv = v.newField(JvmDeclarationOriginKt.Synthetic(DescriptorToSourceUtils.descriptorToDeclaration(property), property),
-                                         modifiers, context.getFieldName(property, false),
-                                         type.getDescriptor(), typeMapper.mapFieldSignature(property.getType(), property),
-                                         info.defaultValue);
-
-            AnnotationCodegen.forField(fv, this, state).genAnnotations(property, type, null, null, additionalVisibleAnnotations);
-
-            //This field are always static and final so if it has constant initializer don't do anything in clinit,
-            //field would be initialized via default value in v.newField(...) - see JVM SPEC Ch.4
-            // TODO: test this code
-            if (state.getClassBuilderMode().generateBodies && info.defaultValue == null) {
-                ExpressionCodegen codegen = createOrGetClInitCodegen();
-                int companionObjectIndex = putCompanionObjectInLocalVar(codegen);
-                StackValue.local(companionObjectIndex, OBJECT_TYPE).put(codegen.v);
-                copyFieldFromCompanionObject(property);
-            }
-        }
-    }
-
-    private int putCompanionObjectInLocalVar(ExpressionCodegen codegen) {
-        FrameMap frameMap = codegen.myFrameMap;
-        ClassDescriptor companionObjectDescriptor = descriptor.getCompanionObjectDescriptor();
-        int companionObjectIndex = frameMap.getIndex(companionObjectDescriptor);
-        if (companionObjectIndex == -1) {
-            companionObjectIndex = frameMap.enter(companionObjectDescriptor, OBJECT_TYPE);
-            StackValue companionObject = StackValue.singleton(companionObjectDescriptor, typeMapper);
-            StackValue.local(companionObjectIndex, companionObject.type).store(companionObject, codegen.v);
-        }
-        return companionObjectIndex;
-    }
-
-    private void copyFieldFromCompanionObject(PropertyDescriptor propertyDescriptor) {
-        ExpressionCodegen codegen = createOrGetClInitCodegen();
-        StackValue property = codegen.intermediateValueForProperty(propertyDescriptor, false, null, StackValue.none());
-        StackValue.Field field = StackValue.field(
-                property.type, property.kotlinType, classAsmType, propertyDescriptor.getName().asString(),
-                true, StackValue.none(), propertyDescriptor
-        );
-        field.store(property, codegen.v);
-    }
-
-    public void generateInitializers(@NotNull ExpressionCodegen codegen) {
-        generateInitializers(() -> codegen);
-    }
-
-    private void lookupConstructorExpressionsInClosureIfPresent() {
-        if (!state.getClassBuilderMode().generateBodies || descriptor.getConstructors().isEmpty()) return;
-
-        KtVisitorVoid visitor = new KtVisitorVoid() {
-            @Override
-            public void visitKtElement(@NotNull KtElement e) {
-                e.acceptChildren(this);
-            }
-
-            @Override
-            public void visitSimpleNameExpression(@NotNull KtSimpleNameExpression expr) {
-                DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expr);
-
-                if (isLocalFunction(descriptor)) {
-                    lookupInContext(descriptor);
-                }
-                else if (descriptor instanceof CallableMemberDescriptor) {
-                    ResolvedCall<? extends CallableDescriptor> call = CallUtilKt.getResolvedCall(expr, bindingContext);
-                    if (call != null) {
-                        lookupReceivers(call);
-                    }
-                    if (call instanceof VariableAsFunctionResolvedCall) {
-                        lookupReceivers(((VariableAsFunctionResolvedCall) call).getVariableCall());
-                    }
-                }
-                else if (descriptor instanceof VariableDescriptor) {
-                    DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
-                    if (containingDeclaration instanceof ConstructorDescriptor) {
-                        ClassDescriptor classDescriptor = ((ConstructorDescriptor) containingDeclaration).getConstructedClass();
-                        if (classDescriptor == ImplementationBodyCodegen.this.descriptor) return;
-                    }
-                    if (lookupInContext(descriptor)) {
-                        if (isDelegatedLocalVariable(descriptor)) {
-                            VariableDescriptor metadata = getDelegatedLocalVariableMetadata((VariableDescriptor) descriptor, bindingContext);
-                            lookupInContext(metadata);
-                        }
-                    }
-                }
-            }
-
-            private void lookupReceivers(@NotNull ResolvedCall<? extends CallableDescriptor> call) {
-                lookupReceiver(call.getDispatchReceiver());
-                lookupReceiver(call.getExtensionReceiver());
-            }
-
-            private void lookupReceiver(@Nullable ReceiverValue value) {
-                if (value instanceof ImplicitReceiver) {
-                    if (value instanceof ExtensionReceiver) {
-                        ReceiverParameterDescriptor parameter =
-                                ((ExtensionReceiver) value).getDeclarationDescriptor().getExtensionReceiverParameter();
-                        assert parameter != null : "Extension receiver should exist: " + ((ExtensionReceiver) value).getDeclarationDescriptor();
-                        lookupInContext(parameter);
-                    }
-                    else {
-                        lookupInContext(((ImplicitReceiver) value).getDeclarationDescriptor());
-                    }
-                }
-            }
-
-            private boolean lookupInContext(@NotNull DeclarationDescriptor toLookup) {
-                return context.lookupInContext(toLookup, StackValue.LOCAL_0, state, true) != null;
-            }
-
-            @Override
-            public void visitThisExpression(@NotNull KtThisExpression expression) {
-                DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getInstanceReference());
-                assert descriptor instanceof CallableDescriptor ||
-                       descriptor instanceof ClassDescriptor : "'This' reference target should be class or callable descriptor but was " + descriptor;
-                if (descriptor instanceof ClassDescriptor) {
-                    lookupInContext(descriptor);
-                }
-
-                if (descriptor instanceof CallableDescriptor) {
-                    ReceiverParameterDescriptor parameter = ((CallableDescriptor) descriptor).getExtensionReceiverParameter();
-                    if (parameter != null) {
-                        lookupInContext(parameter);
-                    }
-                }
-            }
-
-            @Override
-            public void visitSuperExpression(@NotNull KtSuperExpression expression) {
-                lookupInContext(ExpressionCodegen.getSuperCallLabelTarget(context, expression));
-            }
-
-            @Override
-            public void visitArrayAccessExpression(@NotNull KtArrayAccessExpression expression) {
-                ResolvedCall<FunctionDescriptor> resolvedGetCall = bindingContext.get(INDEXED_LVALUE_GET, expression);
-                if (resolvedGetCall != null) {
-                    ReceiverValue receiver = resolvedGetCall.getDispatchReceiver();
-                    lookupReceiver(receiver);
-                }
-
-                ResolvedCall<FunctionDescriptor> resolvedSetCall = bindingContext.get(INDEXED_LVALUE_SET, expression);
-                if (resolvedSetCall != null) {
-                    ReceiverValue receiver = resolvedSetCall.getDispatchReceiver();
-                    lookupReceiver(receiver);
-                }
-                super.visitArrayAccessExpression(expression);
-            }
-        };
-
-        for (KtDeclaration declaration : myClass.getDeclarations()) {
-            if (declaration instanceof KtProperty) {
-                KtProperty property = (KtProperty) declaration;
-                KtExpression initializer = property.getDelegateExpressionOrInitializer();
-                if (initializer != null) {
-                    initializer.accept(visitor);
-                }
-            }
-            else if (declaration instanceof KtAnonymousInitializer) {
-                KtAnonymousInitializer initializer = (KtAnonymousInitializer) declaration;
-                initializer.accept(visitor);
-            }
-            else if (declaration instanceof KtSecondaryConstructor) {
-                KtSecondaryConstructor constructor = (KtSecondaryConstructor) declaration;
-                constructor.accept(visitor);
-            }
-        }
-
-        for (KtSuperTypeListEntry specifier : myClass.getSuperTypeListEntries()) {
-            if (specifier instanceof KtDelegatedSuperTypeEntry) {
-                KtExpression delegateExpression = ((KtDelegatedSuperTypeEntry) specifier).getDelegateExpression();
-                assert delegateExpression != null;
-                delegateExpression.accept(visitor);
-            }
-            else if (specifier instanceof KtSuperTypeCallEntry) {
-                specifier.accept(visitor);
-            }
-        }
-    }
-
-    private void generateEnumEntries() {
-        if (descriptor.getKind() != ClassKind.ENUM_CLASS) return;
-
-        List<KtEnumEntry> enumEntries = CollectionsKt.filterIsInstance(element.getDeclarations(), KtEnumEntry.class);
-
-        for (KtEnumEntry enumEntry : enumEntries) {
-            ClassDescriptor descriptor = getNotNull(bindingContext, BindingContext.CLASS, enumEntry);
-            int isDeprecated = KotlinBuiltIns.isDeprecated(descriptor) ? ACC_DEPRECATED : 0;
-            FieldVisitor fv = v.newField(JvmDeclarationOriginKt.OtherOrigin(enumEntry, descriptor), ACC_PUBLIC | ACC_ENUM | ACC_STATIC | ACC_FINAL | isDeprecated,
-                                         descriptor.getName().asString(), classAsmType.getDescriptor(), null, null);
-            AnnotationCodegen.forField(fv, this, state).genAnnotations(descriptor, null, null);
-        }
-
-        initializeEnumConstants(enumEntries);
-    }
-
-    private void initializeEnumConstants(@NotNull List<KtEnumEntry> enumEntries) {
-        if (!state.getClassBuilderMode().generateBodies) return;
-
-        ExpressionCodegen codegen = createOrGetClInitCodegen();
-        InstructionAdapter iv = codegen.v;
-
-        Type arrayAsmType = typeMapper.mapType(DescriptorUtilsKt.getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType()));
-        v.newField(JvmDeclarationOriginKt.OtherOriginFromPure(myClass), ACC_PRIVATE | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, ENUM_VALUES_FIELD_NAME,
-                   arrayAsmType.getDescriptor(), null, null);
-
-        iv.iconst(enumEntries.size());
-        iv.newarray(classAsmType);
-
-        if (!enumEntries.isEmpty()) {
-            iv.dup();
-            for (int ordinal = 0, size = enumEntries.size(); ordinal < size; ordinal++) {
-                initializeEnumConstant(enumEntries, ordinal);
-            }
-        }
-
-        iv.putstatic(classAsmType.getInternalName(), ENUM_VALUES_FIELD_NAME, arrayAsmType.getDescriptor());
-    }
-
-    private void initializeEnumConstant(@NotNull List<KtEnumEntry> enumEntries, int ordinal) {
-        ExpressionCodegen codegen = createOrGetClInitCodegen();
-        InstructionAdapter iv = codegen.v;
-        KtEnumEntry enumEntry = enumEntries.get(ordinal);
-
-        iv.dup();
-        iv.iconst(ordinal);
-
-        ClassDescriptor classDescriptor = getNotNull(bindingContext, BindingContext.CLASS, enumEntry);
-        Type implClass = typeMapper.mapClass(classDescriptor);
-
-        iv.anew(implClass);
-        iv.dup();
-
-        iv.aconst(enumEntry.getName());
-        iv.iconst(ordinal);
-
-        List<KtSuperTypeListEntry> delegationSpecifiers = enumEntry.getSuperTypeListEntries();
-        ResolvedCall<?> defaultArgumentsConstructorCall = CallUtilKt.getResolvedCall(enumEntry, bindingContext);
-        boolean enumEntryHasSubclass = CodegenBinding.enumEntryNeedSubclass(bindingContext, classDescriptor);
-        if (delegationSpecifiers.size() == 1 && !enumEntryNeedSubclass(bindingContext, enumEntry)) {
-            ResolvedCall<?> resolvedCall = CallUtilKt.getResolvedCallWithAssert(delegationSpecifiers.get(0), bindingContext);
-
-            CallableMethod method = typeMapper.mapToCallableMethod((ConstructorDescriptor) resolvedCall.getResultingDescriptor(), false);
-
-            codegen.invokeMethodWithArguments(method, resolvedCall, StackValue.none());
-        }
-        else if (defaultArgumentsConstructorCall != null && !enumEntryHasSubclass) {
-            codegen.invokeFunction(defaultArgumentsConstructorCall, StackValue.none()).put(Type.VOID_TYPE, iv);
-        }
-        else {
-            iv.invokespecial(implClass.getInternalName(), "<init>", "(Ljava/lang/String;I)V", false);
-        }
-
-        iv.dup();
-        iv.putstatic(classAsmType.getInternalName(), enumEntry.getName(), classAsmType.getDescriptor());
-        iv.astore(OBJECT_TYPE);
-    }
-
-    private void generateDelegates(DelegationFieldsInfo delegationFieldsInfo) {
-        for (KtSuperTypeListEntry specifier : myClass.getSuperTypeListEntries()) {
-            if (specifier instanceof KtDelegatedSuperTypeEntry) {
-                DelegationFieldsInfo.Field field = delegationFieldsInfo.getInfo((KtDelegatedSuperTypeEntry) specifier);
-                if (field == null) continue;
-
-                generateDelegateField(field);
-                KtExpression delegateExpression = ((KtDelegatedSuperTypeEntry) specifier).getDelegateExpression();
-                KotlinType delegateExpressionType = delegateExpression != null ? bindingContext.getType(delegateExpression) : null;
-                ClassDescriptor superClass = JvmCodegenUtil.getSuperClass(specifier, state, bindingContext);
-                if (superClass == null) continue;
-
-                generateDelegates(superClass, delegateExpressionType, field);
-            }
-        }
-    }
-
-    private void generateDelegateField(DelegationFieldsInfo.Field fieldInfo) {
-        if (!fieldInfo.generateField) return;
-
-        v.newField(JvmDeclarationOrigin.NO_ORIGIN, ACC_PRIVATE | ACC_FINAL | ACC_SYNTHETIC,
-                   fieldInfo.name, fieldInfo.type.getDescriptor(), fieldInfo.genericSignature, null);
-    }
-
-    private void generateDelegates(
-            @NotNull ClassDescriptor toInterface,
-            @Nullable KotlinType delegateExpressionType,
-            @NotNull DelegationFieldsInfo.Field field
-    ) {
-        for (Map.Entry<CallableMemberDescriptor, CallableMemberDescriptor> entry : DelegationResolver.Companion.getDelegates(
-                descriptor, toInterface, delegateExpressionType).entrySet()
-        ) {
-            CallableMemberDescriptor member = entry.getKey();
-            CallableMemberDescriptor delegateTo = entry.getValue();
-            if (member instanceof PropertyDescriptor) {
-                propertyCodegen.genDelegate((PropertyDescriptor) member, (PropertyDescriptor) delegateTo, field.getStackValue());
-            }
-            else if (member instanceof FunctionDescriptor) {
-                functionCodegen.genDelegate((FunctionDescriptor) member, (FunctionDescriptor) delegateTo, field.getStackValue());
-            }
-        }
-    }
-
-    public void addCompanionObjectPropertyToCopy(@NotNull PropertyDescriptor descriptor, Object defaultValue) {
-        if (companionObjectPropertiesToCopy == null) {
-            companionObjectPropertiesToCopy = new ArrayList<>();
-        }
-        companionObjectPropertiesToCopy.add(new PropertyAndDefaultValue(descriptor, defaultValue));
-    }
-
-    @Override
-    protected void done() {
-        for (Function2<ImplementationBodyCodegen, ClassBuilder, Unit> task : additionalTasks) {
-            task.invoke(this, v);
-        }
-
-        super.done();
-    }
-
-    private static class PropertyAndDefaultValue {
-        public final PropertyDescriptor descriptor;
-        public final Object defaultValue;
-
-        public PropertyAndDefaultValue(@NotNull PropertyDescriptor descriptor, Object defaultValue) {
-            this.descriptor = descriptor;
-            this.defaultValue = defaultValue;
-        }
-    }
-
-    public void addAdditionalTask(Function2<ImplementationBodyCodegen, ClassBuilder, Unit> additionalTask) {
-        additionalTasks.add(additionalTask);
-    }
-}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 7c45a18cef8..46270c55de0 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.codegen.inline.SourceMapper;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
 import org.jetbrains.kotlin.codegen.state.TypeMapperUtilsKt;
+import org.jetbrains.kotlin.config.JvmDefaultMode;
 import org.jetbrains.kotlin.config.LanguageFeature;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.descriptors.annotations.AnnotatedImpl;
@@ -83,7 +84,9 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
 
     private final MemberCodegen<?> parentCodegen;
     private final ReifiedTypeParametersUsages reifiedTypeParametersUsages = new ReifiedTypeParametersUsages();
+
     private final Collection<ClassDescriptor> innerClasses = new LinkedHashSet<>();
+    private final Collection<SyntheticInnerClassInfo> syntheticInnerClasses = new LinkedHashSet<>();
 
     private ExpressionCodegen clInit;
     private NameGenerator inlineNameGenerator;
@@ -316,6 +319,10 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
         genClassOrObject(context, descriptor.getSyntheticDeclaration(), state, this, descriptor);
     }
 
+    public void addSyntheticAnonymousInnerClass(SyntheticInnerClassInfo syntheticInnerClassInfo) {
+        syntheticInnerClasses.add(syntheticInnerClassInfo);
+    }
+
     private void writeInnerClasses() {
         // JVMS7 (4.7.6): a nested class or interface member will have InnerClasses information
         // for each enclosing class and for each immediate member
@@ -331,6 +338,9 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
         for (ClassDescriptor innerClass : innerClasses) {
             writeInnerClass(innerClass);
         }
+        for (SyntheticInnerClassInfo syntheticInnerClass : syntheticInnerClasses) {
+            v.visitInnerClass(syntheticInnerClass.getInternalName(), null, null, syntheticInnerClass.getFlags());
+        }
     }
 
     protected void addParentsToInnerClassesIfNeeded(@NotNull Collection<ClassDescriptor> innerClasses) {
@@ -376,18 +386,12 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
     }
 
     protected void writeOuterClassAndEnclosingMethod() {
-        CodegenContext context = this.context.getParentContext();
-
-        while (context instanceof InlineLambdaContext) {
-            // If this is a lambda which will be inlined, skip its MethodContext and enclosing ClosureContext
-            //noinspection ConstantConditions
-            context = context.getParentContext().getParentContext();
-        }
+        CodegenContext<?> context = getNonInlineOuterContext(this.context.getParentContext());
         assert context != null : "Outermost context can't be null: " + this.context;
 
-        Type enclosingAsmType = computeOuterClass(context);
+        Type enclosingAsmType = computeOuterClass(typeMapper, state.getJvmDefaultMode(), element, context);
         if (enclosingAsmType != null) {
-            Method method = computeEnclosingMethod(context);
+            Method method = computeEnclosingMethod(typeMapper, context);
 
             v.visitOuterClass(
                     enclosingAsmType.getInternalName(),
@@ -397,15 +401,31 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
         }
     }
 
+    public static CodegenContext<?> getNonInlineOuterContext(CodegenContext<?> parentContext) {
+        CodegenContext<?> context = parentContext;
+        while (context instanceof InlineLambdaContext) {
+            // If this is a lambda which will be inlined, skip its MethodContext and enclosing ClosureContext
+            //noinspection ConstantConditions
+            context = context.getParentContext().getParentContext();
+        }
+        return context;
+    }
+
     @Nullable
-    private Type computeOuterClass(@NotNull CodegenContext<?> context) {
+    public static Type computeOuterClass(
+            @NotNull KotlinTypeMapper typeMapper,
+            @NotNull JvmDefaultMode jvmDefaultMode,
+            @NotNull KtPureElement element,
+            @NotNull CodegenContext<?> context
+    ) {
         CodegenContext<? extends ClassOrPackageFragmentDescriptor> outermost = context.getClassOrPackageParentContext();
         if (outermost instanceof ClassContext) {
             ClassDescriptor classDescriptor = ((ClassContext) outermost).getContextDescriptor();
             if (context instanceof MethodContext) {
                 FunctionDescriptor functionDescriptor = ((MethodContext) context).getFunctionDescriptor();
-                if (isInterface(functionDescriptor.getContainingDeclaration()) && !JvmAnnotationUtilKt
-                        .isCompiledToJvmDefault(functionDescriptor, state.getJvmDefaultMode())) {
+                if (isInterface(functionDescriptor.getContainingDeclaration()) &&
+                    !JvmAnnotationUtilKt.isCompiledToJvmDefault(functionDescriptor, jvmDefaultMode)
+                ) {
                     return typeMapper.mapDefaultImpls(classDescriptor);
                 }
             }
@@ -425,7 +445,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
     }
 
     @Nullable
-    private Method computeEnclosingMethod(@NotNull CodegenContext context) {
+    public static Method computeEnclosingMethod(@NotNull KotlinTypeMapper typeMapper, @NotNull CodegenContext context) {
         if (context instanceof MethodContext) {
             FunctionDescriptor functionDescriptor = ((MethodContext) context).getFunctionDescriptor();
             if ("<clinit>".equals(functionDescriptor.getName().asString())) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
index 449fb9a82d3..cc3c0046a4b 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
@@ -454,7 +454,7 @@ public class PropertyCodegen {
             }
 
             if (propertyDescriptor.getContainingDeclaration() instanceof ClassDescriptor && JvmAnnotationUtilKt.isJvmRecord((ClassDescriptor) propertyDescriptor.getContainingDeclaration())) {
-                builder.newRecordComponent(name, type.getDescriptor(), signature);
+                ClassBuilderRecordKt.addRecordComponent(builder, name, type.getDescriptor(), signature);
             }
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java.201 b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java.201
deleted file mode 100644
index 25b7285eb81..00000000000
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java.201
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Copyright 2000-2018 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.codegen;
-
-import com.intellij.psi.PsiElement;
-import kotlin.Pair;
-import kotlin.collections.CollectionsKt;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.codegen.context.CodegenContextUtil;
-import org.jetbrains.kotlin.codegen.context.FieldOwnerContext;
-import org.jetbrains.kotlin.codegen.context.MultifileClassFacadeContext;
-import org.jetbrains.kotlin.codegen.context.MultifileClassPartContext;
-import org.jetbrains.kotlin.codegen.state.GenerationState;
-import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
-import org.jetbrains.kotlin.config.LanguageFeature;
-import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.descriptors.annotations.Annotations;
-import org.jetbrains.kotlin.load.java.DescriptorsJvmAbiUtil;
-import org.jetbrains.kotlin.load.java.JvmAbi;
-import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.resolve.BindingContext;
-import org.jetbrains.kotlin.resolve.DescriptorFactory;
-import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
-import org.jetbrains.kotlin.resolve.InlineClassesUtilsKt;
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
-import org.jetbrains.kotlin.resolve.calls.util.UnderscoreUtilKt;
-import org.jetbrains.kotlin.resolve.constants.ConstantValue;
-import org.jetbrains.kotlin.resolve.jvm.annotations.JvmAnnotationUtilKt;
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
-import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodGenericSignature;
-import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature;
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor;
-import org.jetbrains.kotlin.types.ErrorUtils;
-import org.jetbrains.kotlin.types.KotlinType;
-import org.jetbrains.org.objectweb.asm.FieldVisitor;
-import org.jetbrains.org.objectweb.asm.MethodVisitor;
-import org.jetbrains.org.objectweb.asm.Opcodes;
-import org.jetbrains.org.objectweb.asm.Type;
-import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
-import org.jetbrains.org.objectweb.asm.commons.Method;
-
-import java.util.Collections;
-import java.util.List;
-
-import static org.jetbrains.kotlin.codegen.DescriptorAsmUtil.getDeprecatedAccessFlag;
-import static org.jetbrains.kotlin.codegen.DescriptorAsmUtil.getVisibilityForBackingField;
-import static org.jetbrains.kotlin.codegen.FunctionCodegen.processInterfaceMethod;
-import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConstOrHasJvmFieldAnnotation;
-import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface;
-import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
-import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*;
-import static org.jetbrains.kotlin.diagnostics.Errors.EXPECTED_FUNCTION_SOURCE_WITH_DEFAULT_ARGUMENTS_NOT_FOUND;
-import static org.jetbrains.kotlin.fileClasses.JvmFileClassUtilKt.isTopLevelInJvmMultifileClass;
-import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject;
-import static org.jetbrains.kotlin.resolve.DescriptorUtils.isInterface;
-import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.K_PROPERTY_TYPE;
-import static org.jetbrains.kotlin.resolve.jvm.annotations.JvmAnnotationUtilKt.hasJvmFieldAnnotation;
-import static org.jetbrains.kotlin.resolve.jvm.annotations.JvmAnnotationUtilKt.hasJvmSyntheticAnnotation;
-import static org.jetbrains.org.objectweb.asm.Opcodes.*;
-
-public class PropertyCodegen {
-    private final GenerationState state;
-    private final ClassBuilder v;
-    private final FunctionCodegen functionCodegen;
-    private final KotlinTypeMapper typeMapper;
-    private final BindingContext bindingContext;
-    private final FieldOwnerContext context;
-    private final MemberCodegen<?> memberCodegen;
-    private final OwnerKind kind;
-
-    public PropertyCodegen(
-            @NotNull FieldOwnerContext context,
-            @NotNull ClassBuilder v,
-            @NotNull FunctionCodegen functionCodegen,
-            @NotNull MemberCodegen<?> memberCodegen
-    ) {
-        this.state = functionCodegen.state;
-        this.v = v;
-        this.functionCodegen = functionCodegen;
-        this.typeMapper = state.getTypeMapper();
-        this.bindingContext = state.getBindingContext();
-        this.context = context;
-        this.memberCodegen = memberCodegen;
-        this.kind = context.getContextKind();
-    }
-
-    public void gen(@NotNull KtProperty property) {
-        VariableDescriptor variableDescriptor = bindingContext.get(BindingContext.VARIABLE, property);
-        if (!(variableDescriptor instanceof PropertyDescriptor)) {
-            throw ExceptionLogger.logDescriptorNotFound(
-                    "Property " + property.getName() + " should have a property descriptor: " + variableDescriptor, property
-            );
-        }
-
-        PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor;
-        gen(property, propertyDescriptor, property.getGetter(), property.getSetter());
-    }
-
-    public void genDestructuringDeclaration(@NotNull KtDestructuringDeclarationEntry entry) {
-        VariableDescriptor variableDescriptor = bindingContext.get(BindingContext.VARIABLE, entry);
-        if (!(variableDescriptor instanceof PropertyDescriptor)) {
-            throw ExceptionLogger.logDescriptorNotFound(
-                    "Destructuring declaration entry" + entry.getName() + " should have a property descriptor: " + variableDescriptor, entry
-            );
-        }
-
-        if (!UnderscoreUtilKt.isSingleUnderscore(entry)) {
-            genDestructuringDeclaration((PropertyDescriptor) variableDescriptor);
-        }
-    }
-
-    public void generateInPackageFacade(@NotNull DeserializedPropertyDescriptor deserializedProperty) {
-        assert context instanceof MultifileClassFacadeContext : "should be called only for generating facade: " + context;
-
-        genBackingFieldAndAnnotations(deserializedProperty);
-
-        if (!isConstOrHasJvmFieldAnnotation(deserializedProperty)) {
-            generateGetter(deserializedProperty, null);
-            generateSetter(deserializedProperty, null);
-        }
-    }
-
-    private void gen(
-            @NotNull KtProperty declaration,
-            @NotNull PropertyDescriptor descriptor,
-            @Nullable KtPropertyAccessor getter,
-            @Nullable KtPropertyAccessor setter
-    ) {
-        assert kind == OwnerKind.PACKAGE || kind == OwnerKind.IMPLEMENTATION ||
-               kind == OwnerKind.DEFAULT_IMPLS || kind == OwnerKind.ERASED_INLINE_CLASS
-                : "Generating property with a wrong kind (" + kind + "): " + descriptor;
-
-        genBackingFieldAndAnnotations(descriptor);
-
-        boolean isDefaultGetterAndSetter = isDefaultAccessor(getter) && isDefaultAccessor(setter);
-
-        if (isAccessorNeeded(descriptor, getter, isDefaultGetterAndSetter)) {
-            generateGetter(descriptor, getter);
-        }
-        if (isAccessorNeeded(descriptor, setter, isDefaultGetterAndSetter)) {
-            generateSetter(descriptor, setter);
-        }
-    }
-
-    private static boolean isDefaultAccessor(@Nullable KtPropertyAccessor accessor) {
-        return accessor == null || !accessor.hasBody();
-    }
-
-    private void genDestructuringDeclaration(@NotNull PropertyDescriptor descriptor) {
-        assert kind == OwnerKind.PACKAGE || kind == OwnerKind.IMPLEMENTATION || kind == OwnerKind.DEFAULT_IMPLS
-                : "Generating property with a wrong kind (" + kind + "): " + descriptor;
-
-        genBackingFieldAndAnnotations(descriptor);
-
-        generateGetter(descriptor, null);
-        generateSetter(descriptor, null);
-    }
-
-    private void genBackingFieldAndAnnotations(@NotNull PropertyDescriptor descriptor) {
-        // Fields and '$annotations' methods for non-private const properties are generated in the multi-file facade
-        boolean isBackingFieldOwner = descriptor.isConst() && !DescriptorVisibilities.isPrivate(descriptor.getVisibility())
-                                      ? !(context instanceof MultifileClassPartContext)
-                                      : CodegenContextUtil.isImplementationOwner(context, descriptor);
-
-        generateBackingField(descriptor, isBackingFieldOwner);
-        generateSyntheticMethodIfNeeded(descriptor, isBackingFieldOwner);
-    }
-
-    private boolean isAccessorNeeded(
-            @NotNull PropertyDescriptor descriptor,
-            @Nullable KtPropertyAccessor accessor,
-            boolean isDefaultGetterAndSetter
-    ) {
-        return isAccessorNeeded(descriptor, accessor, isDefaultGetterAndSetter, kind);
-    }
-
-    public static boolean isReferenceablePropertyWithGetter(@NotNull PropertyDescriptor descriptor) {
-        PsiElement psiElement = DescriptorToSourceUtils.descriptorToDeclaration(descriptor);
-        KtDeclaration ktDeclaration = psiElement instanceof KtDeclaration ? (KtDeclaration) psiElement : null;
-        if (ktDeclaration instanceof KtProperty) {
-            KtProperty ktProperty = (KtProperty) ktDeclaration;
-            boolean isDefaultGetterAndSetter =
-                    isDefaultAccessor(ktProperty.getGetter()) && isDefaultAccessor(ktProperty.getSetter());
-            return isAccessorNeeded(descriptor, ktProperty.getGetter(), isDefaultGetterAndSetter, OwnerKind.IMPLEMENTATION);
-        } else if (ktDeclaration instanceof KtParameter) {
-            return isAccessorNeeded(descriptor, null, true, OwnerKind.IMPLEMENTATION);
-        } else {
-            return isAccessorNeeded(descriptor, null, false, OwnerKind.IMPLEMENTATION);
-        }
-    }
-
-    /**
-     * Determines if it's necessary to generate an accessor to the property, i.e. if this property can be referenced via getter/setter
-     * for any reason
-     *
-     * @see JvmCodegenUtil#couldUseDirectAccessToProperty
-     */
-    private static boolean isAccessorNeeded(
-            @NotNull PropertyDescriptor descriptor,
-            @Nullable KtPropertyAccessor accessor,
-            boolean isDefaultGetterAndSetter,
-            OwnerKind kind
-    ) {
-        if (isConstOrHasJvmFieldAnnotation(descriptor)) return false;
-
-        boolean isDefaultAccessor = isDefaultAccessor(accessor);
-
-        // Don't generate accessors for interface properties with default accessors in DefaultImpls
-        if (kind == OwnerKind.DEFAULT_IMPLS && isDefaultAccessor) return false;
-
-        // Delegated or extension properties can only be referenced via accessors
-        if (descriptor.isDelegated() || descriptor.getExtensionReceiverParameter() != null) return true;
-
-        // Companion object properties should have accessors for non-private properties because these properties can be referenced
-        // via getter/setter. But these accessors getter/setter are not required for private properties that have a default getter
-        // and setter, in this case, the property can always be accessed through the accessor 'access<property name>$cp' and avoid some
-        // useless indirection by using others accessors.
-        if (isCompanionObject(descriptor.getContainingDeclaration())) {
-            if (DescriptorVisibilities.isPrivate(descriptor.getVisibility()) && isDefaultGetterAndSetter) {
-                return false;
-            }
-            return true;
-        }
-
-        // Non-const properties from multifile classes have accessors regardless of visibility
-        if (isTopLevelInJvmMultifileClass(descriptor)) return true;
-
-        // Private class properties have accessors only in cases when those accessors are non-trivial
-        if (DescriptorVisibilities.isPrivate(descriptor.getVisibility())) {
-            return !isDefaultAccessor;
-        }
-
-        // Non-private properties with private setter should not be generated for trivial properties
-        // as the class will use direct field access instead
-        //noinspection ConstantConditions
-        if (accessor != null && accessor.isSetter() && DescriptorVisibilities.isPrivate(descriptor.getSetter().getVisibility())) {
-            return !isDefaultAccessor;
-        }
-
-        // Non-public API (private and internal) primary vals of inline classes don't have getter
-        if (InlineClassesUtilsKt.isUnderlyingPropertyOfInlineClass(descriptor) && !descriptor.getVisibility().isPublicAPI()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private static boolean areAccessorsNeededForPrimaryConstructorProperty(
-            @NotNull PropertyDescriptor descriptor,
-            @NotNull OwnerKind kind
-    ) {
-        if (hasJvmFieldAnnotation(descriptor)) return false;
-        if (kind == OwnerKind.ERASED_INLINE_CLASS) return false;
-
-        DescriptorVisibility visibility = descriptor.getVisibility();
-        if (InlineClassesUtilsKt.isInlineClass(descriptor.getContainingDeclaration())) {
-            return visibility.isPublicAPI();
-        }
-        else {
-            return !DescriptorVisibilities.isPrivate(visibility);
-        }
-    }
-
-    public void generatePrimaryConstructorProperty(@NotNull PropertyDescriptor descriptor) {
-        genBackingFieldAndAnnotations(descriptor);
-
-        if (areAccessorsNeededForPrimaryConstructorProperty(descriptor, context.getContextKind())) {
-            generateGetter(descriptor, null);
-            generateSetter(descriptor, null);
-        }
-    }
-
-    public void generateConstructorPropertyAsMethodForAnnotationClass(
-            @NotNull KtParameter parameter,
-            @NotNull PropertyDescriptor descriptor,
-            @Nullable FunctionDescriptor expectedAnnotationConstructor
-    ) {
-        JvmMethodGenericSignature signature = typeMapper.mapAnnotationParameterSignature(descriptor);
-        Method asmMethod = signature.getAsmMethod();
-        MethodVisitor mv = v.newMethod(
-                JvmDeclarationOriginKt.OtherOrigin(parameter, descriptor),
-                ACC_PUBLIC | ACC_ABSTRACT,
-                asmMethod.getName(),
-                asmMethod.getDescriptor(),
-                signature.getGenericsSignature(),
-                null
-        );
-
-        PropertyGetterDescriptor getter = descriptor.getGetter();
-        assert getter != null : "Annotation property should have a getter: " + descriptor;
-        v.getSerializationBindings().put(METHOD_FOR_FUNCTION, getter, asmMethod);
-        AnnotationCodegen.forMethod(mv, memberCodegen, state).genAnnotations(getter, asmMethod.getReturnType(), null);
-
-        KtExpression defaultValue = loadAnnotationArgumentDefaultValue(parameter, descriptor, expectedAnnotationConstructor);
-        if (defaultValue != null) {
-            ConstantValue<?> constant = ExpressionCodegen.getCompileTimeConstant(
-                    defaultValue, bindingContext, true, state.getShouldInlineConstVals());
-            assert !state.getClassBuilderMode().generateBodies || constant != null
-                    : "Default value for annotation parameter should be compile time value: " + defaultValue.getText();
-            if (constant != null) {
-                AnnotationCodegen annotationCodegen = AnnotationCodegen.forAnnotationDefaultValue(mv, memberCodegen, state);
-                annotationCodegen.generateAnnotationDefaultValue(constant, descriptor.getType());
-            }
-        }
-
-        mv.visitEnd();
-    }
-
-    private KtExpression loadAnnotationArgumentDefaultValue(
-            @NotNull KtParameter ktParameter,
-            @NotNull PropertyDescriptor descriptor,
-            @Nullable FunctionDescriptor expectedAnnotationConstructor
-    ) {
-        KtExpression value = ktParameter.getDefaultValue();
-        if (value != null) return value;
-
-        if (expectedAnnotationConstructor != null) {
-            ValueParameterDescriptor expectedParameter = CollectionsKt.single(
-                    expectedAnnotationConstructor.getValueParameters(), parameter -> parameter.getName().equals(descriptor.getName())
-            );
-            PsiElement element = DescriptorToSourceUtils.descriptorToDeclaration(expectedParameter);
-            if (!(element instanceof KtParameter)) {
-                state.getDiagnostics().report(EXPECTED_FUNCTION_SOURCE_WITH_DEFAULT_ARGUMENTS_NOT_FOUND.on(ktParameter));
-                return null;
-            }
-            return ((KtParameter) element).getDefaultValue();
-        }
-
-        return null;
-    }
-
-    private void generateBackingField(@NotNull PropertyDescriptor descriptor, boolean isBackingFieldOwner) {
-        if (isJvmInterface(descriptor.getContainingDeclaration()) || kind == OwnerKind.DEFAULT_IMPLS ||
-            kind == OwnerKind.ERASED_INLINE_CLASS) {
-            return;
-        }
-
-        Object defaultValue;
-        if (descriptor.isDelegated()) {
-            defaultValue = null;
-        }
-        else if (Boolean.TRUE.equals(bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, descriptor))) {
-            if (shouldWriteFieldInitializer(descriptor)) {
-                ConstantValue<?> initializer = descriptor.getCompileTimeInitializer();
-                defaultValue = initializer == null ? null : initializer.getValue();
-            }
-            else {
-                defaultValue = null;
-            }
-        }
-        else {
-            return;
-        }
-
-        generateBackingField(descriptor, descriptor.isDelegated(), defaultValue, isBackingFieldOwner);
-    }
-
-    // Annotations on properties are stored in bytecode on an empty synthetic method. This way they're still
-    // accessible via reflection, and 'deprecated' and 'synthetic' flags prevent this method from being called accidentally
-    private void generateSyntheticMethodIfNeeded(@NotNull PropertyDescriptor descriptor, boolean isBackingFieldOwner) {
-        Annotations annotations = descriptor.getAnnotations();
-        if (annotations.isEmpty()) return;
-
-        Method signature = typeMapper.mapSyntheticMethodForPropertyAnnotations(descriptor);
-        if (kind != OwnerKind.DEFAULT_IMPLS && CodegenContextUtil.isImplementationOwner(context, descriptor)) {
-            v.getSerializationBindings().put(SYNTHETIC_METHOD_FOR_PROPERTY, descriptor, signature);
-        }
-
-        if (isBackingFieldOwner) {
-            if (!isInterface(context.getContextDescriptor()) ||
-                processInterfaceMethod(descriptor, kind, false, true, state.getJvmDefaultMode())) {
-                memberCodegen.generateSyntheticAnnotationsMethod(descriptor, signature, annotations);
-            }
-        }
-    }
-
-    private void generateBackingField(
-            @NotNull PropertyDescriptor propertyDescriptor,
-            boolean isDelegate,
-            @Nullable Object defaultValue,
-            boolean isBackingFieldOwner
-    ) {
-        FieldDescriptor annotatedField = isDelegate ? propertyDescriptor.getDelegateField() : propertyDescriptor.getBackingField();
-
-        int modifiers = getDeprecatedAccessFlag(propertyDescriptor);
-
-        for (AnnotationCodegen.JvmFlagAnnotation flagAnnotation : AnnotationCodegen.FIELD_FLAGS) {
-            modifiers |= flagAnnotation.getJvmFlag(annotatedField);
-        }
-
-        if (kind == OwnerKind.PACKAGE) {
-            modifiers |= ACC_STATIC;
-        }
-
-        if (!propertyDescriptor.isLateInit() && (!propertyDescriptor.isVar() || isDelegate)) {
-            modifiers |= ACC_FINAL;
-        }
-
-        if (hasJvmSyntheticAnnotation(propertyDescriptor)) {
-            modifiers |= ACC_SYNTHETIC;
-        }
-
-        KotlinType kotlinType = isDelegate ? getDelegateTypeForProperty(propertyDescriptor, bindingContext) : propertyDescriptor.getType();
-        Type type = typeMapper.mapType(kotlinType);
-
-        ClassBuilder builder = v;
-
-        FieldOwnerContext backingFieldContext = context;
-        List<String> additionalVisibleAnnotations = Collections.emptyList();
-        if (DescriptorAsmUtil.isInstancePropertyWithStaticBackingField(propertyDescriptor) ) {
-            modifiers |= ACC_STATIC;
-
-            if (DescriptorsJvmAbiUtil.isPropertyWithBackingFieldInOuterClass(propertyDescriptor)) {
-                ImplementationBodyCodegen codegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen();
-                builder = codegen.v;
-                backingFieldContext = codegen.context;
-                if (DescriptorVisibilities.isPrivate(((ClassDescriptor) propertyDescriptor.getContainingDeclaration()).getVisibility())) {
-                    modifiers |= ACC_DEPRECATED;
-                    additionalVisibleAnnotations = Collections.singletonList(CodegenUtilKt.JAVA_LANG_DEPRECATED);
-                }
-            }
-        }
-        modifiers |= getVisibilityForBackingField(propertyDescriptor, isDelegate);
-
-        if (DescriptorAsmUtil.isPropertyWithBackingFieldCopyInOuterClass(propertyDescriptor)) {
-            ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen();
-            parentBodyCodegen.addCompanionObjectPropertyToCopy(propertyDescriptor, defaultValue);
-        }
-
-        String name = backingFieldContext.getFieldName(propertyDescriptor, isDelegate);
-
-        v.getSerializationBindings().put(FIELD_FOR_PROPERTY, propertyDescriptor, new Pair<>(type, name));
-
-        if (isBackingFieldOwner) {
-            String signature = isDelegate ? null : typeMapper.mapFieldSignature(kotlinType, propertyDescriptor);
-            FieldVisitor fv = builder.newField(
-                    JvmDeclarationOriginKt.OtherOrigin(propertyDescriptor), modifiers, name, type.getDescriptor(),
-                    signature, defaultValue
-            );
-
-            if (annotatedField != null) {
-                // Don't emit nullability annotations for backing field if:
-                // - backing field is synthetic;
-                // - property is lateinit (since corresponding field is actually nullable).
-                boolean skipNullabilityAnnotations =
-                        (modifiers & ACC_SYNTHETIC) != 0 ||
-                        propertyDescriptor.isLateInit();
-                AnnotationCodegen.forField(fv, memberCodegen, state, skipNullabilityAnnotations)
-                        .genAnnotations(annotatedField, type, propertyDescriptor.getType(), null, additionalVisibleAnnotations);
-            }
-
-            if (propertyDescriptor.getContainingDeclaration() instanceof ClassDescriptor && JvmAnnotationUtilKt.isJvmRecord((ClassDescriptor) propertyDescriptor.getContainingDeclaration())) {
-                // builder.newRecordComponent(name, type.getDescriptor(), signature);
-            }
-        }
-    }
-
-    @NotNull
-    public static KotlinType getDelegateTypeForProperty(
-            @NotNull PropertyDescriptor propertyDescriptor,
-            @NotNull BindingContext bindingContext
-    ) {
-        ResolvedCall<FunctionDescriptor> provideDelegateResolvedCall =
-                bindingContext.get(BindingContext.PROVIDE_DELEGATE_RESOLVED_CALL, propertyDescriptor);
-
-        KtProperty property = (KtProperty) DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor);
-        KtExpression delegateExpression = property != null ? property.getDelegateExpression() : null;
-
-        KotlinType delegateType;
-        if (provideDelegateResolvedCall != null) {
-            delegateType = provideDelegateResolvedCall.getResultingDescriptor().getReturnType();
-        }
-        else if (delegateExpression != null) {
-            delegateType = bindingContext.getType(delegateExpression);
-        }
-        else {
-            delegateType = null;
-        }
-
-        if (delegateType == null) {
-            // Delegation convention is unresolved
-            delegateType = ErrorUtils.createErrorType("Delegate type");
-        }
-        return delegateType;
-    }
-
-    private boolean shouldWriteFieldInitializer(@NotNull PropertyDescriptor descriptor) {
-        if (!descriptor.isConst() &&
-            state.getLanguageVersionSettings().supportsFeature(LanguageFeature.NoConstantValueAttributeForNonConstVals)) {
-            return false;
-        }
-
-        //final field of primitive or String type
-        if (!descriptor.isVar()) {
-            Type type = typeMapper.mapType(descriptor);
-            return AsmUtil.isPrimitive(type) || "java.lang.String".equals(type.getClassName());
-        }
-        return false;
-    }
-
-    private void generateGetter(@NotNull PropertyDescriptor descriptor, @Nullable KtPropertyAccessor getter) {
-        generateAccessor(
-                getter,
-                descriptor.getGetter() != null ? descriptor.getGetter() : DescriptorFactory.createDefaultGetter(
-                        descriptor, Annotations.Companion.getEMPTY()
-                )
-        );
-    }
-
-    private void generateSetter(@NotNull PropertyDescriptor descriptor, @Nullable KtPropertyAccessor setter) {
-        if (!descriptor.isVar()) return;
-
-        generateAccessor(
-                setter,
-                descriptor.getSetter() != null ? descriptor.getSetter() : DescriptorFactory.createDefaultSetter(
-                        descriptor, Annotations.Companion.getEMPTY(), Annotations.Companion.getEMPTY()
-                )
-        );
-    }
-
-    private void generateAccessor(@Nullable KtPropertyAccessor accessor, @NotNull PropertyAccessorDescriptor descriptor) {
-        if (context instanceof MultifileClassFacadeContext &&
-            (DescriptorVisibilities.isPrivate(descriptor.getVisibility()) ||
-             DescriptorAsmUtil.getVisibilityAccessFlag(descriptor) == Opcodes.ACC_PRIVATE)) {
-            return;
-        }
-
-        FunctionGenerationStrategy strategy;
-        if (accessor == null || !accessor.hasBody()) {
-            if (descriptor.getCorrespondingProperty().isDelegated()) {
-                strategy = new DelegatedPropertyAccessorStrategy(state, descriptor);
-            }
-            else {
-                strategy = new DefaultPropertyAccessorStrategy(state, descriptor);
-            }
-        }
-        else {
-            strategy = new FunctionGenerationStrategy.FunctionDefault(state, accessor);
-        }
-
-        functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(descriptor), descriptor, strategy);
-    }
-
-    private static class DefaultPropertyAccessorStrategy extends FunctionGenerationStrategy.CodegenBased {
-        private final PropertyAccessorDescriptor propertyAccessorDescriptor;
-
-        public DefaultPropertyAccessorStrategy(@NotNull GenerationState state, @NotNull PropertyAccessorDescriptor descriptor) {
-            super(state);
-            propertyAccessorDescriptor = descriptor;
-        }
-
-        @Override
-        public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
-            InstructionAdapter v = codegen.v;
-            PropertyDescriptor propertyDescriptor = propertyAccessorDescriptor.getCorrespondingProperty();
-            StackValue property = codegen.intermediateValueForProperty(propertyDescriptor, true, null, StackValue.LOCAL_0);
-
-            PsiElement jetProperty = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor);
-            if (jetProperty instanceof KtProperty || jetProperty instanceof KtParameter) {
-                codegen.markLineNumber((KtElement) jetProperty, false);
-            }
-
-            if (propertyAccessorDescriptor instanceof PropertyGetterDescriptor) {
-                Type type = signature.getReturnType();
-                property.put(type, v);
-                v.areturn(type);
-            }
-            else if (propertyAccessorDescriptor instanceof PropertySetterDescriptor) {
-                List<ValueParameterDescriptor> valueParameters = propertyAccessorDescriptor.getValueParameters();
-                assert valueParameters.size() == 1 : "Property setter should have only one value parameter but has " + propertyAccessorDescriptor;
-                int parameterIndex = codegen.lookupLocalIndex(valueParameters.get(0));
-                assert parameterIndex >= 0 : "Local index for setter parameter should be positive or zero: " + propertyAccessorDescriptor;
-                Type type = codegen.typeMapper.mapType(propertyDescriptor);
-                property.store(StackValue.local(parameterIndex, type), codegen.v);
-                v.visitInsn(RETURN);
-            }
-            else {
-                throw new IllegalStateException("Unknown property accessor: " + propertyAccessorDescriptor);
-            }
-        }
-    }
-
-    public static StackValue invokeDelegatedPropertyConventionMethod(
-            @NotNull ExpressionCodegen codegen,
-            @NotNull ResolvedCall<FunctionDescriptor> resolvedCall,
-            @NotNull StackValue receiver,
-            @NotNull PropertyDescriptor propertyDescriptor
-    ) {
-        codegen.tempVariables.put(
-                resolvedCall.getCall().getValueArguments().get(1).asElement(),
-                getDelegatedPropertyMetadata(propertyDescriptor, codegen.getBindingContext())
-        );
-
-        return codegen.invokeFunction(resolvedCall, receiver);
-    }
-
-    public static boolean isDelegatedPropertyWithOptimizedMetadata(
-            @NotNull VariableDescriptorWithAccessors descriptor,
-            @NotNull BindingContext bindingContext
-    ) {
-        return Boolean.TRUE == bindingContext.get(DELEGATED_PROPERTY_WITH_OPTIMIZED_METADATA, descriptor);
-    }
-
-    public static @NotNull StackValue getOptimizedDelegatedPropertyMetadataValue() {
-        return StackValue.constant(null, K_PROPERTY_TYPE);
-    }
-
-    @NotNull
-    public static StackValue getDelegatedPropertyMetadata(
-            @NotNull VariableDescriptorWithAccessors descriptor,
-            @NotNull BindingContext bindingContext
-    ) {
-        if (isDelegatedPropertyWithOptimizedMetadata(descriptor, bindingContext)) {
-            return getOptimizedDelegatedPropertyMetadataValue();
-        }
-
-        Type owner = bindingContext.get(DELEGATED_PROPERTY_METADATA_OWNER, descriptor);
-        assert owner != null : "Delegated property owner not found: " + descriptor;
-
-        List<VariableDescriptorWithAccessors> allDelegatedProperties = bindingContext.get(DELEGATED_PROPERTIES_WITH_METADATA, owner);
-        int index = allDelegatedProperties == null ? -1 : allDelegatedProperties.indexOf(descriptor);
-        if (index < 0) {
-            throw new AssertionError("Delegated property not found in " + owner + ": " + descriptor);
-        }
-
-        StackValue.Field array = StackValue.field(
-                Type.getType("[" + K_PROPERTY_TYPE), owner, JvmAbi.DELEGATED_PROPERTIES_ARRAY_NAME, true, StackValue.none()
-        );
-        return StackValue.arrayElement(K_PROPERTY_TYPE, null, array, StackValue.constant(index));
-    }
-
-    private static class DelegatedPropertyAccessorStrategy extends FunctionGenerationStrategy.CodegenBased {
-        private final PropertyAccessorDescriptor propertyAccessorDescriptor;
-
-        public DelegatedPropertyAccessorStrategy(@NotNull GenerationState state, @NotNull PropertyAccessorDescriptor descriptor) {
-            super(state);
-            this.propertyAccessorDescriptor = descriptor;
-        }
-
-        @Override
-        public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) {
-            InstructionAdapter v = codegen.v;
-
-            BindingContext bindingContext = state.getBindingContext();
-            ResolvedCall<FunctionDescriptor> resolvedCall =
-                    bindingContext.get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, propertyAccessorDescriptor);
-            assert resolvedCall != null : "Resolve call should be recorded for delegate call " + signature.toString();
-
-            PropertyDescriptor propertyDescriptor = propertyAccessorDescriptor.getCorrespondingProperty();
-            StackValue.Property property = codegen.intermediateValueForProperty(propertyDescriptor, true, null, StackValue.LOCAL_0);
-            StackValue.Property delegate = property.getDelegateOrNull();
-            assert delegate != null : "No delegate for delegated property: " + propertyDescriptor;
-            StackValue lastValue = invokeDelegatedPropertyConventionMethod(codegen, resolvedCall, delegate, propertyDescriptor);
-            Type asmType = signature.getReturnType();
-            KotlinType kotlinReturnType = propertyAccessorDescriptor.getOriginal().getReturnType();
-            lastValue.put(asmType, kotlinReturnType, v);
-            v.areturn(asmType);
-        }
-    }
-
-    public void genDelegate(@NotNull PropertyDescriptor delegate, @NotNull PropertyDescriptor delegateTo, @NotNull StackValue field) {
-        ClassDescriptor toClass = (ClassDescriptor) delegateTo.getContainingDeclaration();
-
-        PropertyGetterDescriptor getter = delegate.getGetter();
-        if (getter != null) {
-            //noinspection ConstantConditions
-            functionCodegen.genDelegate(getter, delegateTo.getGetter().getOriginal(), toClass, field);
-        }
-
-        PropertySetterDescriptor setter = delegate.getSetter();
-        if (setter != null) {
-            //noinspection ConstantConditions
-            functionCodegen.genDelegate(setter, delegateTo.getSetter().getOriginal(), toClass, field);
-        }
-    }
-}
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
index 5a62089be3f..9c204d64ffb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
@@ -20,6 +20,8 @@ import kotlin.text.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.backend.common.CodegenUtil;
 import org.jetbrains.kotlin.codegen.context.ClassContext;
+import org.jetbrains.kotlin.codegen.context.CodegenContext;
+import org.jetbrains.kotlin.codegen.context.FieldOwnerContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper;
 import org.jetbrains.kotlin.descriptors.*;
@@ -62,6 +64,7 @@ public class SamWrapperCodegen {
     private final SamType samType;
     private final MemberCodegen<?> parentCodegen;
     private final int visibility;
+    private final int classFlags;
     public static final String SAM_WRAPPER_SUFFIX = "$0";
 
     public SamWrapperCodegen(
@@ -76,6 +79,7 @@ public class SamWrapperCodegen {
         this.samType = samType;
         this.parentCodegen = parentCodegen;
         visibility = isInsideInline ? ACC_PUBLIC : NO_FLAG_PACKAGE_PRIVATE;
+        classFlags = visibility | ACC_FINAL | ACC_SUPER;
     }
 
     @NotNull
@@ -121,7 +125,7 @@ public class SamWrapperCodegen {
         cv.defineClass(
                 file,
                 state.getClassFileVersion(),
-                ACC_FINAL | ACC_SUPER | visibility,
+                classFlags,
                 asmType.getInternalName(),
                 null,
                 OBJECT_TYPE.getInternalName(),
@@ -131,6 +135,8 @@ public class SamWrapperCodegen {
 
         WriteAnnotationUtilKt.writeSyntheticClassMetadata(cv, state);
 
+        generateInnerClassInformation(file, asmType, cv);
+
         // e.g. ASM type for Function2
         Type functionAsmType = typeMapper.mapType(functionType);
 
@@ -160,6 +166,24 @@ public class SamWrapperCodegen {
         return asmType;
     }
 
+    private void generateInnerClassInformation(@NotNull KtFile file, Type asmType, ClassBuilder cv) {
+        parentCodegen.addSyntheticAnonymousInnerClass(new SyntheticInnerClassInfo(asmType.getInternalName(), classFlags));
+        FieldOwnerContext<?> parentContext = parentCodegen.context;
+        CodegenContext<?> outerContext = MemberCodegen.getNonInlineOuterContext(parentContext);
+        assert outerContext != null :
+                "Outer context for SAM wrapper " + asmType.getInternalName() + " is null, parentContext:" + parentContext;
+        Type outerClassType = MemberCodegen.computeOuterClass(state.getTypeMapper(), state.getJvmDefaultMode(), file, outerContext);
+        assert outerClassType != null :
+                "Outer class for SAM wrapper " + asmType.getInternalName() + " is null, parentContext:" + parentContext;
+        Method enclosingMethod = MemberCodegen.computeEnclosingMethod(state.getTypeMapper(), outerContext);
+        cv.visitOuterClass(
+                outerClassType.getInternalName(),
+                enclosingMethod == null ? null : enclosingMethod.getName(),
+                enclosingMethod == null ? null : enclosingMethod.getDescriptor()
+        );
+        cv.visitInnerClass(asmType.getInternalName(), null, null, classFlags);
+    }
+
     private void generateConstructor(Type ownerType, Type functionType, ClassBuilder cv) {
         MethodVisitor mv = cv.newMethod(JvmDeclarationOriginKt.OtherOrigin(samType.getClassDescriptor()),
                                         visibility, "<init>", Type.getMethodDescriptor(Type.VOID_TYPE, functionType), null, null);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SyntheticInnerClassInfo.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/SyntheticInnerClassInfo.kt
new file mode 100644
index 00000000000..c17cb165052
--- /dev/null
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SyntheticInnerClassInfo.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2020 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.codegen
+
+data class SyntheticInnerClassInfo(val internalName: String, val flags: Int)
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
index 2099d5c044f..eaa421dd181 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt
@@ -1113,7 +1113,7 @@ inline fun withInstructionAdapter(block: InstructionAdapter.() -> Unit): InsnLis
     return tmpMethodNode.instructions
 }
 
-internal fun Type.normalize() =
+fun Type.normalize() =
     when (sort) {
         Type.ARRAY, Type.OBJECT -> AsmTypes.OBJECT_TYPE
         else -> this
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt
index c578ef0058d..7c45a0bfbff 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicArrayConstructors
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.incremental.components.Position
 import org.jetbrains.kotlin.incremental.components.ScopeKind
@@ -522,10 +523,15 @@ abstract class InlineCodegen<out T : BaseExpressionCodegen>(
             return SMAPAndMethodNode(intrinsic, createDefaultFakeSMAP())
         }
 
-        val asmMethod = if (callDefault)
-            state.typeMapper.mapDefaultMethod(functionDescriptor, sourceCompiler.contextKind)
-        else
-            mangleSuspendInlineFunctionAsmMethodIfNeeded(functionDescriptor, jvmSignature.asmMethod)
+        var asmMethod = mapMethod(callDefault)
+        if (asmMethod.name.contains("-") &&
+            !state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_INLINE_CLASSES_MANGLING_SCHEME) &&
+            classFileContainsMethod(functionDescriptor, state, asmMethod) == false
+        ) {
+            state.typeMapper.useOldManglingRulesForFunctionAcceptingInlineClass = true
+            asmMethod = mapMethod(callDefault)
+            state.typeMapper.useOldManglingRulesForFunctionAcceptingInlineClass = false
+        }
 
         val directMember = getDirectMemberAndCallableFromObject(functionDescriptor)
         if (!isBuiltInArrayIntrinsic(functionDescriptor) && !descriptorIsDeserialized(directMember)) {
@@ -537,6 +543,10 @@ abstract class InlineCodegen<out T : BaseExpressionCodegen>(
         return getCompiledMethodNodeInner(functionDescriptor, directMember, asmMethod, methodOwner, state, jvmSignature)
     }
 
+    private fun mapMethod(callDefault: Boolean): Method =
+        if (callDefault) state.typeMapper.mapDefaultMethod(functionDescriptor, sourceCompiler.contextKind)
+        else mangleSuspendInlineFunctionAsmMethodIfNeeded(functionDescriptor, jvmSignature.asmMethod)
+
     companion object {
 
         internal fun createSpecialInlineMethodNodeFromBinaries(functionDescriptor: FunctionDescriptor, state: GenerationState): MethodNode {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
index 1923db861c7..844cfe00604 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
@@ -298,7 +298,7 @@ class GenerationState private constructor(
             ?: if (languageVersionSettings.languageVersion >= LanguageVersion.LATEST_STABLE) JvmMetadataVersion.INSTANCE
             else JvmMetadataVersion(1, 1, 18)
 
-    val isIrWithStableAbi = configuration.getBoolean(JVMConfigurationKeys.IS_IR_WITH_STABLE_ABI)
+    val abiStability = configuration.get(JVMConfigurationKeys.ABI_STABILITY)
 
     val globalSerializationBindings = JvmSerializationBindings()
     var mapInlineClass: (ClassDescriptor) -> Type = { descriptor -> typeMapper.mapType(descriptor.defaultType) }
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index e01d48d01cf..4afd3561e5e 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -46,7 +46,7 @@ dependencies {
     testCompile(projectTests(":compiler:fir:raw-fir:psi2fir"))
     testCompile(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
     testCompile(projectTests(":compiler:fir:fir2ir"))
-    testCompile(projectTests(":compiler:fir:analysis-tests"))
+    testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testCompile(projectTests(":compiler:visualizer"))
     testCompile(projectTests(":generators:test-generator"))
     testCompile(project(":compiler:ir.ir2cfg"))
@@ -99,8 +99,5 @@ projectTest(parallel = true) {
 }
 
 val generateTestData by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestDataKt")
-val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt") {
-    dependsOn(generateTestData)
-}
 
 testsJar()
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
index 2137b548ada..25ff966572d 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
@@ -95,18 +95,20 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     var irCheckLocalNames: Boolean by FreezableVar(false)
 
     @Argument(
-        value = "-Xallow-jvm-ir-dependencies",
-        description = "When not using the IR backend, do not report errors on those classes in dependencies, " +
-                "which were compiled by the IR backend"
+        value = "-Xallow-unstable-dependencies",
+        description = "Do not report errors on classes in dependencies, which were compiled by an unstable version of the Kotlin compiler"
     )
-    var allowJvmIrDependencies: Boolean by FreezableVar(false)
+    var allowUnstableDependencies: Boolean by FreezableVar(false)
 
     @Argument(
-        value = "-Xir-binary-with-stable-abi",
-        description = "When using the IR backend, produce binaries which can be read by non-IR backend.\n" +
-                "The author is responsible for verifying that the resulting binaries do indeed have the correct ABI"
+        value = "-Xabi-stability",
+        valueDescription = "{stable|unstable}",
+        description = "When using unstable compiler features such as FIR, use 'stable' to mark generated class files as stable\n" +
+                "to prevent diagnostics from stable compilers at the call site.\n" +
+                "When using the JVM IR backend, conversely, use 'unstable' to mark generated class files as unstable\n" +
+                "to force diagnostics to be reported."
     )
-    var isIrWithStableAbi: Boolean by FreezableVar(false)
+    var abiStability: String? by FreezableVar(null)
 
     @Argument(
         value = "-Xir-do-not-clear-binding-context",
@@ -446,7 +448,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
         result[JvmAnalysisFlags.suppressMissingBuiltinsError] = suppressMissingBuiltinsError
         result[JvmAnalysisFlags.irCheckLocalNames] = irCheckLocalNames
         result[JvmAnalysisFlags.enableJvmPreview] = enableJvmPreview
-        result[AnalysisFlags.reportErrorsOnIrDependencies] = !useIR && !useFir && !allowJvmIrDependencies
+        result[AnalysisFlags.allowUnstableDependencies] = allowUnstableDependencies || useFir
         result[JvmAnalysisFlags.disableUltraLightClasses] = disableUltraLightClasses
         return result
     }
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.kt
index 0c749ba5708..d5e0db6b644 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.kt
@@ -182,11 +182,19 @@ class AnalyzerWithCompilerReport(
                 )
             }
 
-            if (diagnostics.any { it.factory == Errors.IR_COMPILED_CLASS }) {
+            if (diagnostics.any { it.factory == Errors.IR_WITH_UNSTABLE_ABI_COMPILED_CLASS }) {
                 messageCollector.report(
                     ERROR,
-                    "Classes compiled by a new Kotlin compiler backend were found in dependencies. " +
-                            "Remove them from the classpath or use '-Xallow-jvm-ir-dependencies' to suppress errors"
+                    "Classes compiled by an unstable version of the Kotlin compiler were found in dependencies. " +
+                            "Remove them from the classpath or use '-Xallow-unstable-dependencies' to suppress errors"
+                )
+            }
+
+            if (diagnostics.any { it.factory == Errors.FIR_COMPILED_CLASS }) {
+                messageCollector.report(
+                    ERROR,
+                    "Classes compiled by the new Kotlin compiler frontend were found in dependencies. " +
+                            "Remove them from the classpath or use '-Xallow-unstable-dependencies' to suppress errors"
                 )
             }
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt
new file mode 100644
index 00000000000..b14569fb5fc
--- /dev/null
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2020 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.cli.jvm.compiler
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.LanguageLevelProjectExtension
+import com.intellij.pom.java.LanguageLevel
+
+fun Project.setupHighestLanguageLevel() {
+    LanguageLevelProjectExtension.getInstance(this).languageLevel = LanguageLevel.JDK_15_PREVIEW
+}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt.201 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt.201
new file mode 100644
index 00000000000..423b6b10229
--- /dev/null
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt.201
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2020 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.cli.jvm.compiler
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.LanguageLevelProjectExtension
+import com.intellij.pom.java.LanguageLevel
+
+fun Project.setupHighestLanguageLevel() {
+    // LanguageLevelProjectExtension.getInstance(this).languageLevel = LanguageLevel.JDK_15_PREVIEW
+}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 47c6ee66a30..dc9270e9345 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -253,7 +253,7 @@ class KotlinCoreEnvironment private constructor(
             updateClasspath(roots.map { JavaSourceRoot(it, null) })
         })
 
-        LanguageLevelProjectExtension.getInstance(project).languageLevel = LanguageLevel.JDK_15_PREVIEW
+        project.setupHighestLanguageLevel()
     }
 
     private fun collectAdditionalSources(project: MockProject) {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.201 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.201
deleted file mode 100644
index 6120985d6ce..00000000000
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt.201
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.cli.jvm.compiler
-
-import com.intellij.codeInsight.ExternalAnnotationsManager
-import com.intellij.codeInsight.InferredAnnotationsManager
-import com.intellij.core.CoreApplicationEnvironment
-import com.intellij.core.CoreJavaFileManager
-import com.intellij.core.JavaCoreProjectEnvironment
-import com.intellij.ide.highlighter.JavaFileType
-import com.intellij.lang.java.JavaParserDefinition
-import com.intellij.mock.MockProject
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.TransactionGuard
-import com.intellij.openapi.application.TransactionGuardImpl
-import com.intellij.openapi.components.ServiceManager
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.extensions.Extensions
-import com.intellij.openapi.extensions.ExtensionsArea
-import com.intellij.openapi.fileTypes.PlainTextFileType
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.roots.LanguageLevelProjectExtension
-import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.util.io.FileUtilRt
-import com.intellij.openapi.util.text.StringUtil
-import com.intellij.openapi.vfs.*
-import com.intellij.openapi.vfs.impl.ZipHandler
-import com.intellij.pom.java.LanguageLevel
-import com.intellij.psi.PsiElementFinder
-import com.intellij.psi.PsiManager
-import com.intellij.psi.compiled.ClassFileDecompilers
-import com.intellij.psi.impl.JavaClassSupersImpl
-import com.intellij.psi.impl.PsiElementFinderImpl
-import com.intellij.psi.impl.PsiTreeChangePreprocessor
-import com.intellij.psi.impl.file.impl.JavaFileManager
-import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.util.JavaClassSupers
-import com.intellij.util.io.URLUtil
-import com.intellij.util.lang.UrlClassLoader
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
-import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
-import org.jetbrains.kotlin.asJava.classes.FacadeCache
-import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
-import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
-import org.jetbrains.kotlin.cli.common.CliModuleVisibilityManagerImpl
-import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY
-import org.jetbrains.kotlin.cli.common.config.ContentRoot
-import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot
-import org.jetbrains.kotlin.cli.common.config.kotlinSourceRoots
-import org.jetbrains.kotlin.cli.common.extensions.ScriptEvaluationExtension
-import org.jetbrains.kotlin.cli.common.extensions.ShellExtension
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.STRONG_WARNING
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.cli.common.toBooleanLenient
-import org.jetbrains.kotlin.cli.jvm.JvmRuntimeVersionsConsistencyChecker
-import org.jetbrains.kotlin.cli.jvm.config.*
-import org.jetbrains.kotlin.cli.jvm.index.*
-import org.jetbrains.kotlin.cli.jvm.javac.JavacWrapperRegistrar
-import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleFinder
-import org.jetbrains.kotlin.cli.jvm.modules.CliJavaModuleResolver
-import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem
-import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
-import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
-import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.extensions.*
-import org.jetbrains.kotlin.extensions.internal.CandidateInterceptor
-import org.jetbrains.kotlin.extensions.internal.TypeResolutionInterceptor
-import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension
-import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache
-import org.jetbrains.kotlin.load.kotlin.MetadataFinderFactory
-import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager
-import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
-import org.jetbrains.kotlin.parsing.KotlinParserDefinition
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer
-import org.jetbrains.kotlin.resolve.ModuleAnnotationsResolver
-import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension
-import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
-import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
-import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
-import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
-import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleResolver
-import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService
-import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
-import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin
-import org.jetbrains.kotlin.utils.PathUtil
-import java.io.File
-import java.nio.file.FileSystems
-import java.util.zip.ZipFile
-
-class KotlinCoreEnvironment private constructor(
-    val projectEnvironment: JavaCoreProjectEnvironment,
-    private val initialConfiguration: CompilerConfiguration,
-    configFiles: EnvironmentConfigFiles
-) {
-
-    class ProjectEnvironment(
-        disposable: Disposable,
-        applicationEnvironment: KotlinCoreApplicationEnvironment
-    ) :
-        KotlinCoreProjectEnvironment(disposable, applicationEnvironment) {
-
-        private var extensionRegistered = false
-
-        override fun preregisterServices() {
-            registerProjectExtensionPoints(project.extensionArea)
-        }
-
-        fun registerExtensionsFromPlugins(configuration: CompilerConfiguration) {
-            if (!extensionRegistered) {
-                registerPluginExtensionPoints(project)
-                registerExtensionsFromPlugins(project, configuration)
-                extensionRegistered = true
-            }
-        }
-
-        override fun registerJavaPsiFacade() {
-            with(project) {
-                registerService(
-                    CoreJavaFileManager::class.java,
-                    ServiceManager.getService(this, JavaFileManager::class.java) as CoreJavaFileManager
-                )
-
-                registerKotlinLightClassSupport(project)
-
-                registerService(ExternalAnnotationsManager::class.java, MockExternalAnnotationsManager())
-                registerService(InferredAnnotationsManager::class.java, MockInferredAnnotationsManager())
-            }
-
-            super.registerJavaPsiFacade()
-        }
-    }
-
-    private val sourceFiles = mutableListOf<KtFile>()
-    private val rootsIndex: JvmDependenciesDynamicCompoundIndex
-    private val packagePartProviders = mutableListOf<JvmPackagePartProvider>()
-
-    private val classpathRootsResolver: ClasspathRootsResolver
-    private val initialRoots = ArrayList<JavaRoot>()
-
-    val configuration: CompilerConfiguration = initialConfiguration.apply { setupJdkClasspathRoots(configFiles) }.copy()
-
-    init {
-        PersistentFSConstants::class.java.getDeclaredField("ourMaxIntellisenseFileSize")
-            .apply { isAccessible = true }
-            .setInt(null, FileUtilRt.LARGE_FOR_CONTENT_LOADING)
-
-        val project = projectEnvironment.project
-
-        val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-
-        (projectEnvironment as? ProjectEnvironment)?.registerExtensionsFromPlugins(configuration)
-        // otherwise consider that project environment is properly configured before passing to the environment
-        // TODO: consider some asserts to check important extension points
-
-        project.registerService(DeclarationProviderFactoryService::class.java, CliDeclarationProviderFactoryService(sourceFiles))
-
-        val isJvm = configFiles == EnvironmentConfigFiles.JVM_CONFIG_FILES
-        project.registerService(ModuleVisibilityManager::class.java, CliModuleVisibilityManagerImpl(isJvm))
-
-        registerProjectServicesForCLI(projectEnvironment)
-
-        registerProjectServices(projectEnvironment.project)
-
-        for (extension in CompilerConfigurationExtension.getInstances(project)) {
-            extension.updateConfiguration(configuration)
-        }
-
-        sourceFiles += createKtFiles(project)
-
-        collectAdditionalSources(project)
-
-        sourceFiles.sortBy { it.virtualFile.path }
-
-        val jdkHome = configuration.get(JVMConfigurationKeys.JDK_HOME)
-        val jrtFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.JRT_PROTOCOL)
-        val javaModuleFinder = CliJavaModuleFinder(jdkHome?.path?.let { path ->
-            jrtFileSystem?.findFileByPath(path + URLUtil.JAR_SEPARATOR)
-        })
-
-        val outputDirectory =
-            configuration.get(JVMConfigurationKeys.MODULES)?.singleOrNull()?.getOutputDirectory()
-                ?: configuration.get(JVMConfigurationKeys.OUTPUT_DIRECTORY)?.absolutePath
-
-        classpathRootsResolver = ClasspathRootsResolver(
-            PsiManager.getInstance(project),
-            messageCollector,
-            configuration.getList(JVMConfigurationKeys.ADDITIONAL_JAVA_MODULES),
-            this::contentRootToVirtualFile,
-            javaModuleFinder,
-            !configuration.getBoolean(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE),
-            outputDirectory?.let(this::findLocalFile)
-        )
-
-        val (initialRoots, javaModules) =
-            classpathRootsResolver.convertClasspathRoots(configuration.getList(CLIConfigurationKeys.CONTENT_ROOTS))
-        this.initialRoots.addAll(initialRoots)
-
-        if (!configuration.getBoolean(JVMConfigurationKeys.SKIP_RUNTIME_VERSION_CHECK) && messageCollector != null) {
-            JvmRuntimeVersionsConsistencyChecker.checkCompilerClasspathConsistency(
-                messageCollector,
-                configuration,
-                initialRoots.mapNotNull { (file, type) -> if (type == JavaRoot.RootType.BINARY) file else null }
-            )
-        }
-
-        val (roots, singleJavaFileRoots) =
-            initialRoots.partition { (file) -> file.isDirectory || file.extension != JavaFileType.DEFAULT_EXTENSION }
-
-        // REPL and kapt2 update classpath dynamically
-        rootsIndex = JvmDependenciesDynamicCompoundIndex().apply {
-            addIndex(JvmDependenciesIndexImpl(roots))
-            updateClasspathFromRootsIndex(this)
-        }
-
-        (ServiceManager.getService(project, CoreJavaFileManager::class.java) as KotlinCliJavaFileManagerImpl).initialize(
-            rootsIndex,
-            packagePartProviders,
-            SingleJavaFileRootsIndex(singleJavaFileRoots),
-            configuration.getBoolean(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING)
-        )
-
-        project.registerService(
-            JavaModuleResolver::class.java,
-            CliJavaModuleResolver(classpathRootsResolver.javaModuleGraph, javaModules, javaModuleFinder.systemModules.toList())
-        )
-
-        val finderFactory = CliVirtualFileFinderFactory(rootsIndex)
-        project.registerService(MetadataFinderFactory::class.java, finderFactory)
-        project.registerService(VirtualFileFinderFactory::class.java, finderFactory)
-
-        project.putUserData(APPEND_JAVA_SOURCE_ROOTS_HANDLER_KEY, fun(roots: List<File>) {
-            updateClasspath(roots.map { JavaSourceRoot(it, null) })
-        })
-    }
-
-    private fun collectAdditionalSources(project: MockProject) {
-        var unprocessedSources: Collection<KtFile> = sourceFiles
-        val processedSources = HashSet<KtFile>()
-        val processedSourcesByExtension = HashMap<CollectAdditionalSourcesExtension, Collection<KtFile>>()
-        // repeat feeding extensions with sources while new sources a being added
-        var sourceCollectionIterations = 0
-        while (unprocessedSources.isNotEmpty()) {
-            if (sourceCollectionIterations++ > 10) { // TODO: consider using some appropriate global constant
-                throw IllegalStateException("Unable to collect additional sources in reasonable number of iterations")
-            }
-            processedSources.addAll(unprocessedSources)
-            val allNewSources = ArrayList<KtFile>()
-            for (extension in CollectAdditionalSourcesExtension.getInstances(project)) {
-                // do not feed the extension with the sources it returned on the previous iteration
-                val sourcesToProcess = unprocessedSources - (processedSourcesByExtension[extension] ?: emptyList())
-                val newSources = extension.collectAdditionalSourcesAndUpdateConfiguration(sourcesToProcess, configuration, project)
-                if (newSources.isNotEmpty()) {
-                    allNewSources.addAll(newSources)
-                    processedSourcesByExtension[extension] = newSources
-                }
-            }
-            unprocessedSources = allNewSources.filterNot { processedSources.contains(it) }.distinct()
-            sourceFiles += unprocessedSources
-        }
-    }
-
-    fun addKotlinSourceRoots(rootDirs: List<File>) {
-        val roots = rootDirs.map { KotlinSourceRoot(it.absolutePath, isCommon = false) }
-        sourceFiles += createSourceFilesFromSourceRoots(configuration, project, roots)
-    }
-
-    fun createPackagePartProvider(scope: GlobalSearchScope): JvmPackagePartProvider {
-        return JvmPackagePartProvider(configuration.languageVersionSettings, scope).apply {
-            addRoots(initialRoots, configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY))
-            packagePartProviders += this
-            (ModuleAnnotationsResolver.getInstance(project) as CliModuleAnnotationsResolver).addPackagePartProvider(this)
-        }
-    }
-
-    private val VirtualFile.javaFiles: List<VirtualFile>
-        get() = mutableListOf<VirtualFile>().apply {
-            VfsUtilCore.processFilesRecursively(this@javaFiles) { file ->
-                if (file.fileType == JavaFileType.INSTANCE) {
-                    add(file)
-                }
-                true
-            }
-        }
-
-    private val allJavaFiles: List<File>
-        get() = configuration.javaSourceRoots
-            .mapNotNull(this::findLocalFile)
-            .flatMap { it.javaFiles }
-            .map { File(it.canonicalPath) }
-
-    fun registerJavac(
-        javaFiles: List<File> = allJavaFiles,
-        kotlinFiles: List<KtFile> = sourceFiles,
-        arguments: Array<String>? = null,
-        bootClasspath: List<File>? = null,
-        sourcePath: List<File>? = null
-    ): Boolean {
-        return JavacWrapperRegistrar.registerJavac(
-            projectEnvironment.project, configuration, javaFiles, kotlinFiles, arguments, bootClasspath, sourcePath,
-            LightClassGenerationSupport.getInstance(project), packagePartProviders
-        )
-    }
-
-    private val applicationEnvironment: CoreApplicationEnvironment
-        get() = projectEnvironment.environment
-
-    val project: Project
-        get() = projectEnvironment.project
-
-    internal fun countLinesOfCode(sourceFiles: List<KtFile>): Int =
-        sourceFiles.sumBy { sourceFile ->
-            val text = sourceFile.text
-            StringUtil.getLineBreakCount(text) + (if (StringUtil.endsWithLineBreak(text)) 0 else 1)
-        }
-
-    private fun updateClasspathFromRootsIndex(index: JvmDependenciesIndex) {
-        index.indexedRoots.forEach {
-            projectEnvironment.addSourcesToClasspath(it.file)
-        }
-    }
-
-    fun updateClasspath(contentRoots: List<ContentRoot>): List<File>? {
-        // TODO: add new Java modules to CliJavaModuleResolver
-        val newRoots = classpathRootsResolver.convertClasspathRoots(contentRoots).roots
-
-        if (packagePartProviders.isEmpty()) {
-            initialRoots.addAll(newRoots)
-        } else {
-            for (packagePartProvider in packagePartProviders) {
-                packagePartProvider.addRoots(newRoots, configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY))
-            }
-        }
-
-        return rootsIndex.addNewIndexForRoots(newRoots)?.let { newIndex ->
-            updateClasspathFromRootsIndex(newIndex)
-            newIndex.indexedRoots.mapNotNull { (file) ->
-                VfsUtilCore.virtualToIoFile(VfsUtilCore.getVirtualFileForJar(file) ?: file)
-            }.toList()
-        }.orEmpty()
-    }
-
-    private fun contentRootToVirtualFile(root: JvmContentRoot): VirtualFile? =
-        when (root) {
-            is JvmClasspathRoot ->
-                if (root.file.isFile) findJarRoot(root.file) else findExistingRoot(root, "Classpath entry")
-            is JvmModulePathRoot ->
-                if (root.file.isFile) findJarRoot(root.file) else findExistingRoot(root, "Java module root")
-            is JavaSourceRoot ->
-                findExistingRoot(root, "Java source root")
-            else ->
-                throw IllegalStateException("Unexpected root: $root")
-        }
-
-    internal fun findLocalFile(path: String): VirtualFile? =
-        applicationEnvironment.localFileSystem.findFileByPath(path)
-
-    private fun findExistingRoot(root: JvmContentRoot, rootDescription: String): VirtualFile? {
-        return findLocalFile(root.file.absolutePath).also {
-            if (it == null) {
-                report(STRONG_WARNING, "$rootDescription points to a non-existent location: ${root.file}")
-            }
-        }
-    }
-
-    private fun findJarRoot(file: File): VirtualFile? =
-        applicationEnvironment.jarFileSystem.findFileByPath("$file${URLUtil.JAR_SEPARATOR}")
-
-    private fun getSourceRootsCheckingForDuplicates(): List<KotlinSourceRoot> {
-        val uniqueSourceRoots = hashSetOf<String>()
-        val result = mutableListOf<KotlinSourceRoot>()
-
-        for (root in configuration.kotlinSourceRoots) {
-            if (!uniqueSourceRoots.add(root.path)) {
-                report(STRONG_WARNING, "Duplicate source root: ${root.path}")
-            }
-            result.add(root)
-        }
-
-        return result
-    }
-
-    fun getSourceFiles(): List<KtFile> = sourceFiles
-
-    private fun createKtFiles(project: Project): List<KtFile> =
-        createSourceFilesFromSourceRoots(configuration, project, getSourceRootsCheckingForDuplicates())
-
-    internal fun report(severity: CompilerMessageSeverity, message: String) = configuration.report(severity, message)
-
-    companion object {
-        private val LOG = Logger.getInstance(KotlinCoreEnvironment::class.java)
-
-        private val APPLICATION_LOCK = Object()
-        private var ourApplicationEnvironment: KotlinCoreApplicationEnvironment? = null
-        private var ourProjectCount = 0
-
-        @JvmStatic
-        fun createForProduction(
-            parentDisposable: Disposable, configuration: CompilerConfiguration, configFiles: EnvironmentConfigFiles
-        ): KotlinCoreEnvironment {
-            setupIdeaStandaloneExecution()
-            val appEnv = getOrCreateApplicationEnvironmentForProduction(parentDisposable, configuration)
-            val projectEnv = ProjectEnvironment(parentDisposable, appEnv)
-            val environment = KotlinCoreEnvironment(projectEnv, configuration, configFiles)
-
-            synchronized(APPLICATION_LOCK) {
-                ourProjectCount++
-            }
-            return environment
-        }
-
-        @JvmStatic
-        fun createForProduction(
-            projectEnvironment: JavaCoreProjectEnvironment, configuration: CompilerConfiguration, configFiles: EnvironmentConfigFiles
-        ): KotlinCoreEnvironment {
-            val environment = KotlinCoreEnvironment(projectEnvironment, configuration, configFiles)
-
-            if (projectEnvironment.environment == applicationEnvironment) {
-                // accounting for core environment disposing
-                synchronized(APPLICATION_LOCK) {
-                    ourProjectCount++
-                }
-            }
-            return environment
-        }
-
-        @TestOnly
-        @JvmStatic
-        fun createForTests(
-            parentDisposable: Disposable, initialConfiguration: CompilerConfiguration, extensionConfigs: EnvironmentConfigFiles
-        ): KotlinCoreEnvironment {
-            val configuration = initialConfiguration.copy()
-            // Tests are supposed to create a single project and dispose it right after use
-            val appEnv = createApplicationEnvironment(parentDisposable, configuration, unitTestMode = true)
-            val projectEnv = ProjectEnvironment(parentDisposable, appEnv)
-            return KotlinCoreEnvironment(projectEnv, configuration, extensionConfigs)
-        }
-
-        // used in the daemon for jar cache cleanup
-        val applicationEnvironment: KotlinCoreApplicationEnvironment? get() = ourApplicationEnvironment
-
-        fun getOrCreateApplicationEnvironmentForProduction(
-            parentDisposable: Disposable, configuration: CompilerConfiguration
-        ): KotlinCoreApplicationEnvironment {
-            synchronized(APPLICATION_LOCK) {
-                if (ourApplicationEnvironment == null) {
-                    val disposable = Disposer.newDisposable()
-                    ourApplicationEnvironment = createApplicationEnvironment(disposable, configuration, unitTestMode = false)
-                    ourProjectCount = 0
-                    Disposer.register(disposable, Disposable {
-                        synchronized(APPLICATION_LOCK) {
-                            ourApplicationEnvironment = null
-                        }
-                    })
-                }
-                // Disposing of the environment is unsafe in production then parallel builds are enabled, but turning it off universally
-                // breaks a lot of tests, therefore it is disabled for production and enabled for tests
-                if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY).toBooleanLenient() != true) {
-                    // JPS may run many instances of the compiler in parallel (there's an option for compiling independent modules in parallel in IntelliJ)
-                    // All projects share the same ApplicationEnvironment, and when the last project is disposed, the ApplicationEnvironment is disposed as well
-                    @Suppress("ObjectLiteralToLambda") // Disposer tree depends on identity of disposables.
-                    Disposer.register(parentDisposable, object : Disposable {
-                        override fun dispose() {
-                            synchronized(APPLICATION_LOCK) {
-                                if (--ourProjectCount <= 0) {
-                                    disposeApplicationEnvironment()
-                                }
-                            }
-                        }
-                    })
-                }
-
-                return ourApplicationEnvironment!!
-            }
-        }
-
-        /**
-         * This method is also used in Gradle after configuration phase finished.
-         */
-        fun disposeApplicationEnvironment() {
-            synchronized(APPLICATION_LOCK) {
-                val environment = ourApplicationEnvironment ?: return
-                ourApplicationEnvironment = null
-                Disposer.dispose(environment.parentDisposable)
-                ZipHandler.clearFileAccessorCache()
-            }
-        }
-
-        private fun createApplicationEnvironment(
-            parentDisposable: Disposable, configuration: CompilerConfiguration, unitTestMode: Boolean
-        ): KotlinCoreApplicationEnvironment {
-            val applicationEnvironment = KotlinCoreApplicationEnvironment.create(parentDisposable, unitTestMode)
-
-            registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/compiler.xml")
-            // FIX ME WHEN BUNCH 202 REMOVED: this code is required to support compiler bundled to both 202 and 203.
-            // Please, remove "com.intellij.psi.classFileDecompiler" EP registration once 202 is no longer supported by the compiler
-            if (!Extensions.getRootArea().hasExtensionPoint("com.intellij.psi.classFileDecompiler")) {
-                registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/core.xml")
-            }
-
-            registerApplicationServicesForCLI(applicationEnvironment)
-            registerApplicationServices(applicationEnvironment)
-
-            return applicationEnvironment
-        }
-
-        private fun registerApplicationExtensionPointsAndExtensionsFrom(configuration: CompilerConfiguration, configFilePath: String) {
-            fun File.hasConfigFile(configFile: String): Boolean =
-                if (isDirectory) File(this, "META-INF" + File.separator + configFile).exists()
-                else try {
-                    ZipFile(this).use {
-                        it.getEntry("META-INF/$configFile") != null
-                    }
-                } catch (e: Throwable) {
-                    false
-                }
-
-            val pluginRoot: File =
-                configuration.get(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT)?.let(::File)
-                    ?: PathUtil.getResourcePathForClass(this::class.java).takeIf { it.hasConfigFile(configFilePath) }
-                    // hack for load extensions when compiler run directly from project directory (e.g. in tests)
-                    ?: File("compiler/cli/cli-common/resources").takeIf { it.hasConfigFile(configFilePath) }
-                    ?: throw IllegalStateException(
-                        "Unable to find extension point configuration $configFilePath " +
-                                "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})"
-                    )
-
-            CoreApplicationEnvironment.registerExtensionPointAndExtensions(
-                FileSystems.getDefault().getPath(pluginRoot.path),
-                configFilePath,
-                Extensions.getRootArea()
-            )
-        }
-
-        @JvmStatic
-        @Suppress("MemberVisibilityCanPrivate") // made public for CLI Android Lint
-        fun registerPluginExtensionPoints(project: MockProject) {
-            ExpressionCodegenExtension.registerExtensionPoint(project)
-            SyntheticResolveExtension.registerExtensionPoint(project)
-            ClassBuilderInterceptorExtension.registerExtensionPoint(project)
-            AnalysisHandlerExtension.registerExtensionPoint(project)
-            PackageFragmentProviderExtension.registerExtensionPoint(project)
-            StorageComponentContainerContributor.registerExtensionPoint(project)
-            DeclarationAttributeAltererExtension.registerExtensionPoint(project)
-            PreprocessedVirtualFileFactoryExtension.registerExtensionPoint(project)
-            JsSyntheticTranslateExtension.registerExtensionPoint(project)
-            CompilerConfigurationExtension.registerExtensionPoint(project)
-            CollectAdditionalSourcesExtension.registerExtensionPoint(project)
-            ExtraImportsProviderExtension.registerExtensionPoint(project)
-            IrGenerationExtension.registerExtensionPoint(project)
-            ScriptEvaluationExtension.registerExtensionPoint(project)
-            ShellExtension.registerExtensionPoint(project)
-            TypeResolutionInterceptor.registerExtensionPoint(project)
-            CandidateInterceptor.registerExtensionPoint(project)
-            DescriptorSerializerPlugin.registerExtensionPoint(project)
-        }
-
-        internal fun registerExtensionsFromPlugins(project: MockProject, configuration: CompilerConfiguration) {
-            val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-            for (registrar in configuration.getList(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS)) {
-                try {
-                    registrar.registerProjectComponents(project, configuration)
-                } catch (e: AbstractMethodError) {
-                    val message = "The provided plugin ${registrar.javaClass.name} is not compatible with this version of compiler"
-                    // Since the scripting plugin is often discovered in the compiler environment, it is often taken from the incompatible
-                    // location, and in many cases this is not a fatal error, therefore strong warning is generated instead of exception
-                    if (registrar.javaClass.simpleName == "ScriptingCompilerConfigurationComponentRegistrar") {
-                        messageCollector?.report(STRONG_WARNING, "Default scripting plugin is disabled: $message")
-                    } else {
-                        throw IllegalStateException(message, e)
-                    }
-                }
-            }
-        }
-
-
-        private fun registerApplicationServicesForCLI(applicationEnvironment: KotlinCoreApplicationEnvironment) {
-            // ability to get text from annotations xml files
-            applicationEnvironment.registerFileType(PlainTextFileType.INSTANCE, "xml")
-            applicationEnvironment.registerParserDefinition(JavaParserDefinition())
-        }
-
-        // made public for Upsource
-        @Suppress("MemberVisibilityCanBePrivate")
-        @JvmStatic
-        fun registerApplicationServices(applicationEnvironment: KotlinCoreApplicationEnvironment) {
-            with(applicationEnvironment) {
-                registerFileType(KotlinFileType.INSTANCE, "kt")
-                registerFileType(KotlinFileType.INSTANCE, KotlinParserDefinition.STD_SCRIPT_SUFFIX)
-                registerParserDefinition(KotlinParserDefinition())
-                application.registerService(KotlinBinaryClassCache::class.java, KotlinBinaryClassCache())
-                application.registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java)
-                application.registerService(TransactionGuard::class.java, TransactionGuardImpl::class.java)
-            }
-        }
-
-        @JvmStatic
-        fun registerProjectExtensionPoints(area: ExtensionsArea) {
-            CoreApplicationEnvironment.registerExtensionPoint(
-                area, PsiTreeChangePreprocessor.EP.name, PsiTreeChangePreprocessor::class.java
-            )
-            CoreApplicationEnvironment.registerExtensionPoint(area, PsiElementFinder.EP.name, PsiElementFinder::class.java)
-
-            IdeaExtensionPoints.registerVersionSpecificProjectExtensionPoints(area)
-        }
-
-        // made public for Upsource
-        @JvmStatic
-        @Deprecated("Use registerProjectServices(project) instead.", ReplaceWith("registerProjectServices(projectEnvironment.project)"))
-        fun registerProjectServices(
-            projectEnvironment: JavaCoreProjectEnvironment,
-            @Suppress("UNUSED_PARAMETER") messageCollector: MessageCollector?
-        ) {
-            registerProjectServices(projectEnvironment.project)
-        }
-
-        // made public for Android Lint
-        @JvmStatic
-        fun registerProjectServices(project: MockProject) {
-            with(project) {
-                registerService(KotlinJavaPsiFacade::class.java, KotlinJavaPsiFacade(this))
-                registerService(FacadeCache::class.java, FacadeCache(this))
-                registerService(ModuleAnnotationsResolver::class.java, CliModuleAnnotationsResolver())
-            }
-        }
-
-        private fun registerProjectServicesForCLI(@Suppress("UNUSED_PARAMETER") projectEnvironment: JavaCoreProjectEnvironment) {
-            /**
-             * Note that Kapt may restart code analysis process, and CLI services should be aware of that.
-             * Use PsiManager.getModificationTracker() to ensure that all the data you cached is still valid.
-             */
-        }
-
-        // made public for Android Lint
-        @JvmStatic
-        fun registerKotlinLightClassSupport(project: MockProject) {
-            with(project) {
-                val traceHolder = CliTraceHolder()
-                val cliLightClassGenerationSupport = CliLightClassGenerationSupport(traceHolder, project)
-                val kotlinAsJavaSupport = CliKotlinAsJavaSupport(this, traceHolder)
-                registerService(LightClassGenerationSupport::class.java, cliLightClassGenerationSupport)
-                registerService(CliLightClassGenerationSupport::class.java, cliLightClassGenerationSupport)
-                registerService(KotlinAsJavaSupport::class.java, kotlinAsJavaSupport)
-                registerService(CodeAnalyzerInitializer::class.java, traceHolder)
-
-                // We don't pass Disposable because in some tests, we manually unregister these extensions, and that leads to LOG.error
-                // exception from `ExtensionPointImpl.doRegisterExtension`, because the registered extension can no longer be found
-                // when the project is being disposed.
-                // For example, see the `unregisterExtension` call in `GenerationUtils.compileFilesUsingFrontendIR`.
-                // TODO: refactor this to avoid registering unneeded extensions in the first place, and avoid using deprecated API.
-                @Suppress("DEPRECATION")
-                PsiElementFinder.EP.getPoint(project).registerExtension(JavaElementFinder(this, kotlinAsJavaSupport))
-                @Suppress("DEPRECATION")
-                PsiElementFinder.EP.getPoint(project).registerExtension(PsiElementFinderImpl(this))
-            }
-        }
-
-        private fun CompilerConfiguration.setupJdkClasspathRoots(configFiles: EnvironmentConfigFiles) {
-            if (getBoolean(JVMConfigurationKeys.NO_JDK)) return
-
-            val jvmTarget = configFiles == EnvironmentConfigFiles.JVM_CONFIG_FILES
-            if (!jvmTarget) return
-
-            val jdkHome = get(JVMConfigurationKeys.JDK_HOME)
-            val (javaRoot, classesRoots) = if (jdkHome == null) {
-                val javaHome = File(System.getProperty("java.home"))
-                put(JVMConfigurationKeys.JDK_HOME, javaHome)
-
-                javaHome to PathUtil.getJdkClassesRootsFromCurrentJre()
-            } else {
-                jdkHome to PathUtil.getJdkClassesRoots(jdkHome)
-            }
-
-            if (!CoreJrtFileSystem.isModularJdk(javaRoot)) {
-                if (classesRoots.isEmpty()) {
-                    report(ERROR, "No class roots are found in the JDK path: $javaRoot")
-                } else {
-                    addJvmSdkRoots(classesRoots)
-                }
-            }
-        }
-    }
-}
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
index 55339968a7a..6087fdd8f86 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
@@ -52,10 +52,10 @@ import org.jetbrains.kotlin.codegen.state.GenerationStateEventCallback
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.diagnostics.*
+import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.fir.analysis.FirAnalyzerFacade
 import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver
-import org.jetbrains.kotlin.fir.backend.jvm.FirMetadataSerializer
+import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension
 import org.jetbrains.kotlin.fir.checkers.registerExtendedCommonCheckers
 import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
 import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo
@@ -389,10 +389,8 @@ object KotlinToJVMBytecodeCompiler {
             performanceManager?.notifyIRGenerationStarted()
             generationState.beforeCompile()
             codegenFactory.generateModuleInFrontendIRMode(
-                generationState, moduleFragment, symbolTable, sourceManager, extensions
-            ) { context, irClass, _, serializationBindings, parent ->
-                FirMetadataSerializer(session, context, irClass, serializationBindings, components, parent)
-            }
+                generationState, moduleFragment, symbolTable, sourceManager, extensions, FirJvmBackendExtension(session, components)
+            )
             CodegenFactory.doCheckCancelled(generationState)
             generationState.factory.done()
 
@@ -572,8 +570,6 @@ object KotlinToJVMBytecodeCompiler {
         sourceFiles: List<KtFile>,
         module: Module?
     ): GenerationState {
-        val isIR = (configuration.getBoolean(JVMConfigurationKeys.IR) ||
-                configuration.getBoolean(CommonConfigurationKeys.USE_FIR))
         val generationState = GenerationState.Builder(
             environment.project,
             ClassBuilderFactories.BINARIES,
@@ -583,13 +579,12 @@ object KotlinToJVMBytecodeCompiler {
             configuration
         )
             .codegenFactory(
-                if (isIR) JvmIrCodegenFactory(
+                if (configuration.getBoolean(JVMConfigurationKeys.IR)) JvmIrCodegenFactory(
                     configuration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jvmPhases)
                 ) else DefaultCodegenFactory
             )
             .withModule(module)
             .onIndependentPartCompilationEnd(createOutputFilesFlushingCallbackIfPossible(configuration))
-            .isIrBackend(isIR)
             .build()
 
         ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
index 709ba73a6b3..cbb8f6d9f58 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.cli.common.getLibraryFromHome
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
+import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
 import org.jetbrains.kotlin.cli.jvm.config.JvmModulePathRoot
@@ -19,9 +20,6 @@ import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 
 fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArguments) {
-
-    val messageCollector = getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-
     put(JVMConfigurationKeys.INCLUDE_RUNTIME, arguments.includeRuntime)
 
     putIfNotNull(JVMConfigurationKeys.FRIEND_PATHS, arguments.friendPaths?.asList())
@@ -71,9 +69,6 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
 }
 
 fun CompilerConfiguration.configureJdkHome(arguments: K2JVMCompilerArguments): Boolean {
-
-    val messageCollector = getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-
     if (arguments.noJdk) {
         put(JVMConfigurationKeys.NO_JDK, true)
 
@@ -84,7 +79,7 @@ fun CompilerConfiguration.configureJdkHome(arguments: K2JVMCompilerArguments): B
     }
 
     if (arguments.jdkHome != null) {
-        val jdkHome = File(arguments.jdkHome)
+        val jdkHome = File(arguments.jdkHome!!)
         if (!jdkHome.exists()) {
             messageCollector.report(ERROR, "JDK home directory does not exist: $jdkHome")
             return false
@@ -114,7 +109,6 @@ fun CompilerConfiguration.configureExplicitContentRoots(arguments: K2JVMCompiler
 }
 
 fun CompilerConfiguration.configureStandardLibs(paths: KotlinPaths?, arguments: K2JVMCompilerArguments) {
-    val messageCollector = getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
     val isModularJava = isModularJava()
 
     fun addRoot(moduleName: String, libraryName: String, getLibrary: (KotlinPaths) -> File, noLibraryArgument: String) {
@@ -171,8 +165,23 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
 
     put(JVMConfigurationKeys.PARAMETERS_METADATA, arguments.javaParameters)
 
-    put(JVMConfigurationKeys.IR, arguments.useIR && !arguments.noUseIR)
-    put(JVMConfigurationKeys.IS_IR_WITH_STABLE_ABI, arguments.isIrWithStableAbi)
+    val useIR = (arguments.useIR && !arguments.noUseIR) || arguments.useFir
+    put(JVMConfigurationKeys.IR, useIR)
+
+    val abiStability = JvmAbiStability.fromStringOrNull(arguments.abiStability)
+    if (arguments.abiStability != null) {
+        if (abiStability == null) {
+            messageCollector.report(
+                ERROR,
+                "Unknown ABI stability mode: ${arguments.abiStability}, supported modes: ${JvmAbiStability.values().map { it.description }}"
+            )
+        } else if (!useIR && abiStability == JvmAbiStability.UNSTABLE) {
+            messageCollector.report(ERROR, "-Xabi-stability=unstable is not supported in the old JVM backend")
+        } else {
+            put(JVMConfigurationKeys.ABI_STABILITY, abiStability)
+        }
+    }
+
     put(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT, arguments.doNotClearBindingContext)
     put(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, arguments.noCallAssertions)
     put(JVMConfigurationKeys.DISABLE_RECEIVER_ASSERTIONS, arguments.noReceiverAssertions)
@@ -189,43 +198,34 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
     put(JVMConfigurationKeys.NO_UNIFIED_NULL_CHECKS, arguments.noUnifiedNullChecks)
 
     if (!JVMConstructorCallNormalizationMode.isSupportedValue(arguments.constructorCallNormalizationMode)) {
-        getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY).report(
+        messageCollector.report(
             ERROR,
             "Unknown constructor call normalization mode: ${arguments.constructorCallNormalizationMode}, " +
                     "supported modes: ${JVMConstructorCallNormalizationMode.values().map { it.description }}"
         )
     }
 
-    val constructorCallNormalizationMode =
-        JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)
+    val constructorCallNormalizationMode = JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)
     if (constructorCallNormalizationMode != null) {
-        put(
-            JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE,
-            constructorCallNormalizationMode
-        )
+        put(JVMConfigurationKeys.CONSTRUCTOR_CALL_NORMALIZATION_MODE, constructorCallNormalizationMode)
     }
 
     val assertionsMode =
         JVMAssertionsMode.fromStringOrNull(arguments.assertionsMode)
     if (assertionsMode == null) {
-        getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY).report(
+        messageCollector.report(
             ERROR,
-            "Unknown assertions mode: ${arguments.assertionsMode}, " +
-                    "supported modes: ${JVMAssertionsMode.values().map { it.description }}"
+            "Unknown assertions mode: ${arguments.assertionsMode}, supported modes: ${JVMAssertionsMode.values().map { it.description }}"
         )
     }
-    put(
-        JVMConfigurationKeys.ASSERTIONS_MODE,
-        assertionsMode ?: JVMAssertionsMode.DEFAULT
-    )
+    put(JVMConfigurationKeys.ASSERTIONS_MODE, assertionsMode ?: JVMAssertionsMode.DEFAULT)
 
     put(JVMConfigurationKeys.USE_TYPE_TABLE, arguments.useTypeTable)
     put(JVMConfigurationKeys.SKIP_RUNTIME_VERSION_CHECK, arguments.skipRuntimeVersionCheck)
     put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, arguments.useOldClassFilesReading)
 
     if (arguments.useOldClassFilesReading) {
-        getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-            .report(INFO, "Using the old java class files reading implementation")
+        messageCollector.report(INFO, "Using the old java class files reading implementation")
     }
 
     put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage)
@@ -235,8 +235,7 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
     put(JVMConfigurationKeys.ENABLE_JVM_PREVIEW, arguments.enableJvmPreview)
 
     if (arguments.enableJvmPreview) {
-        getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-            .report(INFO, "Using preview Java language features")
+        messageCollector.report(INFO, "Using preview Java language features")
     }
 
     arguments.declarationsOutputPath?.let { put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) }
@@ -249,3 +248,6 @@ fun CompilerConfiguration.configureKlibPaths(arguments: K2JVMCompilerArguments)
         ?.filterNot { it.isEmpty() }
         ?.let { put(JVMConfigurationKeys.KLIB_PATHS, it) }
 }
+
+private val CompilerConfiguration.messageCollector: MessageCollector
+    get() = getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
index de4c0f9e015..b8e6870b0a6 100644
--- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
@@ -117,8 +117,8 @@ public class JVMConfigurationKeys {
     public static final CompilerConfigurationKey<List<String>> KLIB_PATHS =
             CompilerConfigurationKey.create("Paths to .klib libraries");
 
-    public static final CompilerConfigurationKey<Boolean> IS_IR_WITH_STABLE_ABI =
-            CompilerConfigurationKey.create("Is IR with stable ABI");
+    public static final CompilerConfigurationKey<JvmAbiStability> ABI_STABILITY =
+            CompilerConfigurationKey.create("ABI stability of class files produced by JVM IR and/or FIR");
 
     public static final CompilerConfigurationKey<Boolean> DO_NOT_CLEAR_BINDING_CONTEXT =
             CompilerConfigurationKey.create("When using the IR backend, do not clear BindingContext between psi2ir and lowerings");
diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAbiStability.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAbiStability.kt
new file mode 100644
index 00000000000..e40ecfae2c6
--- /dev/null
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAbiStability.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2020 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.config
+
+enum class JvmAbiStability(val description: String) {
+    STABLE("stable"),
+    UNSTABLE("unstable"),
+    ;
+
+    companion object {
+        fun fromStringOrNull(string: String?): JvmAbiStability? =
+            values().find { it.description == string }
+    }
+}
diff --git a/compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt b/compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt
index 123e5bad772..3cab8a5ff3a 100644
--- a/compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt
+++ b/compiler/config/src/org/jetbrains/kotlin/config/AnalysisFlags.kt
@@ -46,7 +46,7 @@ object AnalysisFlags {
     val ideMode by AnalysisFlag.Delegates.Boolean
 
     @JvmStatic
-    val reportErrorsOnIrDependencies by AnalysisFlag.Delegates.Boolean
+    val allowUnstableDependencies by AnalysisFlag.Delegates.Boolean
 
     @JvmStatic
     val libraryToSourceAnalysis by AnalysisFlag.Delegates.Boolean
diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts
index f615e816581..bcc22c88270 100644
--- a/compiler/fir/analysis-tests/build.gradle.kts
+++ b/compiler/fir/analysis-tests/build.gradle.kts
@@ -14,21 +14,59 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
     testApi(intellijDep())
-
-    testApi(commonDep("junit:junit"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
-    testApi(projectTests(":compiler:tests-common"))
+    testApi(projectTests(":compiler:test-infrastructure"))
+    testApi(projectTests(":compiler:test-infrastructure-utils"))
+    testApi(projectTests(":compiler:tests-compiler-utils"))
+    testApi(projectTests(":compiler:tests-common-new"))
+    testApi(project(":compiler:cli"))
     testApi(project(":compiler:fir:checkers"))
     testApi(project(":compiler:fir:entrypoint"))
     testApi(project(":compiler:frontend"))
 
-    testCompileOnly(project(":kotlin-reflect-api"))
-    testRuntime(project(":kotlin-reflect"))
-    testRuntime(project(":core:descriptors.runtime"))
+    testApi(platform("org.junit:junit-bom:5.7.0"))
+    testApi("org.junit.jupiter:junit-jupiter")
+    testApi("org.junit.platform:junit-platform-commons:1.7.0")
 
-    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testRuntimeOnly(project(":kotlin-reflect"))
+    testRuntimeOnly(project(":core:descriptors.runtime"))
+
+    testImplementation(intellijCoreDep()) { includeJars("intellij-core") }
+    testImplementation(intellijDep()) {
+        // This dependency is needed only for FileComparisonFailure
+        includeJars("idea_rt", rootProject = rootProject)
+        isTransitive = false
+    }
+
+    // This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes
+    testRuntimeOnly(commonDep("junit:junit"))
+    testRuntimeOnly(intellijDep()) {
+        includeJars(
+            "jps-model",
+            "extensions",
+            "util",
+            "platform-api",
+            "platform-impl",
+            "idea",
+            "guava",
+            "trove4j",
+            "asm-all",
+            "log4j",
+            "jdom",
+            "streamex",
+            "bootstrap",
+            "jna",
+            rootProject = rootProject
+        )
+    }
+
+    Platform[202] {
+        testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-1") }
+    }
+    Platform[203].orHigher {
+        testRuntimeOnly(intellijDep()) { includeJars("intellij-deps-fastutil-8.3.1-3") }
+    }
+    testRuntimeOnly(toolsJar())
 }
 
 val generationRoot = projectDir.resolve("tests-gen")
@@ -48,11 +86,13 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     }
 }
 
-projectTest(parallel = true) {
+projectTest(parallel = true, jUnit5Enabled = true) {
     dependsOn(":dist")
     workingDir = rootDir
     jvmArgs!!.removeIf { it.contains("-Xmx") }
     maxHeapSize = "3g"
+
+    useJUnitPlatform()
 }
 
 testsJar()
diff --git a/compiler/fir/analysis-tests/ReadMe.md b/compiler/fir/analysis-tests/legacy-fir-tests/ReadMe.md
similarity index 100%
rename from compiler/fir/analysis-tests/ReadMe.md
rename to compiler/fir/analysis-tests/legacy-fir-tests/ReadMe.md
diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
new file mode 100644
index 00000000000..b20a8328451
--- /dev/null
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
@@ -0,0 +1,58 @@
+import org.jetbrains.kotlin.ideaExt.idea
+
+/*
+ * Copyright 2000-2018 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.
+ */
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+
+    testApi(intellijDep())
+
+    testApi(commonDep("junit:junit"))
+    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
+    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testApi(projectTests(":compiler:tests-common"))
+    testApi(project(":compiler:fir:checkers"))
+    testApi(project(":compiler:fir:entrypoint"))
+    testApi(project(":compiler:frontend"))
+
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testRuntimeOnly(project(":kotlin-reflect"))
+    testRuntimeOnly(project(":core:descriptors.runtime"))
+
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
+}
+
+val generationRoot = projectDir.resolve("tests-gen")
+
+sourceSets {
+    "main" { none() }
+    "test" {
+        projectDefault()
+        this.java.srcDir(generationRoot.name)
+    }
+}
+
+if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
+    apply(plugin = "idea")
+    idea {
+        this.module.generatedSourceDirs.add(generationRoot)
+    }
+}
+
+projectTest(parallel = true) {
+    dependsOn(":dist")
+    workingDir = rootDir
+    jvmArgs!!.removeIf { it.contains("-Xmx") }
+    maxHeapSize = "3g"
+}
+
+testsJar()
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
similarity index 100%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/FirLoadCompiledKotlinGenerated.java
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
similarity index 85%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
index c2daeaee160..aecd9bc650b 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
@@ -1685,6 +1685,419 @@ public class LazyBodyIsNotTouchedTilContractsPhaseTestGenerated extends Abstract
         }
     }
 
+    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ExtendedCheckers extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        public void testAllFilesPresentInExtendedCheckers() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @TestMetadata("ArrayEqualityCanBeReplacedWithEquals.kt")
+        public void testArrayEqualityCanBeReplacedWithEquals() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt");
+        }
+
+        @TestMetadata("CanBeValChecker.kt")
+        public void testCanBeValChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.kt");
+        }
+
+        @TestMetadata("RedundantExplicitTypeChecker.kt")
+        public void testRedundantExplicitTypeChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.kt");
+        }
+
+        @TestMetadata("RedundantModalityModifierChecker.kt")
+        public void testRedundantModalityModifierChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.kt");
+        }
+
+        @TestMetadata("RedundantReturnUnitTypeChecker.kt")
+        public void testRedundantReturnUnitTypeChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.kt");
+        }
+
+        @TestMetadata("RedundantSetterParameterTypeChecker.kt")
+        public void testRedundantSetterParameterTypeChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.kt");
+        }
+
+        @TestMetadata("RedundantSingleExpressionStringTemplateChecker.kt")
+        public void testRedundantSingleExpressionStringTemplateChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt");
+        }
+
+        @TestMetadata("RedundantVisibilityModifierChecker.kt")
+        public void testRedundantVisibilityModifierChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.kt");
+        }
+
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CanBeReplacedWithOperatorAssignment extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInCanBeReplacedWithOperatorAssignment() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("BasicTest.kt")
+            public void testBasicTest() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt");
+            }
+
+            @TestMetadata("ComplexExpression.kt")
+            public void testComplexExpression() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt");
+            }
+
+            @TestMetadata("flexibleTypeBug.kt")
+            public void testFlexibleTypeBug() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt");
+            }
+
+            @TestMetadata("illegalMultipleOperators.kt")
+            public void testIllegalMultipleOperators() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt");
+            }
+
+            @TestMetadata("illegalMultipleOperatorsMiddle.kt")
+            public void testIllegalMultipleOperatorsMiddle() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
+            }
+
+            @TestMetadata("invalidSubtraction.kt")
+            public void testInvalidSubtraction() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt");
+            }
+
+            @TestMetadata("list.kt")
+            public void testList() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt");
+            }
+
+            @TestMetadata("logicOperators.kt")
+            public void testLogicOperators() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt");
+            }
+
+            @TestMetadata("multipleOperators.kt")
+            public void testMultipleOperators() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt");
+            }
+
+            @TestMetadata("multipleOperatorsRightSideRepeat.kt")
+            public void testMultipleOperatorsRightSideRepeat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
+            }
+
+            @TestMetadata("mutableList.kt")
+            public void testMutableList() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt");
+            }
+
+            @TestMetadata("nonCommutativeRepeat.kt")
+            public void testNonCommutativeRepeat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt");
+            }
+
+            @TestMetadata("nonRepeatingAssignment.kt")
+            public void testNonRepeatingAssignment() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt");
+            }
+
+            @TestMetadata("OperatorAssignment.kt")
+            public void testOperatorAssignment() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt");
+            }
+
+            @TestMetadata("plusAssignConflict.kt")
+            public void testPlusAssignConflict() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt");
+            }
+
+            @TestMetadata("rightSideRepeat.kt")
+            public void testRightSideRepeat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt");
+            }
+
+            @TestMetadata("simpleAssign.kt")
+            public void testSimpleAssign() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt");
+            }
+
+            @TestMetadata("validAddition.kt")
+            public void testValidAddition() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt");
+            }
+
+            @TestMetadata("validSubtraction.kt")
+            public void testValidSubtraction() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt");
+            }
+        }
+
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class EmptyRangeChecker extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInEmptyRangeChecker() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("NoWarning.kt")
+            public void testNoWarning() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.kt");
+            }
+
+            @TestMetadata("Warning.kt")
+            public void testWarning() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.kt");
+            }
+        }
+
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class RedundantCallOfConversionMethod extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInRedundantCallOfConversionMethod() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("booleanToInt.kt")
+            public void testBooleanToInt() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt");
+            }
+
+            @TestMetadata("byte.kt")
+            public void testByte() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.kt");
+            }
+
+            @TestMetadata("char.kt")
+            public void testChar() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.kt");
+            }
+
+            @TestMetadata("double.kt")
+            public void testDouble() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.kt");
+            }
+
+            @TestMetadata("float.kt")
+            public void testFloat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.kt");
+            }
+
+            @TestMetadata("int.kt")
+            public void testInt() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.kt");
+            }
+
+            @TestMetadata("long.kt")
+            public void testLong() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.kt");
+            }
+
+            @TestMetadata("nullable.kt")
+            public void testNullable() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt");
+            }
+
+            @TestMetadata("nullable2.kt")
+            public void testNullable2() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt");
+            }
+
+            @TestMetadata("safeString.kt")
+            public void testSafeString() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt");
+            }
+
+            @TestMetadata("safeString2.kt")
+            public void testSafeString2() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt");
+            }
+
+            @TestMetadata("short.kt")
+            public void testShort() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.kt");
+            }
+
+            @TestMetadata("string.kt")
+            public void testString() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.kt");
+            }
+
+            @TestMetadata("StringTemplate.kt")
+            public void testStringTemplate() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt");
+            }
+
+            @TestMetadata("toOtherType.kt")
+            public void testToOtherType() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt");
+            }
+
+            @TestMetadata("uByte.kt")
+            public void testUByte() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt");
+            }
+
+            @TestMetadata("uInt.kt")
+            public void testUInt() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt");
+            }
+
+            @TestMetadata("uLong.kt")
+            public void testULong() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt");
+            }
+
+            @TestMetadata("uShort.kt")
+            public void testUShort() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt");
+            }
+
+            @TestMetadata("variable.kt")
+            public void testVariable() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.kt");
+            }
+        }
+
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class Unused extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInUnused() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("classProperty.kt")
+            public void testClassProperty() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.kt");
+            }
+
+            @TestMetadata("invoke.kt")
+            public void testInvoke() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.kt");
+            }
+
+            @TestMetadata("lambda.kt")
+            public void testLambda() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.kt");
+            }
+
+            @TestMetadata("localVariable.kt")
+            public void testLocalVariable() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.kt");
+            }
+
+            @TestMetadata("manyLocalVariables.kt")
+            public void testManyLocalVariables() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.kt");
+            }
+
+            @TestMetadata("usedInAnnotationArguments.kt")
+            public void testUsedInAnnotationArguments() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.kt");
+            }
+
+            @TestMetadata("valueIsNeverRead.kt")
+            public void testValueIsNeverRead() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.kt");
+            }
+        }
+
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class UselessCallOnNotNullChecker extends AbstractLazyBodyIsNotTouchedTilContractsPhaseTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInUselessCallOnNotNullChecker() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @TestMetadata("Basic.kt")
+            public void testBasic() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt");
+            }
+
+            @TestMetadata("NotNullType.kt")
+            public void testNotNullType() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt");
+            }
+
+            @TestMetadata("NotNullTypeChain.kt")
+            public void testNotNullTypeChain() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt");
+            }
+
+            @TestMetadata("NullOrBlankSafe.kt")
+            public void testNullOrBlankSafe() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt");
+            }
+
+            @TestMetadata("NullOrEmpty.kt")
+            public void testNullOrEmpty() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt");
+            }
+
+            @TestMetadata("NullOrEmptyFake.kt")
+            public void testNullOrEmptyFake() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt");
+            }
+
+            @TestMetadata("NullOrEmptySafe.kt")
+            public void testNullOrEmptySafe() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt");
+            }
+
+            @TestMetadata("OrEmptyFake.kt")
+            public void testOrEmptyFake() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt");
+            }
+
+            @TestMetadata("SafeCall.kt")
+            public void testSafeCall() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt");
+            }
+
+            @TestMetadata("Sequence.kt")
+            public void testSequence() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt");
+            }
+
+            @TestMetadata("String.kt")
+            public void testString() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.kt");
+            }
+        }
+    }
+
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/fromBuilder")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirOldFrontendLightClassesTestGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirOldFrontendLightClassesTestGenerated.java
similarity index 100%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirOldFrontendLightClassesTestGenerated.java
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirOldFrontendLightClassesTestGenerated.java
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirTypeEnhancementTestGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirTypeEnhancementTestGenerated.java
similarity index 100%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirTypeEnhancementTestGenerated.java
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/java/FirTypeEnhancementTestGenerated.java
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/java/OwnFirTypeEnhancementTestGenerated.java b/compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/java/OwnFirTypeEnhancementTestGenerated.java
similarity index 100%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/java/OwnFirTypeEnhancementTestGenerated.java
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests-gen/org/jetbrains/kotlin/fir/java/OwnFirTypeEnhancementTestGenerated.java
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt
similarity index 100%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt
similarity index 100%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadCompiledKotlin.kt
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
similarity index 100%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/BuiltInsDeserializationForFirTestCase.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/BuiltInsDeserializationForFirTestCase.kt
similarity index 100%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/BuiltInsDeserializationForFirTestCase.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/BuiltInsDeserializationForFirTestCase.kt
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt
similarity index 100%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirOldFrontendLightClassesTest.kt
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
similarity index 98%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
index 5b9505f687d..26f76d172a2 100644
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
@@ -61,7 +61,7 @@ abstract class AbstractFirTypeEnhancementTest : KtUsefulTestCase() {
     }
 
     private fun createJarWithForeignAnnotations(): File =
-        MockLibraryUtil.compileJavaFilesLibraryToJar(FOREIGN_ANNOTATIONS_SOURCES_PATH, "foreign-annotations")
+        MockLibraryUtilExt.compileJavaFilesLibraryToJar(FOREIGN_ANNOTATIONS_SOURCES_PATH, "foreign-annotations")
 
     private fun createEnvironment(content: String): KotlinCoreEnvironment {
         val classpath = mutableListOf(getAnnotationsJar(), ForTestCompileRuntime.runtimeJarForTests())
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt
similarity index 100%
rename from compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt
rename to compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt
deleted file mode 100644
index 43b5af89a04..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// WITH_RUNTIME
-
-fun foo(p: Int) {
-    val a = arrayOf(1, 2, 3)
-    val b = arrayOf(3, 2, 1)
-
-    if (a <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS!>==<!> b) { }
-}
-
-fun testsFromIdea() {
-    val a = arrayOf("a")
-    val b = a
-    val c: Any? = null
-    a <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS!>==<!> b
-    a == c
-    a <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS!>!=<!> b
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt
deleted file mode 100644
index 97809b57f70..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-// WITH_RUNTIME
-// IS_APPLICABLE: false
-fun foo(s: String?) {
-    val <!UNUSED_VARIABLE!>t<!>: String = s.toString()
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt
deleted file mode 100644
index c0b5a99987e..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-// WITH_RUNTIME
-data class Foo(val name: String)
-
-fun test(foo: Foo?) {
-    val <!UNUSED_VARIABLE!>s<!>: String? = foo?.name?.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toString()<!>
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt
deleted file mode 100644
index 20444d1549d..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// WITH_RUNTIME
-fun test(i: UByte) {
-    val <!UNUSED_VARIABLE!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toUByte()<!>
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt
deleted file mode 100644
index fec6f346b66..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// WITH_RUNTIME
-fun test(i: UInt) {
-    val <!UNUSED_VARIABLE!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toUInt()<!>
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt
deleted file mode 100644
index c9fc29d32ca..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// WITH_RUNTIME
-fun test(i: ULong) {
-    val <!UNUSED_VARIABLE!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toULong()<!>
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt
deleted file mode 100644
index 98fd40c8c4e..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// WITH_RUNTIME
-fun test(i: UShort) {
-    val <!UNUSED_VARIABLE!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toUShort()<!>
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.kt
deleted file mode 100644
index d28a4286e91..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-import kotlin.reflect.KClass
-
-@Target(AnnotationTarget.TYPE)
-annotation class A
-
-fun annotated() {
-    val <!UNUSED_VARIABLE!>x<!>: @A Int /* NOT redundant */ = 1
-}
-
-object SomeObj
-fun fer() {
-    val <!UNUSED_VARIABLE!>x<!>: Any /* NOT redundant */ = SomeObj
-}
-
-fun f2(y: String?): String {
-    val <!UNUSED_VARIABLE!>f<!>: KClass<*> = (y ?: return "")::class
-    return ""
-}
-
-object Obj {}
-
-interface IA
-interface IB : IA
-
-fun IA.extFun(x: IB) {}
-
-fun testWithExpectedType() {
-    val <!UNUSED_VARIABLE!>extFun_AB_A<!>: IA.(IB) -> Unit = IA::extFun
-}
-
-interface Point {
-    val x: Int
-    val y: Int
-}
-
-class PointImpl(override val x: Int, override val y: Int) : Point
-
-fun foo() {
-    val <!UNUSED_VARIABLE!>s<!>: <!REDUNDANT_EXPLICIT_TYPE!>String<!> = "Hello ${10+1}"
-    val <!UNUSED_VARIABLE!>str<!>: String? = ""
-
-    val <!UNUSED_VARIABLE!>o<!>: <!REDUNDANT_EXPLICIT_TYPE!>Obj<!> = Obj
-
-    val <!UNUSED_VARIABLE!>p<!>: Point = PointImpl(1, 2)
-    val <!UNUSED_VARIABLE!>a<!>: <!REDUNDANT_EXPLICIT_TYPE!>Boolean<!> = true
-    val <!UNUSED_VARIABLE!>i<!>: Int = 2 * 2
-    val <!UNUSED_VARIABLE!>l<!>: <!REDUNDANT_EXPLICIT_TYPE!>Long<!> = 1234567890123L
-    val <!UNUSED_VARIABLE!>s<!>: String? = null
-    val <!UNUSED_VARIABLE!>sh<!>: Short = 42
-
-    val <!UNUSED_VARIABLE!>integer<!>: <!REDUNDANT_EXPLICIT_TYPE!>Int<!> = 42
-    val <!UNUSED_VARIABLE!>piFloat<!>: <!REDUNDANT_EXPLICIT_TYPE!>Float<!> = 3.14f
-    val <!UNUSED_VARIABLE!>piDouble<!>: <!REDUNDANT_EXPLICIT_TYPE!>Double<!> = 3.14
-    val <!UNUSED_VARIABLE!>charZ<!>: <!REDUNDANT_EXPLICIT_TYPE!>Char<!> = 'z'
-    <!CAN_BE_VAL!>var<!> <!UNUSED_VARIABLE!>alpha<!>: <!REDUNDANT_EXPLICIT_TYPE!>Int<!> = 0
-}
-
-fun test(boolean: Boolean) {
-    val <!UNUSED_VARIABLE!>expectedLong<!>: Long = if (boolean) {
-        42
-    } else {
-        return
-    }
-}
-
-class My {
-    val x: Int = 1
-}
-
-val ZERO: Int = 0
-
-fun main() {
-    val <!UNUSED_VARIABLE!>id<!>: Id = 11
-}
-
-typealias Id = Int
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.kt
deleted file mode 100644
index 990762a9590..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-object O {
-    fun foo() {}
-}
-
-// Interface
-interface Interface {
-    // Questionable cuz compiler reports warning here in FE 1.0
-    <!REDUNDANT_MODALITY_MODIFIER!>open<!> val gav: Int
-        get() = 42
-    // Redundant
-    <!REDUNDANT_MODALITY_MODIFIER!>abstract<!> fun foo()
-    // error
-    private final fun bar() {}
-
-    <!REDUNDANT_MODALITY_MODIFIER!>open<!> fun goo() {}
-    <!REDUNDANT_MODALITY_MODIFIER!>abstract<!> fun tar()
-
-    // error
-    abstract fun too() {}
-}
-interface B {
-    <!REDUNDANT_MODALITY_MODIFIER!>abstract<!> var bar: Unit
-    <!REDUNDANT_MODALITY_MODIFIER!>abstract<!> fun foo()
-}
-interface Foo
-
-expect abstract class AbstractClass : Foo {
-    abstract override fun foo()
-
-    abstract fun bar()
-
-    abstract val baz: Int
-}
-
-
-// Abstract
-abstract class Base {
-    // Redundant final
-    <!REDUNDANT_MODALITY_MODIFIER!>final<!> fun foo() {}
-    // Abstract
-    abstract fun bar()
-    // Open
-    open val gav = 42
-}
-
-class FinalDerived : Base() {
-    // Redundant final
-    override <!REDUNDANT_MODALITY_MODIFIER!>final<!> fun bar() {}
-    // Non-final member in final class
-    override open val gav = 13
-}
-// Open
-open class OpenDerived : Base() {
-    // Final
-    override final fun bar() {}
-    // Redundant open
-    override <!REDUNDANT_MODALITY_MODIFIER!>open<!> val gav = 13
-}
-// Redundant final
-<!REDUNDANT_MODALITY_MODIFIER!>final<!> class Final
-// Derived interface
-interface Derived : Interface {
-    // Redundant
-    override <!REDUNDANT_MODALITY_MODIFIER!>open<!> fun foo() {}
-    // error
-    final class Nested
-}
-// Derived abstract class
-abstract class AbstractDerived1(override final val gav: Int) : Interface {
-    // Redundant
-    override <!REDUNDANT_MODALITY_MODIFIER!>open<!> fun foo() {}
-}
-// Derived abstract class
-abstract class AbstractDerived2 : Interface {
-    // Final
-    override final fun foo() {}
-    // Redundant
-    override <!REDUNDANT_MODALITY_MODIFIER!>open<!> val gav = 13
-}
-// Redundant abstract interface
-abstract interface AbstractInterface
-// Redundant final object
-<!REDUNDANT_MODALITY_MODIFIER!>final<!> object FinalObject
-// Open interface
-open interface OpenInterface
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.kt
deleted file mode 100644
index 00343ba50ed..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-fun f() {
-    <!REDUNDANT_VISIBILITY_MODIFIER!>public<!> <!CAN_BE_VAL!>var<!> <!UNUSED_VARIABLE!>baz<!> = 0
-    class LocalClass {
-        <!REDUNDANT_VISIBILITY_MODIFIER!>internal<!> var foo = 0
-    }
-    LocalClass().foo = 1
-}
-
-internal inline fun internal() {
-    f()
-}
-
-<!REDECLARATION!>class C {
-    internal val z = object {
-        fun foo() = 13
-    }
-}<!>
-
-class Foo2<
-        T1,
-        T2: T1,
-        > {
-    fun <T1,
-            T2, > foo2() {}
-
-    internal inner class B<T,T2,>
-}
-
-<!REDECLARATION!><!REDUNDANT_VISIBILITY_MODIFIER!>public<!> class C {
-    <!REDUNDANT_VISIBILITY_MODIFIER!>public<!> val foo: Int = 0
-
-    <!REDUNDANT_VISIBILITY_MODIFIER!>public<!> fun bar() {}
-
-}<!>
-
-open class D {
-    protected open fun willRemainProtected() {
-    }
-
-    protected open fun willBecomePublic() {
-    }
-}
-
-class E : D() {
-    <!REDUNDANT_VISIBILITY_MODIFIER!>protected<!> override fun willRemainProtected() {
-    }
-
-    public override fun willBecomePublic() {
-    }
-}
-
-enum class F <!REDUNDANT_VISIBILITY_MODIFIER!>private<!> constructor(val x: Int) {
-    FIRST(42)
-}
-
-sealed class G constructor(val y: Int) {
-    <!REDUNDANT_VISIBILITY_MODIFIER!>private<!> constructor(): this(42)
-
-    object H : G()
-}
-
-interface I {
-    fun bar()
-}
-
-<!REDUNDANT_VISIBILITY_MODIFIER!>public<!> var baz = 0
-
-open class J {
-    protected val baz = 0
-    <!REDUNDANT_VISIBILITY_MODIFIER!>protected<!> get() = field * 2
-    var baf = 0
-    <!REDUNDANT_VISIBILITY_MODIFIER!>public<!> get() = 1
-    <!REDUNDANT_VISIBILITY_MODIFIER!>public<!> set(value) {
-        field = value
-    }
-
-    var buf = 0
-        private get() = 42
-        protected set(value) {
-            field = value
-        }
-
-    var bar = 0
-        get() = 3.1415926535
-        set(value) {}
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt
deleted file mode 100644
index e4a155284c8..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-// WITH_RUNTIME
-
-fun test(s: Sequence<Int>) {
-    val <!UNUSED_VARIABLE!>foo<!> = s.<!USELESS_CALL_ON_NOT_NULL!>orEmpty()<!>
-}
\ No newline at end of file
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt
deleted file mode 100644
index e218c599d57..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-fun goo() {
-    var a = 2
-    val b = 4
-    a <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> a + 1 + b
-    a <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> (a + 1)
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = a * b + 1
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt
deleted file mode 100644
index 9d171517e9c..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun foo() {
-    var x = 0
-    <!CAN_BE_VAL!>var<!> y = 0
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> x + y + 5
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt
deleted file mode 100644
index a93064495f9..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun foo() {
-    var x = 0
-    <!CAN_BE_VAL!>var<!> y = 0
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> y + x + 5
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt
deleted file mode 100644
index 2208ebf69b3..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-fun foo() {
-    var x = 0
-    x <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> x - 1 - 1
-
-    x <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> x / 1
-    x = 1 / x
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> -1 + x
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt
deleted file mode 100644
index 43f50dd8c40..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun foo() {
-    var x = 0
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> 1 + x
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt
deleted file mode 100644
index ba5108a3cc6..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun foo() {
-    var y = 0
-    val x = 0
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>y<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> y + x
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt
deleted file mode 100644
index 191b05aebd9..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun foo() {
-    var x = 0
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> x + 1
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt b/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt
deleted file mode 100644
index 41407233e65..00000000000
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun foo() {
-    var x = 0
-    <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT!>=<!> x - 1
-}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt
new file mode 100644
index 00000000000..48ee3140b41
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt
@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+
+fun foo(p: Int) {
+    val a = arrayOf(1, 2, 3)
+    val b = arrayOf(3, 2, 1)
+
+    if (<!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS{LT}!>a <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS{PSI}!>==<!> b<!>) { }
+}
+
+fun testsFromIdea() {
+    val a = arrayOf("a")
+    val b = a
+    val c: Any? = null
+    <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS{LT}!>a <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS{PSI}!>==<!> b<!>
+    a == c
+    <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS{LT}!>a <!ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS{PSI}!>!=<!> b<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.kt
similarity index 65%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.kt
index 69ad599adbc..5265bf5f52c 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.kt
@@ -4,8 +4,8 @@ import kotlin.reflect.KProperty
 import kotlin.properties.Delegates
 
 fun testDelegator() {
-    var <!UNUSED_VARIABLE!>x<!>: Boolean by LocalFreezableVar(true)
-    var <!UNUSED_VARIABLE!>y<!> by LocalFreezableVar("")
+    <!UNUSED_VARIABLE{LT}!>var <!UNUSED_VARIABLE{PSI}!>x<!>: Boolean by LocalFreezableVar(true)<!>
+    <!UNUSED_VARIABLE{LT}!>var <!UNUSED_VARIABLE{PSI}!>y<!> by LocalFreezableVar("")<!>
 }
 
 class LocalFreezableVar<T>(private var value: T)  {
@@ -23,7 +23,7 @@ operator fun C.plusAssign(a: Any) {}
 fun testOperatorAssignment() {
     val c = C()
     c += ""
-    <!CAN_BE_VAL!>var<!> c1 = C()
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> c1 = C()<!>
     <!ASSIGN_OPERATOR_AMBIGUITY!>c1 += ""<!>
 
     var a = 1
@@ -33,7 +33,7 @@ fun testOperatorAssignment() {
 
 
 fun destructuringDeclaration() {
-    <!CAN_BE_VAL!>var<!> (v1, <!UNUSED_VARIABLE!>v2<!>) = getPair()
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> (v1, <!UNUSED_VARIABLE!>v2<!>) = getPair()<!>
     print(v1)
 
     var (v3, <!VARIABLE_NEVER_READ!>v4<!>) = getPair()
@@ -49,11 +49,11 @@ fun destructuringDeclaration() {
 
     val (<!UNUSED_VARIABLE!>a<!>, <!UNUSED_VARIABLE!>b<!>, <!UNUSED_VARIABLE!>c<!>) = Triple(1, 1, 1)
 
-    <!CAN_BE_VAL!>var<!> (<!UNUSED_VARIABLE!>x<!>, <!UNUSED_VARIABLE!>y<!>, <!UNUSED_VARIABLE!>z<!>) = Triple(1, 1, 1)
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> (<!UNUSED_VARIABLE!>x<!>, <!UNUSED_VARIABLE!>y<!>, <!UNUSED_VARIABLE!>z<!>) = Triple(1, 1, 1)<!>
 }
 
 fun stackOverflowBug() {
-    <!CAN_BE_VAL!>var<!> <!VARIABLE_NEVER_READ!>a<!>: Int
+    <!CAN_BE_VAL{LT}, VARIABLE_NEVER_READ{LT}!><!CAN_BE_VAL{PSI}!>var<!> <!VARIABLE_NEVER_READ{PSI}!>a<!>: Int<!>
     <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = 1
     for (i in 1..10)
         print(i)
@@ -71,8 +71,8 @@ fun smth(flag: Boolean) {
 }
 
 fun withAnnotation(p: List<Any>) {
-    @Suppress("UNCHECKED_CAST")
-    <!CAN_BE_VAL!>var<!> v = p as List<String>
+    <!CAN_BE_VAL{LT}!>@Suppress("UNCHECKED_CAST")
+    <!CAN_BE_VAL{PSI}!>var<!> v = p as List<String><!>
     print(v)
 }
 
@@ -86,9 +86,9 @@ fun getPair(): Pair<Int, String> = Pair(1, "1")
 fun listReceiver(p: List<String>) {}
 
 fun withInitializer() {
-    var <!VARIABLE_NEVER_READ!>v1<!> = 1
+    <!VARIABLE_NEVER_READ{LT}!>var <!VARIABLE_NEVER_READ{PSI}!>v1<!> = 1<!>
     var v2 = 2
-    <!CAN_BE_VAL!>var<!> v3 = 3
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> v3 = 3<!>
     <!ASSIGNED_VALUE_IS_NEVER_READ!>v1<!> = 1
     <!ASSIGNED_VALUE_IS_NEVER_READ!>v2<!>++ // todo mark this UNUSED_CHANGED_VALUES
     print(v3)
@@ -102,10 +102,10 @@ fun test() {
 }
 
 fun foo() {
-    <!CAN_BE_VAL!>var<!> <!VARIABLE_NEVER_READ!>a<!>: Int
+    <!CAN_BE_VAL{LT}, VARIABLE_NEVER_READ{LT}!><!CAN_BE_VAL{PSI}!>var<!> <!VARIABLE_NEVER_READ{PSI}!>a<!>: Int<!>
     val bool = true
     if (bool) <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = 4 else <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = 42
-    val <!UNUSED_VARIABLE!>b<!>: String
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>b<!>: String<!>
 
     <!ASSIGNED_VALUE_IS_NEVER_READ!>bool<!> = false
 }
@@ -116,7 +116,7 @@ fun cycles() {
         a--
     }
 
-    var <!VARIABLE_NEVER_READ!>b<!>: Int
+    <!VARIABLE_NEVER_READ{LT}!>var <!VARIABLE_NEVER_READ{PSI}!>b<!>: Int<!>
     while (a < 10) {
         a++
         <!ASSIGNED_VALUE_IS_NEVER_READ!>b<!> = a
@@ -124,14 +124,14 @@ fun cycles() {
 }
 
 fun assignedTwice(p: Int) {
-    var <!VARIABLE_NEVER_READ!>v<!>: Int
+    <!VARIABLE_NEVER_READ{LT}!>var <!VARIABLE_NEVER_READ{PSI}!>v<!>: Int<!>
     <!ASSIGNED_VALUE_IS_NEVER_READ!>v<!> = 0
     if (p > 0) <!ASSIGNED_VALUE_IS_NEVER_READ!>v<!> = 1
 }
 
 fun main(args: Array<String?>) {
-    <!CAN_BE_VAL!>var<!> a: String?
-    val <!UNUSED_VARIABLE!>unused<!> = 0
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> a: String?<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>unused<!> = 0<!>
 
     if (args.size == 1) {
         <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = args[0]
@@ -144,7 +144,7 @@ fun main(args: Array<String?>) {
 fun run(f: () -> Unit) = f()
 
 fun lambda() {
-    var <!VARIABLE_NEVER_READ!>a<!>: Int
+    <!VARIABLE_NEVER_READ{LT}!>var <!VARIABLE_NEVER_READ{PSI}!>a<!>: Int<!>
     <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = 10
 
     run {
@@ -153,7 +153,7 @@ fun lambda() {
 }
 
 fun lambdaInitialization() {
-    <!CAN_BE_VAL!>var<!> <!VARIABLE_NEVER_READ!>a<!>: Int
+    <!CAN_BE_VAL{LT}, VARIABLE_NEVER_READ{LT}!><!CAN_BE_VAL{PSI}!>var<!> <!VARIABLE_NEVER_READ{PSI}!>a<!>: Int<!>
 
     run {
         <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = 20
@@ -161,7 +161,7 @@ fun lambdaInitialization() {
 }
 
 fun notAssignedWhenNotUsed(p: Int) {
-    <!CAN_BE_VAL!>var<!> v: Int
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> v: Int<!>
     if (p > 0) {
         v = 1
         print(v)
@@ -180,6 +180,6 @@ class C {
 }
 
 fun withDelegate() {
-    var <!VARIABLE_NEVER_READ!>s<!>: String by Delegates.notNull()
+    <!VARIABLE_NEVER_READ{LT}!>var <!VARIABLE_NEVER_READ{PSI}!>s<!>: String by Delegates.notNull()<!>
     <!ASSIGNED_VALUE_IS_NEVER_READ!>s<!> = ""
 }
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/byte.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/byte.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/byte.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/byte.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/char.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/char.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/char.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/char.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/double.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/double.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/double.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/double.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/float.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/float.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/float.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/float.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/int.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/int.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/int.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/int.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/long.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/long.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/long.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/long.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt
new file mode 100644
index 00000000000..6d7764f6103
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+fun foo(s: String?) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>t<!>: String = s.toString()<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt
similarity index 51%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt
index c828043775a..d20e7f71eeb 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt
@@ -3,5 +3,5 @@
 data class Foo(val name: String)
 
 fun nullable2(foo: Foo?) {
-    val <!UNUSED_VARIABLE!>s<!>: String = foo?.name.toString()
-}
\ No newline at end of file
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>s<!>: String = foo?.name.toString()<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt
new file mode 100644
index 00000000000..d43d4744156
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt
@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+data class Foo(val name: String)
+
+fun test(foo: Foo?) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>s<!>: String? = foo?.name?.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toString()<!><!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/short.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/short.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/short.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/short.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/string.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/string.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/string.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/string.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt
new file mode 100644
index 00000000000..b0ff5f59ae8
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UByte) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toUByte()<!><!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt
new file mode 100644
index 00000000000..c82679bd2f9
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UInt) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toUInt()<!><!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt
new file mode 100644
index 00000000000..12885e9713a
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: ULong) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toULong()<!><!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt
new file mode 100644
index 00000000000..b847d74e797
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UShort) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>foo<!> = i.<!REDUNDANT_CALL_OF_CONVERSION_METHOD!>toUShort()<!><!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/variable.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/variable.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/variable.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/variable.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.kt
new file mode 100644
index 00000000000..033dc08beeb
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.kt
@@ -0,0 +1,76 @@
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.TYPE)
+annotation class A
+
+fun annotated() {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>x<!>: @A Int /* NOT redundant */ = 1<!>
+}
+
+object SomeObj
+fun fer() {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>x<!>: Any /* NOT redundant */ = SomeObj<!>
+}
+
+fun f2(y: String?): String {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>f<!>: KClass<*> = (y ?: return "")::class<!>
+    return ""
+}
+
+object Obj {}
+
+interface IA
+interface IB : IA
+
+fun IA.extFun(x: IB) {}
+
+fun testWithExpectedType() {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>extFun_AB_A<!>: IA.(IB) -> Unit = IA::extFun<!>
+}
+
+interface Point {
+    val x: Int
+    val y: Int
+}
+
+class PointImpl(override val x: Int, override val y: Int) : Point
+
+fun foo() {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>s<!>: <!REDUNDANT_EXPLICIT_TYPE!>String<!> = "Hello ${10+1}"<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>str<!>: String? = ""<!>
+
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>o<!>: <!REDUNDANT_EXPLICIT_TYPE!>Obj<!> = Obj<!>
+
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>p<!>: Point = PointImpl(1, 2)<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!>: <!REDUNDANT_EXPLICIT_TYPE!>Boolean<!> = true<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>i<!>: Int = 2 * 2<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>l<!>: <!REDUNDANT_EXPLICIT_TYPE!>Long<!> = 1234567890123L<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>s<!>: String? = null<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>sh<!>: Short = 42<!>
+
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>integer<!>: <!REDUNDANT_EXPLICIT_TYPE!>Int<!> = 42<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>piFloat<!>: <!REDUNDANT_EXPLICIT_TYPE!>Float<!> = 3.14f<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>piDouble<!>: <!REDUNDANT_EXPLICIT_TYPE!>Double<!> = 3.14<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>charZ<!>: <!REDUNDANT_EXPLICIT_TYPE!>Char<!> = 'z'<!>
+    <!CAN_BE_VAL{LT}, UNUSED_VARIABLE{LT}!><!CAN_BE_VAL{PSI}!>var<!> <!UNUSED_VARIABLE{PSI}!>alpha<!>: <!REDUNDANT_EXPLICIT_TYPE!>Int<!> = 0<!>
+}
+
+fun test(boolean: Boolean) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>expectedLong<!>: Long = if (boolean) {
+        42
+    } else {
+        return
+    }<!>
+}
+
+class My {
+    val x: Int = 1
+}
+
+val ZERO: Int = 0
+
+fun main() {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>id<!>: Id = 11<!>
+}
+
+typealias Id = Int
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.kt
new file mode 100644
index 00000000000..6a0140e094a
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.kt
@@ -0,0 +1,85 @@
+object O {
+    fun foo() {}
+}
+
+// Interface
+interface Interface {
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Questionable cuz compiler reports warning here in FE 1.0
+    <!REDUNDANT_MODALITY_MODIFIER{PSI}!>open<!> val gav: Int
+        get() = 42<!>
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant
+    <!REDUNDANT_MODALITY_MODIFIER{PSI}!>abstract<!> fun foo()<!>
+    // error
+    private final fun bar() {}
+
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!><!REDUNDANT_MODALITY_MODIFIER{PSI}!>open<!> fun goo() {}<!>
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!><!REDUNDANT_MODALITY_MODIFIER{PSI}!>abstract<!> fun tar()<!>
+
+    // error
+    abstract fun too() {}
+}
+interface B {
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!><!REDUNDANT_MODALITY_MODIFIER{PSI}!>abstract<!> var bar: Unit<!>
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!><!REDUNDANT_MODALITY_MODIFIER{PSI}!>abstract<!> fun foo()<!>
+}
+interface Foo
+
+expect abstract class AbstractClass : Foo {
+    abstract override fun foo()
+
+    abstract fun bar()
+
+    abstract val baz: Int
+}
+
+
+// Abstract
+abstract class Base {
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant final
+    <!REDUNDANT_MODALITY_MODIFIER{PSI}!>final<!> fun foo() {}<!>
+    // Abstract
+    abstract fun bar()
+    // Open
+    open val gav = 42
+}
+
+class FinalDerived : Base() {
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant final
+    override <!REDUNDANT_MODALITY_MODIFIER{PSI}!>final<!> fun bar() {}<!>
+    // Non-final member in final class
+    override open val gav = 13
+}
+// Open
+open class OpenDerived : Base() {
+    // Final
+    override final fun bar() {}
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant open
+    override <!REDUNDANT_MODALITY_MODIFIER{PSI}!>open<!> val gav = 13<!>
+}
+<!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant final
+<!REDUNDANT_MODALITY_MODIFIER{PSI}!>final<!> class Final<!>
+// Derived interface
+interface Derived : Interface {
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant
+    override <!REDUNDANT_MODALITY_MODIFIER{PSI}!>open<!> fun foo() {}<!>
+    // error
+    final class Nested
+}
+// Derived abstract class
+abstract class AbstractDerived1(override final val gav: Int) : Interface {
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant
+    override <!REDUNDANT_MODALITY_MODIFIER{PSI}!>open<!> fun foo() {}<!>
+}
+// Derived abstract class
+abstract class AbstractDerived2 : Interface {
+    // Final
+    override final fun foo() {}
+    <!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant
+    override <!REDUNDANT_MODALITY_MODIFIER{PSI}!>open<!> val gav = 13<!>
+}
+// Redundant abstract interface
+abstract interface AbstractInterface
+<!REDUNDANT_MODALITY_MODIFIER{LT}!>// Redundant final object
+<!REDUNDANT_MODALITY_MODIFIER{PSI}!>final<!> object FinalObject<!>
+// Open interface
+open interface OpenInterface
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSetterParameterTypeChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSetterParameterTypeChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSetterParameterTypeChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSetterParameterTypeChecker.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.kt
new file mode 100644
index 00000000000..9bd5d5fab2b
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.kt
@@ -0,0 +1,86 @@
+fun f() {
+    <!CAN_BE_VAL{LT}, REDUNDANT_VISIBILITY_MODIFIER{LT}, UNUSED_VARIABLE{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> <!CAN_BE_VAL{PSI}!>var<!> <!UNUSED_VARIABLE{PSI}!>baz<!> = 0<!>
+    class LocalClass {
+        <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>internal<!> var foo = 0<!>
+    }
+    LocalClass().foo = 1
+}
+
+internal inline fun internal() {
+    f()
+}
+
+<!REDECLARATION!>class C {
+    internal val z = object {
+        fun foo() = 13
+    }
+}<!>
+
+class Foo2<
+        T1,
+        T2: T1,
+        > {
+    fun <T1,
+            T2, > foo2() {}
+
+    internal inner class B<T,T2,>
+}
+
+<!REDECLARATION, REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> class C {
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> val foo: Int = 0<!>
+
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> fun bar() {}<!>
+
+}<!>
+
+open class D {
+    protected open fun willRemainProtected() {
+    }
+
+    protected open fun willBecomePublic() {
+    }
+}
+
+class E : D() {
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>protected<!> override fun willRemainProtected() {
+    }<!>
+
+    public override fun willBecomePublic() {
+    }
+}
+
+enum class F <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>private<!> constructor(val x: Int)<!> {
+    FIRST(42)
+}
+
+sealed class G constructor(val y: Int) {
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>private<!> constructor(): this(42)<!>
+
+    object H : G()
+}
+
+interface I {
+    fun bar()
+}
+
+<!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> var baz = 0<!>
+
+open class J {
+    protected val baz = 0
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>protected<!> get() = field * 2<!>
+    var baf = 0
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> get() = 1<!>
+    <!REDUNDANT_VISIBILITY_MODIFIER{LT}!><!REDUNDANT_VISIBILITY_MODIFIER{PSI}!>public<!> set(value) {
+        field = value
+    }<!>
+
+    var buf = 0
+        private get() = 42
+        protected set(value) {
+            field = value
+        }
+
+    var bar = 0
+        get() = 3.1415926535
+        set(value) {}
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Basic.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Basic.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt
new file mode 100644
index 00000000000..7d42aa11536
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt
@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun test(s: Sequence<Int>) {
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>foo<!> = s.<!USELESS_CALL_ON_NOT_NULL!>orEmpty()<!><!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/String.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/String.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/String.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/String.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt
new file mode 100644
index 00000000000..912b9269c91
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt
@@ -0,0 +1,7 @@
+fun goo() {
+    var a = 2
+    val b = 4
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!>a <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> a + 1 + b<!>
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!>a <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> (a + 1)<!>
+    <!ASSIGNED_VALUE_IS_NEVER_READ!>a<!> = a * b + 1
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/list.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/list.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt
new file mode 100644
index 00000000000..11f1bca71de
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt
@@ -0,0 +1,5 @@
+fun foo() {
+    var x = 0
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> y = 0<!>
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> x + y + 5<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt
new file mode 100644
index 00000000000..96977f2be0e
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt
@@ -0,0 +1,5 @@
+fun foo() {
+    var x = 0
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> y = 0<!>
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> y + x + 5<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt
new file mode 100644
index 00000000000..dcc6e3c00c3
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt
@@ -0,0 +1,8 @@
+fun foo() {
+    var x = 0
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!>x <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> x - 1 - 1<!>
+
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!>x <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> x / 1<!>
+    x = 1 / x
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> -1 + x<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt
similarity index 54%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt
index 0b19a7e7ab5..ab87652e702 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt
@@ -1,5 +1,5 @@
 fun foo() {
-    var <!VARIABLE_NEVER_READ!>x<!> = 0
+    <!VARIABLE_NEVER_READ{LT}!>var <!VARIABLE_NEVER_READ{PSI}!>x<!> = 0<!>
     val y = 0
     val z = 0
     <!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> = y + z
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt
new file mode 100644
index 00000000000..adde06044e7
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt
@@ -0,0 +1,4 @@
+fun foo() {
+    var x = 0
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> 1 + x<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt
new file mode 100644
index 00000000000..cb9f57e7075
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt
@@ -0,0 +1,5 @@
+fun foo() {
+    var y = 0
+    val x = 0
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>y<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> y + x<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt
new file mode 100644
index 00000000000..d77084bd75a
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt
@@ -0,0 +1,4 @@
+fun foo() {
+    var x = 0
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> x + 1<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt
new file mode 100644
index 00000000000..a474c593fa1
--- /dev/null
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt
@@ -0,0 +1,4 @@
+fun foo() {
+    var x = 0
+    <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{LT}!><!ASSIGNED_VALUE_IS_NEVER_READ!>x<!> <!CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT{PSI}!>=<!> x - 1<!>
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.kt
similarity index 56%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.kt
index 209d2c11c89..6e69cac3315 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.kt
@@ -3,7 +3,7 @@
 fun foo() {
     for (i in 1..2) { }
 
-    val <!UNUSED_VARIABLE!>a<!> = 3..4
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!> = 3..4<!>
 
     val v = 1
     if (v in 5..6) { }
@@ -13,7 +13,7 @@ fun foo() {
 fun backward() {
     for (i in 2 downTo 1) { }
 
-    val <!UNUSED_VARIABLE!>a<!> = 4 downTo 3
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!> = 4 downTo 3<!>
 
     val v = 1
     if (v in -5 downTo -6) { }
@@ -22,7 +22,7 @@ fun backward() {
 fun until() {
     for (i in 1 until 2) { }
 
-    val <!UNUSED_VARIABLE!>a<!> = 3 until 4
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!> = 3 until 4<!>
 
     val v = 1
     if (v in -5 until -4) { }
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.kt
similarity index 58%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.kt
index ad813ac13fd..0d5cebd779e 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.kt
@@ -3,7 +3,7 @@
 fun foo() {
     for (i in <!EMPTY_RANGE!>2..1<!>) { }
 
-    val <!UNUSED_VARIABLE!>a<!> = <!EMPTY_RANGE!>10..0<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!> = <!EMPTY_RANGE!>10..0<!><!>
 
     val v = 1
     if (v in <!EMPTY_RANGE!>10..1<!>) { }
@@ -12,7 +12,7 @@ fun foo() {
 fun backward() {
     for (i in <!EMPTY_RANGE!>1 downTo 2<!>) { }
 
-    val <!UNUSED_VARIABLE!>a<!> = <!EMPTY_RANGE!>-3 downTo 4<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!> = <!EMPTY_RANGE!>-3 downTo 4<!><!>
 
     val v = 1
     if (v in <!EMPTY_RANGE!>0 downTo 6<!>) { }
@@ -21,7 +21,7 @@ fun backward() {
 fun until() {
     for (i in <!EMPTY_RANGE!>1 until 1<!>) { }
 
-    val <!UNUSED_VARIABLE!>a<!> = <!EMPTY_RANGE!>4 until 3<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!> = <!EMPTY_RANGE!>4 until 3<!><!>
 
     val v = 1
     if (v in <!EMPTY_RANGE!>-5 until -5<!>) { }
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/classProperty.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/classProperty.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/classProperty.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/classProperty.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/invoke.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/invoke.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/invoke.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/invoke.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/lambda.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/lambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/lambda.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/lambda.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.kt
similarity index 58%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.kt
index aa69fc811ae..0d8f0230869 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.kt
@@ -4,7 +4,7 @@ class Outer {
     fun foo() {
         class Local {
             fun bar() {
-                val <!UNUSED_VARIABLE!>x<!> = y
+                <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>x<!> = y<!>
             }
         }
     }
@@ -22,13 +22,13 @@ fun f() {
 
 
 fun foo(v: Int) {
-    val <!UNUSED_VARIABLE!>d<!>: Int by Delegate
-    val <!UNUSED_VARIABLE!>a<!>: Int
-    val <!UNUSED_VARIABLE!>b<!> = 1
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>d<!>: Int by Delegate<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>a<!>: Int<!>
+    <!UNUSED_VARIABLE{LT}!>val <!UNUSED_VARIABLE{PSI}!>b<!> = 1<!>
     val c = 2
 
-    @Anno
-    val <!UNUSED_VARIABLE!>e<!>: Int
+    <!UNUSED_VARIABLE{LT}!>@Anno
+    val <!UNUSED_VARIABLE{PSI}!>e<!>: Int<!>
 
     foo(c)
 }
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.kt
similarity index 83%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.kt
index 7de68571e70..d95d419335f 100644
--- a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.kt
@@ -1,5 +1,5 @@
 fun foo() {
-    <!CAN_BE_VAL!>var<!> a = 1
+    <!CAN_BE_VAL{LT}!><!CAN_BE_VAL{PSI}!>var<!> a = 1<!>
     var b = <!VARIABLE_INITIALIZER_IS_REDUNDANT!>2<!>
     var c = 3
 
@@ -16,4 +16,4 @@ fun foo() {
     if (c == a) {
         foo()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/usedInAnnotationArguments.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/usedInAnnotationArguments.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/usedInAnnotationArguments.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/usedInAnnotationArguments.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.kt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/valueIsNeverRead.txt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/valueIsNeverRead.txt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/extendedCheckers/unused/valueIsNeverRead.kt b/compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.kt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/extendedCheckers/unused/valueIsNeverRead.kt
rename to compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.kt
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/ExtendedFirDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/ExtendedFirDiagnosticsTestGenerated.java
deleted file mode 100644
index d1d2c85606e..00000000000
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/ExtendedFirDiagnosticsTestGenerated.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright 2010-2020 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;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ExtendedFirDiagnosticsTestGenerated extends AbstractExtendedFirDiagnosticsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInExtendedCheckers() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("ArrayEqualityCanBeReplacedWithEquals.kt")
-    public void testArrayEqualityCanBeReplacedWithEquals() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt");
-    }
-
-    @TestMetadata("CanBeValChecker.kt")
-    public void testCanBeValChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.kt");
-    }
-
-    @TestMetadata("RedundantExplicitTypeChecker.kt")
-    public void testRedundantExplicitTypeChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.kt");
-    }
-
-    @TestMetadata("RedundantModalityModifierChecker.kt")
-    public void testRedundantModalityModifierChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.kt");
-    }
-
-    @TestMetadata("RedundantReturnUnitTypeChecker.kt")
-    public void testRedundantReturnUnitTypeChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.kt");
-    }
-
-    @TestMetadata("RedundantSetterParameterTypeChecker.kt")
-    public void testRedundantSetterParameterTypeChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSetterParameterTypeChecker.kt");
-    }
-
-    @TestMetadata("RedundantSingleExpressionStringTemplateChecker.kt")
-    public void testRedundantSingleExpressionStringTemplateChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt");
-    }
-
-    @TestMetadata("RedundantVisibilityModifierChecker.kt")
-    public void testRedundantVisibilityModifierChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.kt");
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class CanBeReplacedWithOperatorAssignment extends AbstractExtendedFirDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInCanBeReplacedWithOperatorAssignment() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("BasicTest.kt")
-        public void testBasicTest() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt");
-        }
-
-        @TestMetadata("ComplexExpression.kt")
-        public void testComplexExpression() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt");
-        }
-
-        @TestMetadata("flexibleTypeBug.kt")
-        public void testFlexibleTypeBug() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt");
-        }
-
-        @TestMetadata("illegalMultipleOperators.kt")
-        public void testIllegalMultipleOperators() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt");
-        }
-
-        @TestMetadata("illegalMultipleOperatorsMiddle.kt")
-        public void testIllegalMultipleOperatorsMiddle() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
-        }
-
-        @TestMetadata("invalidSubtraction.kt")
-        public void testInvalidSubtraction() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt");
-        }
-
-        @TestMetadata("list.kt")
-        public void testList() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt");
-        }
-
-        @TestMetadata("logicOperators.kt")
-        public void testLogicOperators() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt");
-        }
-
-        @TestMetadata("multipleOperators.kt")
-        public void testMultipleOperators() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt");
-        }
-
-        @TestMetadata("multipleOperatorsRightSideRepeat.kt")
-        public void testMultipleOperatorsRightSideRepeat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
-        }
-
-        @TestMetadata("mutableList.kt")
-        public void testMutableList() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt");
-        }
-
-        @TestMetadata("nonCommutativeRepeat.kt")
-        public void testNonCommutativeRepeat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt");
-        }
-
-        @TestMetadata("nonRepeatingAssignment.kt")
-        public void testNonRepeatingAssignment() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt");
-        }
-
-        @TestMetadata("OperatorAssignment.kt")
-        public void testOperatorAssignment() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt");
-        }
-
-        @TestMetadata("plusAssignConflict.kt")
-        public void testPlusAssignConflict() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt");
-        }
-
-        @TestMetadata("rightSideRepeat.kt")
-        public void testRightSideRepeat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt");
-        }
-
-        @TestMetadata("simpleAssign.kt")
-        public void testSimpleAssign() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt");
-        }
-
-        @TestMetadata("validAddition.kt")
-        public void testValidAddition() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt");
-        }
-
-        @TestMetadata("validSubtraction.kt")
-        public void testValidSubtraction() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class EmptyRangeChecker extends AbstractExtendedFirDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInEmptyRangeChecker() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("NoWarning.kt")
-        public void testNoWarning() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.kt");
-        }
-
-        @TestMetadata("Warning.kt")
-        public void testWarning() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class RedundantCallOfConversionMethod extends AbstractExtendedFirDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInRedundantCallOfConversionMethod() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("booleanToInt.kt")
-        public void testBooleanToInt() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt");
-        }
-
-        @TestMetadata("byte.kt")
-        public void testByte() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/byte.kt");
-        }
-
-        @TestMetadata("char.kt")
-        public void testChar() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/char.kt");
-        }
-
-        @TestMetadata("double.kt")
-        public void testDouble() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/double.kt");
-        }
-
-        @TestMetadata("float.kt")
-        public void testFloat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/float.kt");
-        }
-
-        @TestMetadata("int.kt")
-        public void testInt() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/int.kt");
-        }
-
-        @TestMetadata("long.kt")
-        public void testLong() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/long.kt");
-        }
-
-        @TestMetadata("nullable.kt")
-        public void testNullable() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt");
-        }
-
-        @TestMetadata("nullable2.kt")
-        public void testNullable2() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt");
-        }
-
-        @TestMetadata("safeString.kt")
-        public void testSafeString() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt");
-        }
-
-        @TestMetadata("safeString2.kt")
-        public void testSafeString2() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt");
-        }
-
-        @TestMetadata("short.kt")
-        public void testShort() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/short.kt");
-        }
-
-        @TestMetadata("string.kt")
-        public void testString() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/string.kt");
-        }
-
-        @TestMetadata("StringTemplate.kt")
-        public void testStringTemplate() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt");
-        }
-
-        @TestMetadata("toOtherType.kt")
-        public void testToOtherType() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt");
-        }
-
-        @TestMetadata("uByte.kt")
-        public void testUByte() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt");
-        }
-
-        @TestMetadata("uInt.kt")
-        public void testUInt() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt");
-        }
-
-        @TestMetadata("uLong.kt")
-        public void testULong() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt");
-        }
-
-        @TestMetadata("uShort.kt")
-        public void testUShort() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt");
-        }
-
-        @TestMetadata("variable.kt")
-        public void testVariable() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/variable.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/unused")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Unused extends AbstractExtendedFirDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInUnused() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/unused"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("classProperty.kt")
-        public void testClassProperty() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/classProperty.kt");
-        }
-
-        @TestMetadata("invoke.kt")
-        public void testInvoke() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/invoke.kt");
-        }
-
-        @TestMetadata("lambda.kt")
-        public void testLambda() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/lambda.kt");
-        }
-
-        @TestMetadata("localVariable.kt")
-        public void testLocalVariable() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.kt");
-        }
-
-        @TestMetadata("manyLocalVariables.kt")
-        public void testManyLocalVariables() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.kt");
-        }
-
-        @TestMetadata("usedInAnnotationArguments.kt")
-        public void testUsedInAnnotationArguments() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/usedInAnnotationArguments.kt");
-        }
-
-        @TestMetadata("valueIsNeverRead.kt")
-        public void testValueIsNeverRead() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/valueIsNeverRead.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class UselessCallOnNotNullChecker extends AbstractExtendedFirDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInUselessCallOnNotNullChecker() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("Basic.kt")
-        public void testBasic() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt");
-        }
-
-        @TestMetadata("NotNullType.kt")
-        public void testNotNullType() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt");
-        }
-
-        @TestMetadata("NotNullTypeChain.kt")
-        public void testNotNullTypeChain() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt");
-        }
-
-        @TestMetadata("NullOrBlankSafe.kt")
-        public void testNullOrBlankSafe() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt");
-        }
-
-        @TestMetadata("NullOrEmpty.kt")
-        public void testNullOrEmpty() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt");
-        }
-
-        @TestMetadata("NullOrEmptyFake.kt")
-        public void testNullOrEmptyFake() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt");
-        }
-
-        @TestMetadata("NullOrEmptySafe.kt")
-        public void testNullOrEmptySafe() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt");
-        }
-
-        @TestMetadata("OrEmptyFake.kt")
-        public void testOrEmptyFake() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt");
-        }
-
-        @TestMetadata("SafeCall.kt")
-        public void testSafeCall() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt");
-        }
-
-        @TestMetadata("Sequence.kt")
-        public void testSequence() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt");
-        }
-
-        @TestMetadata("String.kt")
-        public void testString() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/String.kt");
-        }
-    }
-}
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/ExtendedFirWithLightTreeDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/ExtendedFirWithLightTreeDiagnosticsTestGenerated.java
deleted file mode 100644
index 09565f356d5..00000000000
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/fir/ExtendedFirWithLightTreeDiagnosticsTestGenerated.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright 2010-2020 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;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ExtendedFirWithLightTreeDiagnosticsTestGenerated extends AbstractExtendedFirWithLightTreeDiagnosticsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInExtendedCheckers() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("ArrayEqualityCanBeReplacedWithEquals.kt")
-    public void testArrayEqualityCanBeReplacedWithEquals() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt");
-    }
-
-    @TestMetadata("CanBeValChecker.kt")
-    public void testCanBeValChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/CanBeValChecker.kt");
-    }
-
-    @TestMetadata("RedundantExplicitTypeChecker.kt")
-    public void testRedundantExplicitTypeChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantExplicitTypeChecker.kt");
-    }
-
-    @TestMetadata("RedundantModalityModifierChecker.kt")
-    public void testRedundantModalityModifierChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantModalityModifierChecker.kt");
-    }
-
-    @TestMetadata("RedundantReturnUnitTypeChecker.kt")
-    public void testRedundantReturnUnitTypeChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantReturnUnitTypeChecker.kt");
-    }
-
-    @TestMetadata("RedundantSetterParameterTypeChecker.kt")
-    public void testRedundantSetterParameterTypeChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSetterParameterTypeChecker.kt");
-    }
-
-    @TestMetadata("RedundantSingleExpressionStringTemplateChecker.kt")
-    public void testRedundantSingleExpressionStringTemplateChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt");
-    }
-
-    @TestMetadata("RedundantVisibilityModifierChecker.kt")
-    public void testRedundantVisibilityModifierChecker() throws Exception {
-        runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantVisibilityModifierChecker.kt");
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class CanBeReplacedWithOperatorAssignment extends AbstractExtendedFirWithLightTreeDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInCanBeReplacedWithOperatorAssignment() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("BasicTest.kt")
-        public void testBasicTest() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt");
-        }
-
-        @TestMetadata("ComplexExpression.kt")
-        public void testComplexExpression() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt");
-        }
-
-        @TestMetadata("flexibleTypeBug.kt")
-        public void testFlexibleTypeBug() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt");
-        }
-
-        @TestMetadata("illegalMultipleOperators.kt")
-        public void testIllegalMultipleOperators() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt");
-        }
-
-        @TestMetadata("illegalMultipleOperatorsMiddle.kt")
-        public void testIllegalMultipleOperatorsMiddle() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
-        }
-
-        @TestMetadata("invalidSubtraction.kt")
-        public void testInvalidSubtraction() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt");
-        }
-
-        @TestMetadata("list.kt")
-        public void testList() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt");
-        }
-
-        @TestMetadata("logicOperators.kt")
-        public void testLogicOperators() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt");
-        }
-
-        @TestMetadata("multipleOperators.kt")
-        public void testMultipleOperators() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt");
-        }
-
-        @TestMetadata("multipleOperatorsRightSideRepeat.kt")
-        public void testMultipleOperatorsRightSideRepeat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
-        }
-
-        @TestMetadata("mutableList.kt")
-        public void testMutableList() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt");
-        }
-
-        @TestMetadata("nonCommutativeRepeat.kt")
-        public void testNonCommutativeRepeat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt");
-        }
-
-        @TestMetadata("nonRepeatingAssignment.kt")
-        public void testNonRepeatingAssignment() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt");
-        }
-
-        @TestMetadata("OperatorAssignment.kt")
-        public void testOperatorAssignment() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt");
-        }
-
-        @TestMetadata("plusAssignConflict.kt")
-        public void testPlusAssignConflict() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt");
-        }
-
-        @TestMetadata("rightSideRepeat.kt")
-        public void testRightSideRepeat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt");
-        }
-
-        @TestMetadata("simpleAssign.kt")
-        public void testSimpleAssign() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt");
-        }
-
-        @TestMetadata("validAddition.kt")
-        public void testValidAddition() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt");
-        }
-
-        @TestMetadata("validSubtraction.kt")
-        public void testValidSubtraction() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class EmptyRangeChecker extends AbstractExtendedFirWithLightTreeDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInEmptyRangeChecker() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("NoWarning.kt")
-        public void testNoWarning() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/NoWarning.kt");
-        }
-
-        @TestMetadata("Warning.kt")
-        public void testWarning() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/emptyRangeChecker/Warning.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class RedundantCallOfConversionMethod extends AbstractExtendedFirWithLightTreeDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInRedundantCallOfConversionMethod() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("booleanToInt.kt")
-        public void testBooleanToInt() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt");
-        }
-
-        @TestMetadata("byte.kt")
-        public void testByte() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/byte.kt");
-        }
-
-        @TestMetadata("char.kt")
-        public void testChar() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/char.kt");
-        }
-
-        @TestMetadata("double.kt")
-        public void testDouble() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/double.kt");
-        }
-
-        @TestMetadata("float.kt")
-        public void testFloat() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/float.kt");
-        }
-
-        @TestMetadata("int.kt")
-        public void testInt() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/int.kt");
-        }
-
-        @TestMetadata("long.kt")
-        public void testLong() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/long.kt");
-        }
-
-        @TestMetadata("nullable.kt")
-        public void testNullable() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt");
-        }
-
-        @TestMetadata("nullable2.kt")
-        public void testNullable2() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt");
-        }
-
-        @TestMetadata("safeString.kt")
-        public void testSafeString() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt");
-        }
-
-        @TestMetadata("safeString2.kt")
-        public void testSafeString2() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt");
-        }
-
-        @TestMetadata("short.kt")
-        public void testShort() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/short.kt");
-        }
-
-        @TestMetadata("string.kt")
-        public void testString() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/string.kt");
-        }
-
-        @TestMetadata("StringTemplate.kt")
-        public void testStringTemplate() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt");
-        }
-
-        @TestMetadata("toOtherType.kt")
-        public void testToOtherType() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt");
-        }
-
-        @TestMetadata("uByte.kt")
-        public void testUByte() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt");
-        }
-
-        @TestMetadata("uInt.kt")
-        public void testUInt() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt");
-        }
-
-        @TestMetadata("uLong.kt")
-        public void testULong() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt");
-        }
-
-        @TestMetadata("uShort.kt")
-        public void testUShort() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt");
-        }
-
-        @TestMetadata("variable.kt")
-        public void testVariable() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/RedundantCallOfConversionMethod/variable.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/unused")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Unused extends AbstractExtendedFirWithLightTreeDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInUnused() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/unused"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("classProperty.kt")
-        public void testClassProperty() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/classProperty.kt");
-        }
-
-        @TestMetadata("invoke.kt")
-        public void testInvoke() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/invoke.kt");
-        }
-
-        @TestMetadata("lambda.kt")
-        public void testLambda() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/lambda.kt");
-        }
-
-        @TestMetadata("localVariable.kt")
-        public void testLocalVariable() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/localVariable.kt");
-        }
-
-        @TestMetadata("manyLocalVariables.kt")
-        public void testManyLocalVariables() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/manyLocalVariables.kt");
-        }
-
-        @TestMetadata("usedInAnnotationArguments.kt")
-        public void testUsedInAnnotationArguments() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/usedInAnnotationArguments.kt");
-        }
-
-        @TestMetadata("valueIsNeverRead.kt")
-        public void testValueIsNeverRead() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/unused/valueIsNeverRead.kt");
-        }
-    }
-
-    @TestMetadata("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class UselessCallOnNotNullChecker extends AbstractExtendedFirWithLightTreeDiagnosticsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInUselessCallOnNotNullChecker() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("Basic.kt")
-        public void testBasic() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt");
-        }
-
-        @TestMetadata("NotNullType.kt")
-        public void testNotNullType() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt");
-        }
-
-        @TestMetadata("NotNullTypeChain.kt")
-        public void testNotNullTypeChain() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt");
-        }
-
-        @TestMetadata("NullOrBlankSafe.kt")
-        public void testNullOrBlankSafe() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt");
-        }
-
-        @TestMetadata("NullOrEmpty.kt")
-        public void testNullOrEmpty() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt");
-        }
-
-        @TestMetadata("NullOrEmptyFake.kt")
-        public void testNullOrEmptyFake() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt");
-        }
-
-        @TestMetadata("NullOrEmptySafe.kt")
-        public void testNullOrEmptySafe() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt");
-        }
-
-        @TestMetadata("OrEmptyFake.kt")
-        public void testOrEmptyFake() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt");
-        }
-
-        @TestMetadata("SafeCall.kt")
-        public void testSafeCall() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt");
-        }
-
-        @TestMetadata("Sequence.kt")
-        public void testSequence() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt");
-        }
-
-        @TestMetadata("String.kt")
-        public void testString() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/extendedCheckers/UselessCallOnNotNullChecker/String.kt");
-        }
-    }
-}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
similarity index 89%
rename from compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
index 0c45772647f..25e4476062f 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
@@ -1946,6 +1946,468 @@ public class FirDiagnosticTestGenerated extends AbstractFirDiagnosticTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers")
+        @TestDataPath("$PROJECT_ROOT")
+        public class ExtendedCheckers extends AbstractFirDiagnosticTest {
+            @Test
+            public void testAllFilesPresentInExtendedCheckers() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("ArrayEqualityCanBeReplacedWithEquals.kt")
+            public void testArrayEqualityCanBeReplacedWithEquals() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt");
+            }
+
+            @Test
+            @TestMetadata("CanBeValChecker.kt")
+            public void testCanBeValChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.kt");
+            }
+
+            @Test
+            @TestMetadata("RedundantExplicitTypeChecker.kt")
+            public void testRedundantExplicitTypeChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.kt");
+            }
+
+            @Test
+            @TestMetadata("RedundantModalityModifierChecker.kt")
+            public void testRedundantModalityModifierChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.kt");
+            }
+
+            @Test
+            @TestMetadata("RedundantReturnUnitTypeChecker.kt")
+            public void testRedundantReturnUnitTypeChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.kt");
+            }
+
+            @Test
+            @TestMetadata("RedundantSetterParameterTypeChecker.kt")
+            public void testRedundantSetterParameterTypeChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.kt");
+            }
+
+            @Test
+            @TestMetadata("RedundantSingleExpressionStringTemplateChecker.kt")
+            public void testRedundantSingleExpressionStringTemplateChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt");
+            }
+
+            @Test
+            @TestMetadata("RedundantVisibilityModifierChecker.kt")
+            public void testRedundantVisibilityModifierChecker() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.kt");
+            }
+
+            @Nested
+            @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment")
+            @TestDataPath("$PROJECT_ROOT")
+            public class CanBeReplacedWithOperatorAssignment extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInCanBeReplacedWithOperatorAssignment() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("BasicTest.kt")
+                public void testBasicTest() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt");
+                }
+
+                @Test
+                @TestMetadata("ComplexExpression.kt")
+                public void testComplexExpression() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt");
+                }
+
+                @Test
+                @TestMetadata("flexibleTypeBug.kt")
+                public void testFlexibleTypeBug() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt");
+                }
+
+                @Test
+                @TestMetadata("illegalMultipleOperators.kt")
+                public void testIllegalMultipleOperators() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt");
+                }
+
+                @Test
+                @TestMetadata("illegalMultipleOperatorsMiddle.kt")
+                public void testIllegalMultipleOperatorsMiddle() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
+                }
+
+                @Test
+                @TestMetadata("invalidSubtraction.kt")
+                public void testInvalidSubtraction() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt");
+                }
+
+                @Test
+                @TestMetadata("list.kt")
+                public void testList() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt");
+                }
+
+                @Test
+                @TestMetadata("logicOperators.kt")
+                public void testLogicOperators() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt");
+                }
+
+                @Test
+                @TestMetadata("multipleOperators.kt")
+                public void testMultipleOperators() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt");
+                }
+
+                @Test
+                @TestMetadata("multipleOperatorsRightSideRepeat.kt")
+                public void testMultipleOperatorsRightSideRepeat() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
+                }
+
+                @Test
+                @TestMetadata("mutableList.kt")
+                public void testMutableList() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt");
+                }
+
+                @Test
+                @TestMetadata("nonCommutativeRepeat.kt")
+                public void testNonCommutativeRepeat() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt");
+                }
+
+                @Test
+                @TestMetadata("nonRepeatingAssignment.kt")
+                public void testNonRepeatingAssignment() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt");
+                }
+
+                @Test
+                @TestMetadata("OperatorAssignment.kt")
+                public void testOperatorAssignment() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt");
+                }
+
+                @Test
+                @TestMetadata("plusAssignConflict.kt")
+                public void testPlusAssignConflict() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt");
+                }
+
+                @Test
+                @TestMetadata("rightSideRepeat.kt")
+                public void testRightSideRepeat() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt");
+                }
+
+                @Test
+                @TestMetadata("simpleAssign.kt")
+                public void testSimpleAssign() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt");
+                }
+
+                @Test
+                @TestMetadata("validAddition.kt")
+                public void testValidAddition() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt");
+                }
+
+                @Test
+                @TestMetadata("validSubtraction.kt")
+                public void testValidSubtraction() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker")
+            @TestDataPath("$PROJECT_ROOT")
+            public class EmptyRangeChecker extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInEmptyRangeChecker() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("NoWarning.kt")
+                public void testNoWarning() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.kt");
+                }
+
+                @Test
+                @TestMetadata("Warning.kt")
+                public void testWarning() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod")
+            @TestDataPath("$PROJECT_ROOT")
+            public class RedundantCallOfConversionMethod extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInRedundantCallOfConversionMethod() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("booleanToInt.kt")
+                public void testBooleanToInt() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt");
+                }
+
+                @Test
+                @TestMetadata("byte.kt")
+                public void testByte() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.kt");
+                }
+
+                @Test
+                @TestMetadata("char.kt")
+                public void testChar() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.kt");
+                }
+
+                @Test
+                @TestMetadata("double.kt")
+                public void testDouble() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.kt");
+                }
+
+                @Test
+                @TestMetadata("float.kt")
+                public void testFloat() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.kt");
+                }
+
+                @Test
+                @TestMetadata("int.kt")
+                public void testInt() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.kt");
+                }
+
+                @Test
+                @TestMetadata("long.kt")
+                public void testLong() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.kt");
+                }
+
+                @Test
+                @TestMetadata("nullable.kt")
+                public void testNullable() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt");
+                }
+
+                @Test
+                @TestMetadata("nullable2.kt")
+                public void testNullable2() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt");
+                }
+
+                @Test
+                @TestMetadata("safeString.kt")
+                public void testSafeString() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt");
+                }
+
+                @Test
+                @TestMetadata("safeString2.kt")
+                public void testSafeString2() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt");
+                }
+
+                @Test
+                @TestMetadata("short.kt")
+                public void testShort() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.kt");
+                }
+
+                @Test
+                @TestMetadata("string.kt")
+                public void testString() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.kt");
+                }
+
+                @Test
+                @TestMetadata("StringTemplate.kt")
+                public void testStringTemplate() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt");
+                }
+
+                @Test
+                @TestMetadata("toOtherType.kt")
+                public void testToOtherType() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt");
+                }
+
+                @Test
+                @TestMetadata("uByte.kt")
+                public void testUByte() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt");
+                }
+
+                @Test
+                @TestMetadata("uInt.kt")
+                public void testUInt() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt");
+                }
+
+                @Test
+                @TestMetadata("uLong.kt")
+                public void testULong() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt");
+                }
+
+                @Test
+                @TestMetadata("uShort.kt")
+                public void testUShort() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt");
+                }
+
+                @Test
+                @TestMetadata("variable.kt")
+                public void testVariable() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Unused extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInUnused() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("classProperty.kt")
+                public void testClassProperty() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.kt");
+                }
+
+                @Test
+                @TestMetadata("invoke.kt")
+                public void testInvoke() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.kt");
+                }
+
+                @Test
+                @TestMetadata("lambda.kt")
+                public void testLambda() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.kt");
+                }
+
+                @Test
+                @TestMetadata("localVariable.kt")
+                public void testLocalVariable() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.kt");
+                }
+
+                @Test
+                @TestMetadata("manyLocalVariables.kt")
+                public void testManyLocalVariables() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.kt");
+                }
+
+                @Test
+                @TestMetadata("usedInAnnotationArguments.kt")
+                public void testUsedInAnnotationArguments() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.kt");
+                }
+
+                @Test
+                @TestMetadata("valueIsNeverRead.kt")
+                public void testValueIsNeverRead() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker")
+            @TestDataPath("$PROJECT_ROOT")
+            public class UselessCallOnNotNullChecker extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInUselessCallOnNotNullChecker() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("Basic.kt")
+                public void testBasic() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt");
+                }
+
+                @Test
+                @TestMetadata("NotNullType.kt")
+                public void testNotNullType() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt");
+                }
+
+                @Test
+                @TestMetadata("NotNullTypeChain.kt")
+                public void testNotNullTypeChain() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt");
+                }
+
+                @Test
+                @TestMetadata("NullOrBlankSafe.kt")
+                public void testNullOrBlankSafe() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt");
+                }
+
+                @Test
+                @TestMetadata("NullOrEmpty.kt")
+                public void testNullOrEmpty() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt");
+                }
+
+                @Test
+                @TestMetadata("NullOrEmptyFake.kt")
+                public void testNullOrEmptyFake() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt");
+                }
+
+                @Test
+                @TestMetadata("NullOrEmptySafe.kt")
+                public void testNullOrEmptySafe() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt");
+                }
+
+                @Test
+                @TestMetadata("OrEmptyFake.kt")
+                public void testOrEmptyFake() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt");
+                }
+
+                @Test
+                @TestMetadata("SafeCall.kt")
+                public void testSafeCall() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt");
+                }
+
+                @Test
+                @TestMetadata("Sequence.kt")
+                public void testSequence() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt");
+                }
+
+                @Test
+                @TestMetadata("String.kt")
+                public void testString() throws Exception {
+                    runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.kt");
+                }
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/fir/analysis-tests/testData/resolve/fromBuilder")
         @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
similarity index 85%
rename from compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
index 95c5bdf1c1a..aa281345df5 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
@@ -1944,6 +1944,468 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
         }
     }
 
+    @Nested
+    @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers")
+    @TestDataPath("$PROJECT_ROOT")
+    public class ExtendedCheckers extends AbstractFirDiagnosticsWithLightTreeTest {
+        @Test
+        public void testAllFilesPresentInExtendedCheckers() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("ArrayEqualityCanBeReplacedWithEquals.kt")
+        public void testArrayEqualityCanBeReplacedWithEquals() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/ArrayEqualityCanBeReplacedWithEquals.kt");
+        }
+
+        @Test
+        @TestMetadata("CanBeValChecker.kt")
+        public void testCanBeValChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/CanBeValChecker.kt");
+        }
+
+        @Test
+        @TestMetadata("RedundantExplicitTypeChecker.kt")
+        public void testRedundantExplicitTypeChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantExplicitTypeChecker.kt");
+        }
+
+        @Test
+        @TestMetadata("RedundantModalityModifierChecker.kt")
+        public void testRedundantModalityModifierChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantModalityModifierChecker.kt");
+        }
+
+        @Test
+        @TestMetadata("RedundantReturnUnitTypeChecker.kt")
+        public void testRedundantReturnUnitTypeChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantReturnUnitTypeChecker.kt");
+        }
+
+        @Test
+        @TestMetadata("RedundantSetterParameterTypeChecker.kt")
+        public void testRedundantSetterParameterTypeChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSetterParameterTypeChecker.kt");
+        }
+
+        @Test
+        @TestMetadata("RedundantSingleExpressionStringTemplateChecker.kt")
+        public void testRedundantSingleExpressionStringTemplateChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantSingleExpressionStringTemplateChecker.kt");
+        }
+
+        @Test
+        @TestMetadata("RedundantVisibilityModifierChecker.kt")
+        public void testRedundantVisibilityModifierChecker() throws Exception {
+            runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantVisibilityModifierChecker.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment")
+        @TestDataPath("$PROJECT_ROOT")
+        public class CanBeReplacedWithOperatorAssignment extends AbstractFirDiagnosticsWithLightTreeTest {
+            @Test
+            public void testAllFilesPresentInCanBeReplacedWithOperatorAssignment() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("BasicTest.kt")
+            public void testBasicTest() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/BasicTest.kt");
+            }
+
+            @Test
+            @TestMetadata("ComplexExpression.kt")
+            public void testComplexExpression() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/ComplexExpression.kt");
+            }
+
+            @Test
+            @TestMetadata("flexibleTypeBug.kt")
+            public void testFlexibleTypeBug() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/flexibleTypeBug.kt");
+            }
+
+            @Test
+            @TestMetadata("illegalMultipleOperators.kt")
+            public void testIllegalMultipleOperators() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperators.kt");
+            }
+
+            @Test
+            @TestMetadata("illegalMultipleOperatorsMiddle.kt")
+            public void testIllegalMultipleOperatorsMiddle() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
+            }
+
+            @Test
+            @TestMetadata("invalidSubtraction.kt")
+            public void testInvalidSubtraction() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/invalidSubtraction.kt");
+            }
+
+            @Test
+            @TestMetadata("list.kt")
+            public void testList() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/list.kt");
+            }
+
+            @Test
+            @TestMetadata("logicOperators.kt")
+            public void testLogicOperators() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/logicOperators.kt");
+            }
+
+            @Test
+            @TestMetadata("multipleOperators.kt")
+            public void testMultipleOperators() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperators.kt");
+            }
+
+            @Test
+            @TestMetadata("multipleOperatorsRightSideRepeat.kt")
+            public void testMultipleOperatorsRightSideRepeat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
+            }
+
+            @Test
+            @TestMetadata("mutableList.kt")
+            public void testMutableList() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/mutableList.kt");
+            }
+
+            @Test
+            @TestMetadata("nonCommutativeRepeat.kt")
+            public void testNonCommutativeRepeat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonCommutativeRepeat.kt");
+            }
+
+            @Test
+            @TestMetadata("nonRepeatingAssignment.kt")
+            public void testNonRepeatingAssignment() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/nonRepeatingAssignment.kt");
+            }
+
+            @Test
+            @TestMetadata("OperatorAssignment.kt")
+            public void testOperatorAssignment() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/OperatorAssignment.kt");
+            }
+
+            @Test
+            @TestMetadata("plusAssignConflict.kt")
+            public void testPlusAssignConflict() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/plusAssignConflict.kt");
+            }
+
+            @Test
+            @TestMetadata("rightSideRepeat.kt")
+            public void testRightSideRepeat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/rightSideRepeat.kt");
+            }
+
+            @Test
+            @TestMetadata("simpleAssign.kt")
+            public void testSimpleAssign() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/simpleAssign.kt");
+            }
+
+            @Test
+            @TestMetadata("validAddition.kt")
+            public void testValidAddition() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validAddition.kt");
+            }
+
+            @Test
+            @TestMetadata("validSubtraction.kt")
+            public void testValidSubtraction() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/canBeReplacedWithOperatorAssignment/validSubtraction.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker")
+        @TestDataPath("$PROJECT_ROOT")
+        public class EmptyRangeChecker extends AbstractFirDiagnosticsWithLightTreeTest {
+            @Test
+            public void testAllFilesPresentInEmptyRangeChecker() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("NoWarning.kt")
+            public void testNoWarning() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/NoWarning.kt");
+            }
+
+            @Test
+            @TestMetadata("Warning.kt")
+            public void testWarning() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/emptyRangeChecker/Warning.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod")
+        @TestDataPath("$PROJECT_ROOT")
+        public class RedundantCallOfConversionMethod extends AbstractFirDiagnosticsWithLightTreeTest {
+            @Test
+            public void testAllFilesPresentInRedundantCallOfConversionMethod() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("booleanToInt.kt")
+            public void testBooleanToInt() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/booleanToInt.kt");
+            }
+
+            @Test
+            @TestMetadata("byte.kt")
+            public void testByte() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/byte.kt");
+            }
+
+            @Test
+            @TestMetadata("char.kt")
+            public void testChar() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/char.kt");
+            }
+
+            @Test
+            @TestMetadata("double.kt")
+            public void testDouble() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/double.kt");
+            }
+
+            @Test
+            @TestMetadata("float.kt")
+            public void testFloat() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/float.kt");
+            }
+
+            @Test
+            @TestMetadata("int.kt")
+            public void testInt() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/int.kt");
+            }
+
+            @Test
+            @TestMetadata("long.kt")
+            public void testLong() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/long.kt");
+            }
+
+            @Test
+            @TestMetadata("nullable.kt")
+            public void testNullable() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable.kt");
+            }
+
+            @Test
+            @TestMetadata("nullable2.kt")
+            public void testNullable2() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/nullable2.kt");
+            }
+
+            @Test
+            @TestMetadata("safeString.kt")
+            public void testSafeString() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString.kt");
+            }
+
+            @Test
+            @TestMetadata("safeString2.kt")
+            public void testSafeString2() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/safeString2.kt");
+            }
+
+            @Test
+            @TestMetadata("short.kt")
+            public void testShort() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/short.kt");
+            }
+
+            @Test
+            @TestMetadata("string.kt")
+            public void testString() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/string.kt");
+            }
+
+            @Test
+            @TestMetadata("StringTemplate.kt")
+            public void testStringTemplate() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/StringTemplate.kt");
+            }
+
+            @Test
+            @TestMetadata("toOtherType.kt")
+            public void testToOtherType() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/toOtherType.kt");
+            }
+
+            @Test
+            @TestMetadata("uByte.kt")
+            public void testUByte() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uByte.kt");
+            }
+
+            @Test
+            @TestMetadata("uInt.kt")
+            public void testUInt() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uInt.kt");
+            }
+
+            @Test
+            @TestMetadata("uLong.kt")
+            public void testULong() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uLong.kt");
+            }
+
+            @Test
+            @TestMetadata("uShort.kt")
+            public void testUShort() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/uShort.kt");
+            }
+
+            @Test
+            @TestMetadata("variable.kt")
+            public void testVariable() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/RedundantCallOfConversionMethod/variable.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Unused extends AbstractFirDiagnosticsWithLightTreeTest {
+            @Test
+            public void testAllFilesPresentInUnused() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("classProperty.kt")
+            public void testClassProperty() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/classProperty.kt");
+            }
+
+            @Test
+            @TestMetadata("invoke.kt")
+            public void testInvoke() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/invoke.kt");
+            }
+
+            @Test
+            @TestMetadata("lambda.kt")
+            public void testLambda() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/lambda.kt");
+            }
+
+            @Test
+            @TestMetadata("localVariable.kt")
+            public void testLocalVariable() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/localVariable.kt");
+            }
+
+            @Test
+            @TestMetadata("manyLocalVariables.kt")
+            public void testManyLocalVariables() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/manyLocalVariables.kt");
+            }
+
+            @Test
+            @TestMetadata("usedInAnnotationArguments.kt")
+            public void testUsedInAnnotationArguments() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/usedInAnnotationArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("valueIsNeverRead.kt")
+            public void testValueIsNeverRead() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/unused/valueIsNeverRead.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker")
+        @TestDataPath("$PROJECT_ROOT")
+        public class UselessCallOnNotNullChecker extends AbstractFirDiagnosticsWithLightTreeTest {
+            @Test
+            public void testAllFilesPresentInUselessCallOnNotNullChecker() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("Basic.kt")
+            public void testBasic() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Basic.kt");
+            }
+
+            @Test
+            @TestMetadata("NotNullType.kt")
+            public void testNotNullType() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullType.kt");
+            }
+
+            @Test
+            @TestMetadata("NotNullTypeChain.kt")
+            public void testNotNullTypeChain() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NotNullTypeChain.kt");
+            }
+
+            @Test
+            @TestMetadata("NullOrBlankSafe.kt")
+            public void testNullOrBlankSafe() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrBlankSafe.kt");
+            }
+
+            @Test
+            @TestMetadata("NullOrEmpty.kt")
+            public void testNullOrEmpty() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmpty.kt");
+            }
+
+            @Test
+            @TestMetadata("NullOrEmptyFake.kt")
+            public void testNullOrEmptyFake() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptyFake.kt");
+            }
+
+            @Test
+            @TestMetadata("NullOrEmptySafe.kt")
+            public void testNullOrEmptySafe() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/NullOrEmptySafe.kt");
+            }
+
+            @Test
+            @TestMetadata("OrEmptyFake.kt")
+            public void testOrEmptyFake() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/OrEmptyFake.kt");
+            }
+
+            @Test
+            @TestMetadata("SafeCall.kt")
+            public void testSafeCall() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/SafeCall.kt");
+            }
+
+            @Test
+            @TestMetadata("Sequence.kt")
+            public void testSequence() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/Sequence.kt");
+            }
+
+            @Test
+            @TestMetadata("String.kt")
+            public void testString() throws Exception {
+                runTest("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/UselessCallOnNotNullChecker/String.kt");
+            }
+        }
+    }
+
     @Nested
     @TestMetadata("compiler/fir/analysis-tests/testData/resolve/fromBuilder")
     @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
similarity index 99%
rename from compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 5e40236383c..6a8aa712660 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -3004,6 +3004,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                     runTest("compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt");
                 }
 
+                @Test
+                @TestMetadata("propertyFromAbstractSuperClass.kt")
+                public void testPropertyFromAbstractSuperClass() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.kt");
+                }
+
                 @Test
                 @TestMetadata("protectedVarFromClass.kt")
                 public void testProtectedVarFromClass() throws Exception {
@@ -6951,6 +6957,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.kt");
             }
 
+            @Test
+            @TestMetadata("kt37796.kt")
+            public void testKt37796() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/delegatedProperty/kt37796.kt");
+            }
+
             @Test
             @TestMetadata("kt4640.kt")
             public void testKt4640() throws Exception {
@@ -9100,6 +9112,22 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/exceptions")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Exceptions extends AbstractFirDiagnosticTest {
+            @Test
+            public void testAllFilesPresentInExceptions() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/exceptions"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("kt24158.kt")
+            public void testKt24158() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/exceptions/kt24158.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/exposed")
         @TestDataPath("$PROJECT_ROOT")
@@ -12145,6 +12173,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/inference/reportAboutUnresolvedReferenceAsUnresolved.kt");
             }
 
+            @Test
+            @TestMetadata("reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt")
+            public void testReportNotEnoughTypeInformationErrorsOnBlockExpressions() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt");
+            }
+
             @Test
             @TestMetadata("resolveWithUnknownLambdaParameterType.kt")
             public void testResolveWithUnknownLambdaParameterType() throws Exception {
@@ -12158,15 +12192,9 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             }
 
             @Test
-            @TestMetadata("simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt")
-            public void testSimpleLambdaInCallWithAnotherLambdaWithBuilderInference() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt");
-            }
-
-            @Test
-            @TestMetadata("skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt")
-            public void testSkipedUnresolvedInBuilderInferenceWithStubReceiverType() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt");
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.kt");
             }
 
             @Test
@@ -12235,6 +12263,64 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.kt");
             }
 
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/inference/builderInference")
+            @TestDataPath("$PROJECT_ROOT")
+            public class BuilderInference extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInBuilderInference() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt")
+                public void testSimpleLambdaInCallWithAnotherLambdaWithBuilderInference() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt");
+                }
+
+                @Test
+                @TestMetadata("skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt")
+                public void testSkipedUnresolvedInBuilderInferenceWithStubReceiverType() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferences.kt")
+                public void testSpecialCallsWithCallableReferences() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt")
+                public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExression() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesDontRewriteAtSlice.kt")
+                public void testSpecialCallsWithCallableReferencesDontRewriteAtSlice() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+                public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+                public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithLambdas.kt")
+                public void testSpecialCallsWithLambdas() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt");
+                }
+            }
+
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes")
             @TestDataPath("$PROJECT_ROOT")
@@ -28208,6 +28294,96 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava15 extends AbstractFirDiagnosticTest {
+            @Test
+            public void testAllFilesPresentInTestsWithJava15() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord")
+            @TestDataPath("$PROJECT_ROOT")
+            public class JvmRecord extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInJvmRecord() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("diagnostics.kt")
+                public void testDiagnostics() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt");
+                }
+
+                @Test
+                @TestMetadata("disabledFeature.kt")
+                public void testDisabledFeature() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt");
+                }
+
+                @Test
+                @TestMetadata("irrelevantFields.kt")
+                public void testIrrelevantFields() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt");
+                }
+
+                @Test
+                @TestMetadata("jvmRecordDescriptorStructure.kt")
+                public void testJvmRecordDescriptorStructure() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt");
+                }
+
+                @Test
+                @TestMetadata("simpleRecords.kt")
+                public void testSimpleRecords() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt");
+                }
+
+                @Test
+                @TestMetadata("supertypesCheck.kt")
+                public void testSupertypesCheck() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            public class SealedClasses extends AbstractFirDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInSealedClasses() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("javaSealedClassExhaustiveness.kt")
+                public void testJavaSealedClassExhaustiveness() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt");
+                }
+
+                @Test
+                @TestMetadata("javaSealedInterfaceExhaustiveness.kt")
+                public void testJavaSealedInterfaceExhaustiveness() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt");
+                }
+
+                @Test
+                @TestMetadata("kotlinInheritsJavaClass.kt")
+                public void testKotlinInheritsJavaClass() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt");
+                }
+
+                @Test
+                @TestMetadata("kotlinInheritsJavaInterface.kt")
+                public void testKotlinInheritsJavaInterface() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt");
+                }
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
@@ -28557,6 +28733,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.kt");
             }
 
+            @Test
+            @TestMetadata("boundsViolationRecursive.kt")
+            public void testBoundsViolationRecursive() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.kt");
+            }
+
             @Test
             @TestMetadata("capturingTypeParametersFromOuterClass.kt")
             public void testCapturingTypeParametersFromOuterClass() throws Exception {
@@ -28731,6 +28913,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/typealias/kt14518.kt");
             }
 
+            @Test
+            @TestMetadata("kt14612.kt")
+            public void testKt14612() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/kt14612.kt");
+            }
+
             @Test
             @TestMetadata("kt14641.kt")
             public void testKt14641() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt
deleted file mode 100644
index 7349332a74d..00000000000
--- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/AbstractFirResolveTestCaseWithStdlib.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2018 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
-
-import org.jetbrains.kotlin.test.ConfigurationKind
-
-abstract class AbstractFirDiagnosticsWithStdlibTest : AbstractFirDiagnosticsTest() {
-
-    override fun extractConfigurationKind(files: List<TestFile>): ConfigurationKind {
-        return ConfigurationKind.ALL
-    }
-}
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
index 7ce2f17043d..2b5a7f6f0d4 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
@@ -288,12 +288,12 @@ private fun FirDeclaration.hasBody(): Boolean = when (this) {
  */
 fun FirClass<*>.findNonInterfaceSupertype(context: CheckerContext): FirTypeRef? {
     for (it in superTypeRefs) {
-        val classId = it.safeAs<FirResolvedTypeRef>()
+        val lookupTag = it.safeAs<FirResolvedTypeRef>()
             ?.type.safeAs<ConeClassLikeType>()
-            ?.lookupTag?.classId
+            ?.lookupTag
             ?: continue
 
-        val fir = context.session.firSymbolProvider.getClassLikeSymbolByFqName(classId)
+        val fir = lookupTag.toSymbol(context.session)
             ?.fir.safeAs<FirClass<*>>()
             ?: continue
 
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedClassConstructorCallChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedClassConstructorCallChecker.kt
index d6610c355e0..1a014103fec 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedClassConstructorCallChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedClassConstructorCallChecker.kt
@@ -13,13 +13,11 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
-import org.jetbrains.kotlin.fir.declarations.classId
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
-import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() {
@@ -29,13 +27,10 @@ object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() {
             ?.fir.safeAs<FirConstructor>()
             ?: return
 
-        val typeClassId = constructorFir.returnTypeRef.safeAs<FirResolvedTypeRef>()
+        val typeFir = constructorFir.returnTypeRef.safeAs<FirResolvedTypeRef>()
             ?.type.safeAs<ConeClassLikeType>()
-            ?.lookupTag
-            ?.classId
-            ?: return
-
-        val typeFir = typeClassId.toRegularClass(context)
+            ?.lookupTag?.toSymbol(context.session)
+            ?.fir as? FirRegularClass
             ?: return
 
         if (typeFir.status.modality == Modality.SEALED) {
@@ -43,15 +38,6 @@ object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() {
         }
     }
 
-    private fun ClassId.toRegularClass(context: CheckerContext): FirRegularClass? = if (!isLocal) {
-        context.session.firSymbolProvider.getClassLikeSymbolByFqName(this)
-            ?.fir.safeAs()
-    } else {
-        context.containingDeclarations
-            .lastOrNull { it.safeAs<FirRegularClass>()?.classId == this }
-            .safeAs()
-    }
-
     private fun DiagnosticReporter.report(source: FirSourceElement?) {
         source?.let { report(FirErrors.SEALED_CLASS_CONSTRUCTOR_CALL.on(it)) }
     }
diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts
index 78323a18eb1..df30ec3e8b2 100644
--- a/compiler/fir/fir2ir/build.gradle.kts
+++ b/compiler/fir/fir2ir/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(projectTests(":compiler:fir:analysis-tests"))
+    testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testApi(project(":compiler:resolution.common"))
 
     testCompileOnly(project(":kotlin-reflect-api"))
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt
new file mode 100644
index 00000000000..058449161fa
--- /dev/null
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendExtension.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2020 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.backend.jvm
+
+import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
+import org.jetbrains.kotlin.backend.jvm.JvmBackendExtension
+import org.jetbrains.kotlin.backend.jvm.codegen.MetadataSerializer
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings
+import org.jetbrains.kotlin.config.JvmAbiStability
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames
+import org.jetbrains.org.objectweb.asm.Type
+
+class FirJvmBackendExtension(private val session: FirSession, private val components: Fir2IrComponents) : JvmBackendExtension {
+    override fun createSerializer(
+        context: JvmBackendContext,
+        klass: IrClass,
+        type: Type,
+        bindings: JvmSerializationBindings,
+        parentSerializer: MetadataSerializer?
+    ): MetadataSerializer {
+        return FirMetadataSerializer(session, context, klass, bindings, components, parentSerializer)
+    }
+
+    override fun generateMetadataExtraFlags(abiStability: JvmAbiStability?): Int =
+        JvmAnnotationNames.METADATA_JVM_IR_FLAG or
+                JvmAnnotationNames.METADATA_FIR_FLAG or
+                (if (abiStability == JvmAbiStability.STABLE) JvmAnnotationNames.METADATA_JVM_IR_STABLE_ABI_FLAG else 0)
+}
diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
index 689fcfc4309..ab8b39b178f 100644
--- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
+++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.types.model.SimpleTypeMarker
 import org.jetbrains.kotlin.types.model.TypeConstructorMarker
 import org.jetbrains.kotlin.types.model.TypeParameterMarker
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.org.objectweb.asm.Type
 
 class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext<JvmSignatureWriter>, FirSessionComponent {
@@ -189,7 +190,8 @@ val FirSession.jvmTypeMapper: FirJvmTypeMapper by FirSession.sessionComponentAcc
 class ConeTypeSystemCommonBackendContextForTypeMapping(
     val context: ConeTypeContext
 ) : TypeSystemCommonBackendContext by context, TypeSystemCommonBackendContextForTypeMapping {
-    private val symbolProvider = context.session.firSymbolProvider
+    private val session = context.session
+    private val symbolProvider = session.firSymbolProvider
 
     override fun TypeConstructorMarker.isTypeParameter(): Boolean {
         return this is ConeTypeParameterLookupTag
@@ -200,7 +202,7 @@ class ConeTypeSystemCommonBackendContextForTypeMapping(
         return when (this) {
             is ConeTypeParameterLookupTag -> ConeTypeParameterTypeImpl(this, isNullable = false)
             is ConeClassLikeLookupTag -> {
-                val symbol = symbolProvider.getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol
+                val symbol = toSymbol(session) as? FirRegularClassSymbol
                     ?: error("Class for $this not found")
                 symbol.fir.defaultType()
             }
@@ -210,7 +212,7 @@ class ConeTypeSystemCommonBackendContextForTypeMapping(
 
     override fun SimpleTypeMarker.isSuspendFunction(): Boolean {
         require(this is ConeSimpleKotlinType)
-        return isSuspendFunctionType(context.session)
+        return isSuspendFunctionType(session)
     }
 
     override fun SimpleTypeMarker.isKClass(): Boolean {
@@ -234,8 +236,8 @@ class ConeTypeSystemCommonBackendContextForTypeMapping(
         require(this is ConeTypeParameterLookupTag)
         val bounds = this.typeParameterSymbol.fir.bounds.map { it.coneType }
         return bounds.firstOrNull {
-            val classId = it.classId ?: return@firstOrNull false
-            val classSymbol = symbolProvider.getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol ?: return@firstOrNull false
+            val classSymbol = it.safeAs<ConeClassLikeType>()?.fullyExpandedType(session)
+                ?.lookupTag?.toSymbol(session) as? FirRegularClassSymbol ?: return@firstOrNull false
             val kind = classSymbol.fir.classKind
             kind != ClassKind.INTERFACE && kind != ClassKind.ANNOTATION_CLASS
         } ?: bounds.first()
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
index d34e472b1b6..6e8e5916690 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt
@@ -35,13 +35,13 @@ import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedReceiverParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrConstKind
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.types.impl.IrErrorTypeImpl
 import org.jetbrains.kotlin.ir.util.SymbolTable
@@ -331,22 +331,15 @@ internal fun IrDeclarationParent.declareThisReceiverParameter(
     thisOrigin: IrDeclarationOrigin,
     startOffset: Int = this.startOffset,
     endOffset: Int = this.endOffset
-): IrValueParameter {
-    val receiverDescriptor = WrappedReceiverParameterDescriptor()
-    return symbolTable.declareValueParameter(
-        startOffset, endOffset, thisOrigin, receiverDescriptor, thisType
-    ) { symbol ->
-        symbolTable.irFactory.createValueParameter(
-            startOffset, endOffset, thisOrigin, symbol,
-            Name.special("<this>"), UNDEFINED_PARAMETER_INDEX, thisType,
-            varargElementType = null, isCrossinline = false, isNoinline = false,
-            isHidden = false, isAssignable = false
-        ).apply {
-            this.parent = this@declareThisReceiverParameter
-            receiverDescriptor.bind(this)
-        }
+): IrValueParameter =
+    symbolTable.irFactory.createValueParameter(
+        startOffset, endOffset, thisOrigin, IrValueParameterSymbolImpl(),
+        Name.special("<this>"), UNDEFINED_PARAMETER_INDEX, thisType,
+        varargElementType = null, isCrossinline = false, isNoinline = false,
+        isHidden = false, isAssignable = false
+    ).apply {
+        this.parent = this@declareThisReceiverParameter
     }
-}
 
 fun FirClass<*>.irOrigin(firProvider: FirProvider): IrDeclarationOrigin = when {
     firProvider.getFirClassifierContainerFileIfAny(symbol) != null -> IrDeclarationOrigin.DEFINED
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ExternalPackageParentPatcher.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ExternalPackageParentPatcher.kt
new file mode 100644
index 00000000000..274b3a2069d
--- /dev/null
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ExternalPackageParentPatcher.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2020 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.backend
+
+import org.jetbrains.kotlin.ir.IrElement
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
+import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
+import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
+import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
+
+// TODO: could be a lowering
+internal class ExternalPackageParentPatcher(private val stubGenerator: DeclarationStubGenerator) : IrElementVisitorVoid {
+    override fun visitElement(element: IrElement) {
+        element.acceptChildrenVoid(this)
+    }
+
+    override fun visitMemberAccess(expression: IrMemberAccessExpression<*>) {
+        super.visitMemberAccess(expression)
+        val callee = expression.symbol.owner as? IrDeclaration ?: return
+        if (callee.parent is IrExternalPackageFragment) {
+            @OptIn(ObsoleteDescriptorBasedAPI::class)
+            val parentClass = stubGenerator.generateOrGetFacadeClass(callee.descriptor) ?: return
+            callee.parent = parentClass
+            when (callee) {
+                is IrProperty -> handleProperty(callee, parentClass)
+                is IrSimpleFunction -> callee.correspondingPropertySymbol?.owner?.let { handleProperty(it, parentClass) }
+            }
+        }
+    }
+
+    private fun handleProperty(property: IrProperty, newParent: IrClass) {
+        property.parent = newParent
+        property.getter?.parent = newParent
+        property.setter?.parent = newParent
+        property.backingField?.parent = newParent
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
index 02e48d99049..3b8ba3a879a 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrClassifierStorage.kt
@@ -12,31 +12,28 @@ import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyClass
 import org.jetbrains.kotlin.fir.resolve.firProvider
+import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.toSymbol
-import org.jetbrains.kotlin.fir.symbols.Fir2IrClassSymbol
-import org.jetbrains.kotlin.fir.symbols.Fir2IrEnumEntrySymbol
-import org.jetbrains.kotlin.fir.symbols.Fir2IrTypeAliasSymbol
-import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.fir.symbols.*
 import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedEnumEntryDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedTypeAliasDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedTypeParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.impl.IrEnumConstructorCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrEnumEntrySymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeAliasSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrEnumEntrySymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrTypeAliasSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrTypeParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
 class Fir2IrClassifierStorage(
@@ -143,11 +140,8 @@ class Fir2IrClassifierStorage(
         }
     }
 
-    internal fun getCachedLocalClass(classId: ClassId): IrClass? {
-        require(classId.isLocal) {
-            "As the function name implies, it ought to be used to look up _local_ classes."
-        }
-        return localStorage.getLocalClass(classId)
+    internal fun getCachedLocalClass(lookupTag: ConeClassLikeLookupTag): IrClass? {
+        return localStorage.getLocalClass(lookupTag.toSymbol(session)!!.fir as FirClass<*>)
     }
 
     private fun FirRegularClass.enumClassModality(): Modality {
@@ -183,13 +177,11 @@ class Fir2IrClassifierStorage(
         return irClass
     }
 
-    private fun declareIrTypeAlias(signature: IdSignature?, factory: (IrTypeAliasSymbol) -> IrTypeAlias): IrTypeAlias {
-        if (signature == null) {
-            val descriptor = WrappedTypeAliasDescriptor()
-            return symbolTable.declareTypeAlias(descriptor, factory).apply { descriptor.bind(this) }
-        }
-        return symbolTable.declareTypeAlias(signature, { Fir2IrTypeAliasSymbol(signature) }, factory)
-    }
+    private fun declareIrTypeAlias(signature: IdSignature?, factory: (IrTypeAliasSymbol) -> IrTypeAlias): IrTypeAlias =
+        if (signature == null)
+            factory(IrTypeAliasSymbolImpl())
+        else
+            symbolTable.declareTypeAlias(signature, { Fir2IrTypeAliasSymbol(signature) }, factory)
 
     fun registerTypeAlias(
         typeAlias: FirTypeAlias,
@@ -217,13 +209,11 @@ class Fir2IrClassifierStorage(
 
     internal fun getCachedTypeAlias(firTypeAlias: FirTypeAlias): IrTypeAlias? = typeAliasCache[firTypeAlias]
 
-    private fun declareIrClass(signature: IdSignature?, factory: (IrClassSymbol) -> IrClass): IrClass {
-        if (signature == null) {
-            val descriptor = WrappedClassDescriptor()
-            return symbolTable.declareClass(descriptor, factory).apply { descriptor.bind(this) }
-        }
-        return symbolTable.declareClass(signature, { Fir2IrClassSymbol(signature) }, factory)
-    }
+    private fun declareIrClass(signature: IdSignature?, factory: (IrClassSymbol) -> IrClass): IrClass =
+        if (signature == null)
+            factory(IrClassSymbolImpl())
+        else
+            symbolTable.declareClass(signature, { Fir2IrClassSymbol(signature) }, factory)
 
     fun registerIrClass(
         regularClass: FirRegularClass,
@@ -311,20 +301,15 @@ class Fir2IrClassifierStorage(
         typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT
     ): IrTypeParameter {
         require(index >= 0)
-        val descriptor = WrappedTypeParameterDescriptor()
         val origin = IrDeclarationOrigin.DEFINED
         val irTypeParameter = with(typeParameter) {
             convertWithOffsets { startOffset, endOffset ->
-                symbolTable.declareGlobalTypeParameter(startOffset, endOffset, origin, descriptor) { symbol ->
-                    irFactory.createTypeParameter(
-                        startOffset, endOffset, origin, symbol,
-                        name, if (index < 0) 0 else index,
-                        isReified,
-                        variance
-                    ).apply {
-                        descriptor.bind(this)
-                    }
-                }
+                irFactory.createTypeParameter(
+                    startOffset, endOffset, origin, IrTypeParameterSymbolImpl(),
+                    name, if (index < 0) 0 else index,
+                    isReified,
+                    variance
+                )
             }
         }
 
@@ -381,13 +366,11 @@ class Fir2IrClassifierStorage(
 
     internal fun getCachedIrEnumEntry(enumEntry: FirEnumEntry): IrEnumEntry? = enumEntryCache[enumEntry]
 
-    private fun declareIrEnumEntry(signature: IdSignature?, factory: (IrEnumEntrySymbol) -> IrEnumEntry): IrEnumEntry {
-        if (signature == null) {
-            val descriptor = WrappedEnumEntryDescriptor()
-            return symbolTable.declareEnumEntry(0, 0, IrDeclarationOrigin.DEFINED, descriptor, factory).apply { descriptor.bind(this) }
-        }
-        return symbolTable.declareEnumEntry(signature, { Fir2IrEnumEntrySymbol(signature) }, factory)
-    }
+    private fun declareIrEnumEntry(signature: IdSignature?, factory: (IrEnumEntrySymbol) -> IrEnumEntry): IrEnumEntry =
+        if (signature == null)
+            factory(IrEnumEntrySymbolImpl())
+        else
+            symbolTable.declareEnumEntry(signature, { Fir2IrEnumEntrySymbol(signature) }, factory)
 
     fun createIrEnumEntry(
         enumEntry: FirEnumEntry,
@@ -452,7 +435,8 @@ class Fir2IrClassifierStorage(
         firClass as FirRegularClass
         val classId = firClassSymbol.classId
         val parentId = classId.outerClassId
-        val irParent = declarationStorage.findIrParent(classId.packageFqName, parentId, firClassSymbol)!!
+        val parentClass = parentId?.let { session.firSymbolProvider.getClassLikeSymbolByFqName(it) }
+        val irParent = declarationStorage.findIrParent(classId.packageFqName, parentClass?.toLookupTag(), firClassSymbol)!!
         val symbol = Fir2IrClassSymbol(signature)
         val irClass = firClass.convertWithOffsets { startOffset, endOffset ->
             symbolTable.declareClass(signature, { symbol }) {
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
index 00f385371b7..58134b80893 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrModuleFragmentImpl
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
 import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.visitors.acceptVoid
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi2ir.PsiSourceManager
@@ -318,14 +318,7 @@ class Fir2IrConverter(
 
             externalDependenciesGenerator.generateUnboundSymbolsAsDependencies()
             val stubGenerator = irProviders.filterIsInstance<DeclarationStubGenerator>().first()
-            for (descriptor in symbolTable.wrappedTopLevelCallableDescriptors()) {
-                val parentClass = stubGenerator.generateOrGetFacadeClass(descriptor as WrappedDeclarationDescriptor<*>)
-                val owner = descriptor.owner
-                owner.parent = parentClass ?: continue
-                if (owner is IrProperty) {
-                    owner.backingField?.parent = parentClass
-                }
-            }
+            irModuleFragment.acceptVoid(ExternalPackageParentPatcher(stubGenerator))
 
             evaluateConstants(irModuleFragment)
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
index 1b2734c6a2b..f2b35fd9b4c 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
@@ -19,15 +19,17 @@ import org.jetbrains.kotlin.fir.descriptors.FirModuleDescriptor
 import org.jetbrains.kotlin.fir.descriptors.FirPackageFragmentDescriptor
 import org.jetbrains.kotlin.fir.expressions.FirConstExpression
 import org.jetbrains.kotlin.fir.expressions.FirExpression
+import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess
 import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyClass
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyConstructor
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazyProperty
 import org.jetbrains.kotlin.fir.lazy.Fir2IrLazySimpleFunction
+import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.resolve.firProvider
-import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.inference.isSuspendFunctionType
 import org.jetbrains.kotlin.fir.resolve.isKFunctionInvoke
+import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.*
 import org.jetbrains.kotlin.fir.symbols.impl.*
 import org.jetbrains.kotlin.fir.types.*
@@ -42,11 +44,11 @@ import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrSyntheticBodyKind
 import org.jetbrains.kotlin.ir.expressions.impl.IrErrorExpressionImpl
 import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.ir.symbols.impl.*
 import org.jetbrains.kotlin.ir.types.IrErrorType
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
@@ -58,8 +60,6 @@ class Fir2IrDeclarationStorage(
     private val moduleDescriptor: FirModuleDescriptor
 ) : Fir2IrComponents by components {
 
-    private val firSymbolProvider = session.firSymbolProvider
-
     private val firProvider = session.firProvider
 
     private val fragmentCache = mutableMapOf<FqName, IrExternalPackageFragment>()
@@ -198,11 +198,11 @@ class Fir2IrDeclarationStorage(
         }
     }
 
-    private fun findIrClass(classId: ClassId): IrClass? =
-        if (classId.isLocal) {
-            classifierStorage.getCachedLocalClass(classId)
+    private fun findIrClass(lookupTag: ConeClassLikeLookupTag): IrClass? =
+        if (lookupTag.classId.isLocal) {
+            classifierStorage.getCachedLocalClass(lookupTag)
         } else {
-            val firSymbol = firSymbolProvider.getClassLikeSymbolByFqName(classId)
+            val firSymbol = lookupTag.toSymbol(session)
             if (firSymbol is FirClassSymbol) {
                 classifierStorage.getIrClassSymbol(firSymbol).owner
             } else {
@@ -210,9 +210,13 @@ class Fir2IrDeclarationStorage(
             }
         }
 
-    internal fun findIrParent(packageFqName: FqName, parentClassId: ClassId?, firBasedSymbol: FirBasedSymbol<*>): IrDeclarationParent? {
-        return if (parentClassId != null) {
-            findIrClass(parentClassId)
+    internal fun findIrParent(
+        packageFqName: FqName,
+        parentLookupTag: ConeClassLikeLookupTag?,
+        firBasedSymbol: FirBasedSymbol<*>
+    ): IrDeclarationParent? {
+        return if (parentLookupTag != null) {
+            findIrClass(parentLookupTag)
         } else {
             val containerFile = when (firBasedSymbol) {
                 is FirCallableSymbol -> firProvider.getFirCallableContainerFile(firBasedSymbol)
@@ -233,7 +237,7 @@ class Fir2IrDeclarationStorage(
     internal fun findIrParent(callableDeclaration: FirCallableDeclaration<*>): IrDeclarationParent? {
         val firBasedSymbol = callableDeclaration.symbol
         val callableId = firBasedSymbol.callableId
-        return findIrParent(callableId.packageName, callableDeclaration.containingClass()?.classId, firBasedSymbol)
+        return findIrParent(callableId.packageName, callableDeclaration.containingClass(), firBasedSymbol)
     }
 
     private fun IrDeclaration.setAndModifyParent(irParent: IrDeclarationParent?) {
@@ -261,20 +265,14 @@ class Fir2IrDeclarationStorage(
         type: IrType,
         parent: IrFunction
     ): IrValueParameter {
-        val descriptor = WrappedValueParameterDescriptor()
-        return symbolTable.declareValueParameter(
-            startOffset, endOffset, origin, descriptor, type
-        ) { symbol ->
-            irFactory.createValueParameter(
-                startOffset, endOffset, IrDeclarationOrigin.DEFINED, symbol,
-                Name.special("<set-?>"), 0, type,
-                varargElementType = null,
-                isCrossinline = false, isNoinline = false,
-                isHidden = false, isAssignable = false
-            ).apply {
-                this.parent = parent
-                descriptor.bind(this)
-            }
+        return irFactory.createValueParameter(
+            startOffset, endOffset, IrDeclarationOrigin.DEFINED, IrValueParameterSymbolImpl(),
+            Name.special("<set-?>"), 0, type,
+            varargElementType = null,
+            isCrossinline = false, isNoinline = false,
+            isHidden = false, isAssignable = false
+        ).apply {
+            this.parent = parent
         }
     }
 
@@ -357,9 +355,7 @@ class Fir2IrDeclarationStorage(
         isStatic: Boolean,
         parentPropertyReceiverType: FirTypeRef? = null
     ): T {
-        if (irParent != null) {
-            parent = irParent
-        }
+        setAndModifyParent(irParent)
         declareParameters(function, thisReceiverOwner, isStatic, parentPropertyReceiverType)
         return this
     }
@@ -403,13 +399,12 @@ class Fir2IrDeclarationStorage(
         signature: IdSignature?,
         containerSource: DeserializedContainerSource?,
         factory: (IrSimpleFunctionSymbol) -> IrSimpleFunction
-    ): IrSimpleFunction {
+    ): IrSimpleFunction =
         if (signature == null) {
-            val descriptor = WrappedSimpleFunctionDescriptor()
-            return symbolTable.declareSimpleFunction(descriptor, factory).apply { descriptor.bind(this) }
+            factory(IrSimpleFunctionSymbolImpl())
+        } else {
+            symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory)
         }
-        return symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory)
-    }
 
     fun getOrCreateIrFunction(
         function: FirSimpleFunction,
@@ -515,13 +510,12 @@ class Fir2IrDeclarationStorage(
         }
     }
 
-    private fun declareIrConstructor(signature: IdSignature?, factory: (IrConstructorSymbol) -> IrConstructor): IrConstructor {
-        if (signature == null) {
-            val descriptor = WrappedClassConstructorDescriptor()
-            return symbolTable.declareConstructor(descriptor, factory).apply { descriptor.bind(this) }
-        }
-        return symbolTable.declareConstructor(signature, { Fir2IrConstructorSymbol(signature) }, factory)
-    }
+    private fun declareIrConstructor(signature: IdSignature?, factory: (IrConstructorSymbol) -> IrConstructor): IrConstructor =
+        if (signature == null)
+            factory(IrConstructorSymbolImpl())
+        else
+            symbolTable.declareConstructor(signature, { Fir2IrConstructorSymbol(signature) }, factory)
+
 
     fun createIrConstructor(
         constructor: FirConstructor,
@@ -554,17 +548,12 @@ class Fir2IrDeclarationStorage(
     private fun declareIrAccessor(
         signature: IdSignature?,
         containerSource: DeserializedContainerSource?,
-        isGetter: Boolean,
         factory: (IrSimpleFunctionSymbol) -> IrSimpleFunction
-    ): IrSimpleFunction {
-        if (signature == null) {
-            val descriptor =
-                if (isGetter) WrappedPropertyGetterDescriptor()
-                else WrappedPropertySetterDescriptor()
-            return symbolTable.declareSimpleFunction(descriptor, factory).apply { descriptor.bind(this) }
-        }
-        return symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory)
-    }
+    ): IrSimpleFunction =
+        if (signature == null)
+            factory(IrSimpleFunctionSymbolImpl())
+        else
+            symbolTable.declareSimpleFunction(signature, { Fir2IrSimpleFunctionSymbol(signature, containerSource) }, factory)
 
     internal fun createIrPropertyAccessor(
         propertyAccessor: FirPropertyAccessor?,
@@ -585,8 +574,7 @@ class Fir2IrDeclarationStorage(
         val containerSource = (correspondingProperty as? IrProperty)?.containerSource
         return declareIrAccessor(
             signature,
-            containerSource,
-            isGetter = !isSetter
+            containerSource
         ) { symbol ->
             val accessorReturnType = if (isSetter) irBuiltIns.unitType else propertyType
             val visibility = propertyAccessor?.visibility?.let {
@@ -684,15 +672,11 @@ class Fir2IrDeclarationStorage(
         signature: IdSignature?,
         containerSource: DeserializedContainerSource?,
         factory: (IrPropertySymbol) -> IrProperty
-    ): IrProperty {
-        if (signature == null) {
-            val descriptor = WrappedPropertyDescriptor()
-            return symbolTable.declareProperty(0, 0, IrDeclarationOrigin.DEFINED, descriptor, isDelegated = false, factory).apply {
-                descriptor.bind(this)
-            }
-        }
-        return symbolTable.declareProperty(signature, { Fir2IrPropertySymbol(signature, containerSource) }, factory)
-    }
+    ): IrProperty =
+        if (signature == null)
+            factory(IrPropertySymbolImpl())
+        else
+            symbolTable.declareProperty(signature, { Fir2IrPropertySymbol(signature, containerSource) }, factory)
 
     fun getOrCreateIrProperty(
         property: FirProperty,
@@ -739,6 +723,12 @@ class Fir2IrDeclarationStorage(
         containingClass: ConeClassLikeLookupTag? = null,
     ): IrProperty {
         classifierStorage.preCacheTypeParameters(property)
+        if (property.delegate != null) {
+            val delegateReference = (property.delegate as? FirQualifiedAccess)?.calleeReference as? FirResolvedNamedReference
+            (delegateReference?.resolvedSymbol?.fir as? FirTypeParameterRefsOwner)?.let {
+                classifierStorage.preCacheTypeParameters(it)
+            }
+        }
         val signature = if (isLocal) null else signatureComposer.composeSignature(property, containingClass)
         return property.convertWithOffsets { startOffset, endOffset ->
             val result = declareIrProperty(signature, property.containerSource) { symbol ->
@@ -852,28 +842,21 @@ class Fir2IrDeclarationStorage(
         field: FirField,
         origin: IrDeclarationOrigin = IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB
     ): IrField {
-        val descriptor = WrappedFieldDescriptor()
         val type = field.returnTypeRef.toIrType()
         return field.convertWithOffsets { startOffset, endOffset ->
-            symbolTable.declareField(
-                startOffset, endOffset,
-                origin, descriptor, type
-            ) { symbol ->
-                irFactory.createField(
-                    startOffset, endOffset, origin, symbol,
-                    field.name, type, components.visibilityConverter.convertToDescriptorVisibility(field.visibility),
-                    isFinal = field.modality == Modality.FINAL,
-                    isExternal = false,
-                    isStatic = field.isStatic
-                ).apply {
-                    field.initializer?.let {
-                        val expression = visitor.convertToIrExpression(it)
-                        expression.type = type
-                        initializer = irFactory.createExpressionBody(expression)
-                    }
-                    descriptor.bind(this)
-                    fieldCache[field] = this
+            irFactory.createField(
+                startOffset, endOffset, origin, IrFieldSymbolImpl(),
+                field.name, type, components.visibilityConverter.convertToDescriptorVisibility(field.visibility),
+                isFinal = field.modality == Modality.FINAL,
+                isExternal = false,
+                isStatic = field.isStatic
+            ).apply {
+                field.initializer?.let {
+                    val expression = visitor.convertToIrExpression(it)
+                    expression.type = type
+                    initializer = irFactory.createExpressionBody(expression)
                 }
+                fieldCache[field] = this
             }
         }
     }
@@ -884,33 +867,27 @@ class Fir2IrDeclarationStorage(
         useStubForDefaultValueStub: Boolean = true,
         typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT
     ): IrValueParameter {
-        val descriptor = WrappedValueParameterDescriptor()
         val origin = IrDeclarationOrigin.DEFINED
         val type = valueParameter.returnTypeRef.toIrType()
         val irParameter = valueParameter.convertWithOffsets { startOffset, endOffset ->
-            symbolTable.declareValueParameter(
-                startOffset, endOffset, origin, descriptor, type
-            ) { symbol ->
-                irFactory.createValueParameter(
-                    startOffset, endOffset, origin, symbol,
-                    valueParameter.name, index, type,
-                    if (!valueParameter.isVararg) null
-                    else valueParameter.returnTypeRef.coneType.arrayElementType()?.toIrType(typeContext),
-                    isCrossinline = valueParameter.isCrossinline, isNoinline = valueParameter.isNoinline,
-                    isHidden = false, isAssignable = false
-                ).apply {
-                    descriptor.bind(this)
-                    if (valueParameter.defaultValue.let {
-                            it != null && (useStubForDefaultValueStub || it !is FirExpressionStub)
-                        }
-                    ) {
-                        this.defaultValue = factory.createExpressionBody(
-                            IrErrorExpressionImpl(
-                                UNDEFINED_OFFSET, UNDEFINED_OFFSET, type,
-                                "Stub expression for default value of ${valueParameter.name}"
-                            )
-                        )
+            irFactory.createValueParameter(
+                startOffset, endOffset, origin, IrValueParameterSymbolImpl(),
+                valueParameter.name, index, type,
+                if (!valueParameter.isVararg) null
+                else valueParameter.returnTypeRef.coneType.arrayElementType()?.toIrType(typeContext),
+                isCrossinline = valueParameter.isCrossinline, isNoinline = valueParameter.isNoinline,
+                isHidden = false, isAssignable = false
+            ).apply {
+                if (valueParameter.defaultValue.let {
+                        it != null && (useStubForDefaultValueStub || it !is FirExpressionStub)
                     }
+                ) {
+                    this.defaultValue = factory.createExpressionBody(
+                        IrErrorExpressionImpl(
+                            UNDEFINED_OFFSET, UNDEFINED_OFFSET, type,
+                            "Stub expression for default value of ${valueParameter.name}"
+                        )
+                    )
                 }
             }
         }
@@ -930,17 +907,11 @@ class Fir2IrDeclarationStorage(
         startOffset: Int, endOffset: Int,
         origin: IrDeclarationOrigin, name: Name, type: IrType,
         isVar: Boolean, isConst: Boolean, isLateinit: Boolean
-    ): IrVariable {
-        val descriptor = WrappedVariableDescriptor()
-        return symbolTable.declareVariable(startOffset, endOffset, origin, descriptor, type) { symbol ->
-            IrVariableImpl(
-                startOffset, endOffset, origin, symbol, name, type,
-                isVar, isConst, isLateinit
-            ).apply {
-                descriptor.bind(this)
-            }
-        }
-    }
+    ): IrVariable =
+        IrVariableImpl(
+            startOffset, endOffset, origin, IrVariableSymbolImpl(), name, type,
+            isVar, isConst, isLateinit
+        )
 
     fun createIrVariable(variable: FirVariable<*>, irParent: IrDeclarationParent, givenOrigin: IrDeclarationOrigin? = null): IrVariable {
         val type = variable.returnTypeRef.toIrType()
@@ -967,12 +938,15 @@ class Fir2IrDeclarationStorage(
         val type = property.returnTypeRef.toIrType()
         val origin = IrDeclarationOrigin.DEFINED
         val irProperty = property.convertWithOffsets { startOffset, endOffset ->
-            val descriptor = WrappedVariableDescriptorWithAccessor()
-            symbolTable.declareLocalDelegatedProperty(startOffset, endOffset, origin, descriptor, type) {
-                irFactory.createLocalDelegatedProperty(startOffset, endOffset, origin, it, property.name, type, property.isVar).apply {
-                    descriptor.bind(this)
-                }
-            }
+            irFactory.createLocalDelegatedProperty(
+                startOffset,
+                endOffset,
+                origin,
+                IrLocalDelegatedPropertySymbolImpl(),
+                property.name,
+                type,
+                property.isVar
+            )
         }.apply {
             parent = irParent
             metadata = FirMetadataSource.Property(property)
@@ -1041,9 +1015,7 @@ class Fir2IrDeclarationStorage(
                 val irParent = findIrParent(fir)
                 val parentOrigin = (irParent as? IrDeclaration)?.origin ?: IrDeclarationOrigin.DEFINED
                 val declarationOrigin = computeDeclarationOrigin(firFunctionSymbol, parentOrigin, irParent)
-                createIrFunction(fir, irParent, origin = declarationOrigin).apply {
-                    setAndModifyParent(irParent)
-                }.symbol
+                createIrFunction(fir, irParent, origin = declarationOrigin).symbol
             }
             is FirSimpleFunction -> {
                 return getIrCallableSymbol(
@@ -1150,7 +1122,7 @@ class Fir2IrDeclarationStorage(
         parentOrigin: IrDeclarationOrigin,
         irParent: IrDeclarationParent?
     ): IrDeclarationOrigin {
-        return if (irParent.isSourceClass() && symbol.fir.isIntersectionOverride)
+        return if (irParent.isSourceClass() && (symbol.fir.isIntersectionOverride || symbol.fir.isSubstitutionOverride))
             IrDeclarationOrigin.FAKE_OVERRIDE
         else
             parentOrigin
@@ -1160,8 +1132,12 @@ class Fir2IrDeclarationStorage(
 
     fun getIrFieldSymbol(firFieldSymbol: FirFieldSymbol): IrSymbol {
         val fir = firFieldSymbol.fir
-        val irProperty = fieldCache[fir] ?: createIrField(fir).apply {
-            setAndModifyParent(findIrParent(fir))
+        val irProperty = fieldCache[fir] ?: run {
+            // In case of type parameters from the parent as the field's return type, find the parent ahead to cache type parameters.
+            val irParent = findIrParent(fir)
+            createIrField(fir).apply {
+                setAndModifyParent(irParent)
+            }
         }
         return irProperty.symbol
     }
@@ -1195,7 +1171,7 @@ class Fir2IrDeclarationStorage(
             is FirEnumEntry -> {
                 classifierStorage.getCachedIrEnumEntry(firDeclaration)?.let { return it.symbol }
                 val containingFile = firProvider.getFirCallableContainerFile(firVariableSymbol)
-                val irParentClass = firDeclaration.containingClass()?.classId?.let { findIrClass(it) }
+                val irParentClass = firDeclaration.containingClass()?.let { findIrClass(it) }
                 classifierStorage.createIrEnumEntry(
                     firDeclaration,
                     irParent = irParentClass,
@@ -1216,7 +1192,7 @@ class Fir2IrDeclarationStorage(
 
     private fun IrMutableAnnotationContainer.convertAnnotationsFromLibrary(firAnnotationContainer: FirAnnotationContainer) {
         if ((firAnnotationContainer as? FirDeclaration)?.isFromLibrary == true) {
-            annotationGenerator?.generate(this, firAnnotationContainer)
+            annotationGenerator.generate(this, firAnnotationContainer)
         }
     }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrLocalStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrLocalStorage.kt
index 68039f8c03c..4a3ae5f2515 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrLocalStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrLocalStorage.kt
@@ -39,10 +39,6 @@ class Fir2IrLocalStorage {
         return localClassCache[localClass]
     }
 
-    fun getLocalClass(classId: ClassId): IrClass? {
-        return localClassCache.entries.find { (firClass, _) -> firClass.classId == classId }?.value
-    }
-
     fun getLocalFunction(localFunction: FirFunction<*>): IrSimpleFunction? =
         last { getLocalFunction(localFunction) }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
index 79e66bca164..4633c6c2675 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt
@@ -20,8 +20,6 @@ import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
 import org.jetbrains.kotlin.ir.builders.declarations.UNDEFINED_PARAMETER_INDEX
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrBlock
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrGetValue
@@ -30,6 +28,8 @@ import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.isUnit
@@ -187,59 +187,55 @@ internal class AdapterGenerator(
     ): IrSimpleFunction {
         val returnType = type.arguments.last().typeOrNull!!
         val parameterTypes = type.arguments.dropLast(1).map { it.typeOrNull!! }
-        val adapterFunctionDescriptor = WrappedSimpleFunctionDescriptor()
-        return symbolTable.declareSimpleFunction(adapterFunctionDescriptor) { irAdapterSymbol ->
-            irFactory.createFunction(
-                startOffset, endOffset,
-                IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE,
-                irAdapterSymbol,
-                adaptee.name,
-                DescriptorVisibilities.LOCAL,
-                Modality.FINAL,
-                returnType,
-                isInline = firAdaptee.isInline,
-                isExternal = firAdaptee.isExternal,
-                isTailrec = firAdaptee.isTailRec,
-                isSuspend = firAdaptee.isSuspend || type.isSuspendFunction(),
-                isOperator = firAdaptee.isOperator,
-                isInfix = firAdaptee.isInfix,
-                isExpect = firAdaptee.isExpect,
-                isFakeOverride = false
-            ).also { irAdapterFunction ->
-                adapterFunctionDescriptor.bind(irAdapterFunction)
-                irAdapterFunction.metadata = FirMetadataSource.Function(firAdaptee)
+        return irFactory.createFunction(
+            startOffset, endOffset,
+            IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE,
+            IrSimpleFunctionSymbolImpl(),
+            adaptee.name,
+            DescriptorVisibilities.LOCAL,
+            Modality.FINAL,
+            returnType,
+            isInline = firAdaptee.isInline,
+            isExternal = firAdaptee.isExternal,
+            isTailrec = firAdaptee.isTailRec,
+            isSuspend = firAdaptee.isSuspend || type.isSuspendFunction(),
+            isOperator = firAdaptee.isOperator,
+            isInfix = firAdaptee.isInfix,
+            isExpect = firAdaptee.isExpect,
+            isFakeOverride = false
+        ).also { irAdapterFunction ->
+            irAdapterFunction.metadata = FirMetadataSource.Function(firAdaptee)
 
-                symbolTable.enterScope(irAdapterFunction)
-                irAdapterFunction.dispatchReceiverParameter = null
-                val boundReceiver = boundDispatchReceiver ?: boundExtensionReceiver
-                when {
-                    boundReceiver == null ->
-                        irAdapterFunction.extensionReceiverParameter = null
-                    boundDispatchReceiver != null && boundExtensionReceiver != null ->
-                        error("Bound callable references can't have both receivers: ${callableReferenceAccess.render()}")
-                    else ->
-                        irAdapterFunction.extensionReceiverParameter =
-                            createAdapterParameter(
-                                irAdapterFunction,
-                                Name.identifier("receiver"),
-                                index = UNDEFINED_PARAMETER_INDEX,
-                                boundReceiver.type,
-                                IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE
-                            )
-                }
-                irAdapterFunction.valueParameters += parameterTypes.mapIndexed { index, parameterType ->
-                    createAdapterParameter(
-                        irAdapterFunction,
-                        Name.identifier("p$index"),
-                        index,
-                        parameterType,
-                        IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE
-                    )
-                }
-                symbolTable.leaveScope(irAdapterFunction)
-
-                irAdapterFunction.parent = conversionScope.parent()!!
+            symbolTable.enterScope(irAdapterFunction)
+            irAdapterFunction.dispatchReceiverParameter = null
+            val boundReceiver = boundDispatchReceiver ?: boundExtensionReceiver
+            when {
+                boundReceiver == null ->
+                    irAdapterFunction.extensionReceiverParameter = null
+                boundDispatchReceiver != null && boundExtensionReceiver != null ->
+                    error("Bound callable references can't have both receivers: ${callableReferenceAccess.render()}")
+                else ->
+                    irAdapterFunction.extensionReceiverParameter =
+                        createAdapterParameter(
+                            irAdapterFunction,
+                            Name.identifier("receiver"),
+                            index = UNDEFINED_PARAMETER_INDEX,
+                            boundReceiver.type,
+                            IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE
+                        )
             }
+            irAdapterFunction.valueParameters += parameterTypes.mapIndexed { index, parameterType ->
+                createAdapterParameter(
+                    irAdapterFunction,
+                    Name.identifier("p$index"),
+                    index,
+                    parameterType,
+                    IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE
+                )
+            }
+            symbolTable.leaveScope(irAdapterFunction)
+
+            irAdapterFunction.parent = conversionScope.parent()!!
         }
     }
 
@@ -249,31 +245,23 @@ internal class AdapterGenerator(
         index: Int,
         type: IrType,
         origin: IrDeclarationOrigin
-    ): IrValueParameter {
-        val startOffset = adapterFunction.startOffset
-        val endOffset = adapterFunction.endOffset
-        val descriptor = WrappedValueParameterDescriptor()
-        return symbolTable.declareValueParameter(
-            startOffset, endOffset, origin, descriptor, type
-        ) { irAdapterParameterSymbol ->
-            irFactory.createValueParameter(
-                startOffset, endOffset,
-                origin,
-                irAdapterParameterSymbol,
-                name,
-                index,
-                type,
-                varargElementType = null,
-                isCrossinline = false,
-                isNoinline = false,
-                isHidden = false,
-                isAssignable = false
-            ).also { irAdapterValueParameter ->
-                descriptor.bind(irAdapterValueParameter)
-                irAdapterValueParameter.parent = adapterFunction
-            }
+    ): IrValueParameter =
+        irFactory.createValueParameter(
+            adapterFunction.startOffset,
+            adapterFunction.endOffset,
+            origin,
+            IrValueParameterSymbolImpl(),
+            name,
+            index,
+            type,
+            varargElementType = null,
+            isCrossinline = false,
+            isNoinline = false,
+            isHidden = false,
+            isAssignable = false
+        ).also { irAdapterValueParameter ->
+            irAdapterValueParameter.parent = adapterFunction
         }
-    }
 
     private fun IrValueDeclaration.toIrGetValue(startOffset: Int, endOffset: Int): IrGetValue =
         IrGetValueImpl(startOffset, endOffset, this.type, this.symbol)
@@ -446,55 +434,51 @@ internal class AdapterGenerator(
     ): IrSimpleFunction {
         val returnType = type.arguments.last().typeOrNull!!
         val parameterTypes = type.arguments.dropLast(1).map { it.typeOrNull!! }
-        val adapterFunctionDescriptor = WrappedSimpleFunctionDescriptor()
-        return symbolTable.declareSimpleFunction(adapterFunctionDescriptor) { irAdapterSymbol ->
-            irFactory.createFunction(
-                startOffset, endOffset,
-                IrDeclarationOrigin.ADAPTER_FOR_SUSPEND_CONVERSION,
-                irAdapterSymbol,
-                // TODO: need a better way to avoid name clash
-                Name.identifier("suspendConversion"),
-                DescriptorVisibilities.LOCAL,
-                Modality.FINAL,
-                returnType,
-                isInline = false,
-                isExternal = false,
-                isTailrec = false,
-                isSuspend = true,
-                isOperator = false,
-                isInfix = false,
-                isExpect = false,
-                isFakeOverride = false
-            ).also { irAdapterFunction ->
-                adapterFunctionDescriptor.bind(irAdapterFunction)
-                symbolTable.enterScope(irAdapterFunction)
-                irAdapterFunction.extensionReceiverParameter = createAdapterParameter(
+        return irFactory.createFunction(
+            startOffset, endOffset,
+            IrDeclarationOrigin.ADAPTER_FOR_SUSPEND_CONVERSION,
+            IrSimpleFunctionSymbolImpl(),
+            // TODO: need a better way to avoid name clash
+            Name.identifier("suspendConversion"),
+            DescriptorVisibilities.LOCAL,
+            Modality.FINAL,
+            returnType,
+            isInline = false,
+            isExternal = false,
+            isTailrec = false,
+            isSuspend = true,
+            isOperator = false,
+            isInfix = false,
+            isExpect = false,
+            isFakeOverride = false
+        ).also { irAdapterFunction ->
+            symbolTable.enterScope(irAdapterFunction)
+            irAdapterFunction.extensionReceiverParameter = createAdapterParameter(
+                irAdapterFunction,
+                Name.identifier("callee"),
+                UNDEFINED_PARAMETER_INDEX,
+                argumentType,
+                IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION
+            )
+            irAdapterFunction.valueParameters += parameterTypes.mapIndexed { index, parameterType ->
+                createAdapterParameter(
                     irAdapterFunction,
-                    Name.identifier("callee"),
-                    UNDEFINED_PARAMETER_INDEX,
-                    argumentType,
+                    Name.identifier("p$index"),
+                    index,
+                    parameterType,
                     IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION
                 )
-                irAdapterFunction.valueParameters += parameterTypes.mapIndexed { index, parameterType ->
-                    createAdapterParameter(
-                        irAdapterFunction,
-                        Name.identifier("p$index"),
-                        index,
-                        parameterType,
-                        IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION
-                    )
-                }
-                irAdapterFunction.body = irFactory.createBlockBody(startOffset, endOffset) {
-                    val irCall = createAdapteeCallForArgument(startOffset, endOffset, irAdapterFunction, invokeSymbol)
-                    if (returnType.isUnit()) {
-                        statements.add(irCall)
-                    } else {
-                        statements.add(IrReturnImpl(startOffset, endOffset, irBuiltIns.nothingType, irAdapterFunction.symbol, irCall))
-                    }
-                }
-                symbolTable.leaveScope(irAdapterFunction)
-                irAdapterFunction.parent = conversionScope.parent()!!
             }
+            irAdapterFunction.body = irFactory.createBlockBody(startOffset, endOffset) {
+                val irCall = createAdapteeCallForArgument(startOffset, endOffset, irAdapterFunction, invokeSymbol)
+                if (returnType.isUnit()) {
+                    statements.add(irCall)
+                } else {
+                    statements.add(IrReturnImpl(startOffset, endOffset, irBuiltIns.nothingType, irAdapterFunction.symbol, irCall))
+                }
+            }
+            symbolTable.leaveScope(irAdapterFunction)
+            irAdapterFunction.parent = conversionScope.parent()!!
         }
     }
 
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
index 35353eda734..b8accddf4cf 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt
@@ -17,9 +17,11 @@ import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.FirSuperReference
 import org.jetbrains.kotlin.fir.references.impl.FirReferencePlaceholderForResolvedAnnotations
 import org.jetbrains.kotlin.fir.render
+import org.jetbrains.kotlin.fir.resolve.FirSamResolverImpl
 import org.jetbrains.kotlin.fir.resolve.calls.getExpectedTypeForSAMConversion
 import org.jetbrains.kotlin.fir.resolve.calls.isFunctional
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
+import org.jetbrains.kotlin.fir.resolve.inference.inferenceComponents
 import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType
 import org.jetbrains.kotlin.fir.resolve.inference.isKMutableProperty
 import org.jetbrains.kotlin.fir.resolve.toSymbol
@@ -37,6 +39,7 @@ import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.psi2ir.generators.hasNoSideEffects
 import org.jetbrains.kotlin.types.AbstractTypeApproximator
+import org.jetbrains.kotlin.types.AbstractTypeChecker
 
 class CallAndReferenceGenerator(
     private val components: Fir2IrComponents,
@@ -46,6 +49,7 @@ class CallAndReferenceGenerator(
 
     private val approximator = object : AbstractTypeApproximator(session.typeContext) {}
     private val adapterGenerator = AdapterGenerator(components, conversionScope)
+    private val samResolver = FirSamResolverImpl(session, scopeSession)
 
     private fun FirTypeRef.toIrType(): IrType = with(typeConverter) { toIrType() }
 
@@ -613,13 +617,25 @@ class CallAndReferenceGenerator(
     }
 
     private fun needSamConversion(argument: FirExpression, parameter: FirValueParameter): Boolean {
+        // If the type of the argument is already an explicitly subtype of the type of the parameter, we don't need SAM conversion.
+        if (argument.typeRef !is FirResolvedTypeRef ||
+            AbstractTypeChecker.isSubtypeOf(
+                session.inferenceComponents.ctx,
+                argument.typeRef.coneType,
+                parameter.returnTypeRef.coneType,
+                isFromNullabilityConstraint = true
+            )
+        ) {
+            return false
+        }
         // If the expected type is a built-in functional type, we don't need SAM conversion.
         val expectedType = argument.getExpectedTypeForSAMConversion(parameter)
         if (expectedType is ConeTypeParameterType || expectedType.isBuiltinFunctionalType(session)) {
             return false
         }
-        // On the other hand, the actual type should be a functional type.
-        return argument.isFunctional(session)
+        // On the other hand, the actual type should be either a functional type or a subtype of a class that has a contributed `invoke`.
+        val expectedFunctionType = samResolver.getFunctionTypeForPossibleSamType(parameter.returnTypeRef.coneType)
+        return argument.isFunctional(session, scopeSession, expectedFunctionType)
     }
 
     private fun IrExpression.applyAssigningArrayElementsToVarargInNamedForm(
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
index 2284aa8c562..aa43ea3c266 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
@@ -49,7 +49,6 @@ internal class ClassMemberGenerator(
             if (irPrimaryConstructor != null) {
                 with(declarationStorage) {
                     enterScope(irPrimaryConstructor)
-                    irPrimaryConstructor.valueParameters.forEach { symbolTable.introduceValueParameter(it) }
                     irPrimaryConstructor.putParametersInScope(primaryConstructor)
                     convertFunctionContent(irPrimaryConstructor, primaryConstructor, containingClass = klass)
                 }
@@ -86,7 +85,6 @@ internal class ClassMemberGenerator(
                     // Scope for primary constructor should be entered before class declaration processing
                     with(declarationStorage) {
                         enterScope(irFunction)
-                        irFunction.valueParameters.forEach { symbolTable.introduceValueParameter(it) }
                         irFunction.putParametersInScope(firFunction)
                     }
                 }
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
index 6e59e9879e3..105b6b54a2c 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
@@ -30,12 +30,19 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.IrGeneratorContextBase
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
+import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.classOrNull
+import org.jetbrains.kotlin.ir.types.classifierOrNull
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.util.DataClassMembersGenerator
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound
 
 /**
  * A generator that generates synthetic members of data class as well as part of inline class.
@@ -93,21 +100,58 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
                 return components.irBuiltIns.anyType
             }
 
-            override fun commitSubstituted(irMemberAccessExpression: IrMemberAccessExpression<*>, descriptor: CallableDescriptor) {
-                // TODO
+            inner class Fir2IrHashCodeFunctionInfo(override val symbol: IrSimpleFunctionSymbol) : HashCodeFunctionInfo {
+                override fun commitSubstituted(irMemberAccessExpression: IrMemberAccessExpression<*>) {
+                    // TODO
+                }
+            }
+
+            private fun getHashCodeFunction(klass: IrClass): IrSimpleFunctionSymbol =
+                klass.functions.singleOrNull {
+                    it.name.asString() == "hashCode" && it.valueParameters.isEmpty() && it.extensionReceiverParameter == null
+                }?.symbol
+                    ?: context.irBuiltIns.anyClass.functions.single { it.owner.name.asString() == "hashCode" }
+
+
+            val IrTypeParameter.erasedUpperBound: IrClass
+                get() {
+                    // Pick the (necessarily unique) non-interface upper bound if it exists
+                    for (type in superTypes) {
+                        val irClass = type.classOrNull?.owner ?: continue
+                        if (!irClass.isInterface && !irClass.isAnnotationClass) return irClass
+                    }
+
+                    // Otherwise, choose either the first IrClass supertype or recurse.
+                    // In the first case, all supertypes are interface types and the choice was arbitrary.
+                    // In the second case, there is only a single supertype.
+                    return when (val firstSuper = superTypes.first().classifierOrNull?.owner) {
+                        is IrClass -> firstSuper
+                        is IrTypeParameter -> firstSuper.erasedUpperBound
+                        else -> error("unknown supertype kind $firstSuper")
+                    }
+                }
+
+
+            override fun getHashCodeFunctionInfo(type: IrType): HashCodeFunctionInfo {
+                val classifier = type.classifierOrNull
+                val symbol = when {
+                    classifier.isArrayOrPrimitiveArray -> context.irBuiltIns.dataClassArrayMemberHashCodeSymbol
+                    classifier is IrClassSymbol -> getHashCodeFunction(classifier.owner)
+                    classifier is IrTypeParameterSymbol -> getHashCodeFunction(classifier.owner.erasedUpperBound)
+                    else -> error("Unknown classifier kind $classifier")
+                }
+                return Fir2IrHashCodeFunctionInfo(symbol)
             }
         }
 
-        fun generateDispatchReceiverParameter(irFunction: IrFunction, valueParameterDescriptor: WrappedValueParameterDescriptor) =
+        fun generateDispatchReceiverParameter(irFunction: IrFunction) =
             irFunction.declareThisReceiverParameter(
                 components.symbolTable,
                 irClass.defaultType,
                 origin,
                 UNDEFINED_OFFSET,
                 UNDEFINED_OFFSET
-            ).apply {
-                valueParameterDescriptor.bind(this)
-            }
+            )
 
 
         private val FirSimpleFunction.matchesEqualsSignature: Boolean
@@ -133,7 +177,6 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
             val properties = irClass.declarations
                 .filterIsInstance<IrProperty>()
                 .take(propertyParametersCount)
-                .map { it.descriptor }
             if (properties.isEmpty()) {
                 return emptyList()
             }
@@ -223,7 +266,6 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
             returnType: IrType,
             otherParameterNeeded: Boolean = false
         ): IrFunction {
-            val thisReceiverDescriptor = WrappedValueParameterDescriptor()
             val firFunction = buildSimpleFunction {
                 origin = FirDeclarationOrigin.Synthetic
                 this.name = name
@@ -273,7 +315,7 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
                 }
             }.apply {
                 parent = irClass
-                dispatchReceiverParameter = generateDispatchReceiverParameter(this, thisReceiverDescriptor)
+                dispatchReceiverParameter = generateDispatchReceiverParameter(this)
                 components.irBuiltIns.anyClass.descriptor.unsubstitutedMemberScope
                     .getContributedFunctions(this.name, NoLookupLocation.FROM_BACKEND)
                     .singleOrNull { function -> function.name == this.name }
@@ -283,20 +325,13 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
             }
         }
 
-        private fun createSyntheticIrParameter(irFunction: IrFunction, name: Name, type: IrType, index: Int = 0): IrValueParameter {
-            val descriptor = WrappedValueParameterDescriptor()
-            return components.symbolTable.declareValueParameter(
-                UNDEFINED_OFFSET, UNDEFINED_OFFSET, origin, descriptor, type
-            ) { symbol ->
-                components.irFactory.createValueParameter(
-                    UNDEFINED_OFFSET, UNDEFINED_OFFSET, origin, symbol, name, index, type, null,
-                    isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false
-                )
-            }.apply {
+        private fun createSyntheticIrParameter(irFunction: IrFunction, name: Name, type: IrType, index: Int = 0): IrValueParameter =
+            components.irFactory.createValueParameter(
+                UNDEFINED_OFFSET, UNDEFINED_OFFSET, origin, IrValueParameterSymbolImpl(), name, index, type, null,
+                isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false
+            ).apply {
                 parent = irFunction
-                descriptor.bind(this)
             }
-        }
     }
 
     companion object {
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/AbstractFir2IrLazyDeclaration.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/AbstractFir2IrLazyDeclaration.kt
index 36fa739b032..2c28c04b4e2 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/AbstractFir2IrLazyDeclaration.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/AbstractFir2IrLazyDeclaration.kt
@@ -15,11 +15,11 @@ import org.jetbrains.kotlin.ir.declarations.lazy.lazyVar
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import kotlin.properties.ReadWriteProperty
 
-interface AbstractFir2IrLazyDeclaration<F : FirMemberDeclaration, D : IrSymbolOwner> :
+interface AbstractFir2IrLazyDeclaration<F : FirMemberDeclaration, D : IrDeclaration> :
     IrDeclaration, IrDeclarationParent, Fir2IrComponents {
 
     val fir: F
-    val symbol: Fir2IrBindableSymbol<*, D>
+    override val symbol: Fir2IrBindableSymbol<*, D>
 
     override val factory: IrFactory
         get() = irFactory
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
index 0e9ea949dff..21bed117bba 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/symbols/Fir2IrBindableSymbol.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.ir.symbols.IrBindableSymbol
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 
-abstract class Fir2IrBindableSymbol<out D : DeclarationDescriptor, B : IrSymbolOwner>(
+abstract class Fir2IrBindableSymbol<out D : DeclarationDescriptor, B : IrDeclaration>(
     override val signature: IdSignature,
     private val containerSource: DeserializedContainerSource? = null
 ) : IrBindableSymbol<D, B> {
@@ -34,31 +34,13 @@ abstract class Fir2IrBindableSymbol<out D : DeclarationDescriptor, B : IrSymbolO
         get() = _owner != null
 
     @ObsoleteDescriptorBasedAPI
-    override val descriptor: D by lazy {
-        val result = when (val owner = owner) {
-            is IrEnumEntry -> WrappedEnumEntryDescriptor().apply { bind(owner) }
-            is IrClass -> WrappedClassDescriptor().apply { bind(owner) }
-            is IrConstructor -> WrappedClassConstructorDescriptor().apply { bind(owner) }
-            is IrSimpleFunction -> when {
-                owner.name.isSpecial && owner.name.asString().startsWith(GETTER_PREFIX) ->
-                    WrappedPropertyGetterDescriptor()
-                owner.name.isSpecial && owner.name.asString().startsWith(SETTER_PREFIX) ->
-                    WrappedPropertySetterDescriptor()
-                else ->
-                    WrappedSimpleFunctionDescriptor()
-            }.apply { bind(owner) }
-            is IrVariable -> WrappedVariableDescriptor().apply { bind(owner) }
-            is IrValueParameter -> WrappedValueParameterDescriptor().apply { bind(owner) }
-            is IrTypeParameter -> WrappedTypeParameterDescriptor().apply { bind(owner) }
-            is IrProperty -> WrappedPropertyDescriptor().apply { bind(owner) }
-            is IrField -> WrappedFieldDescriptor().apply { bind(owner) }
-            is IrTypeAlias -> WrappedTypeAliasDescriptor().apply { bind(owner) }
-            else -> throw IllegalStateException("Unsupported owner in Fir2IrBindableSymbol: $owner")
-        }
-
+    override val descriptor: D
         @Suppress("UNCHECKED_CAST")
-        result as D
-    }
+        get() = owner.toIrBasedDescriptor() as D
+
+    @ObsoleteDescriptorBasedAPI
+    override val hasDescriptor: Boolean
+        get() = false
 
     companion object {
         private const val GETTER_PREFIX = "<get"
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
index ea15af2113a..313ff447e21 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
@@ -147,6 +147,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/annotations/kt10136.kt");
         }
 
+        @TestMetadata("kt25489.kt")
+        public void testKt25489() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/kt25489.kt");
+        }
+
         @TestMetadata("mustBeDocumented.kt")
         public void testMustBeDocumented() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/mustBeDocumented.kt");
@@ -1504,6 +1509,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/bridges/kt1959.kt");
         }
 
+        @TestMetadata("kt24193.kt")
+        public void testKt24193() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt24193.kt");
+        }
+
         @TestMetadata("kt2498.kt")
         public void testKt2498() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt2498.kt");
@@ -1733,49 +1743,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractFirBlackBoxCodegenTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-
-        @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
-        public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2050,6 +2017,26 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/callableReference/javaField.kt");
         }
 
+        @TestMetadata("kt16752.kt")
+        public void testKt16752() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt16752.kt");
+        }
+
+        @TestMetadata("kt21014.kt")
+        public void testKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void testKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
+        @TestMetadata("kt21092b.kt")
+        public void testKt21092b() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092b.kt");
+        }
+
         @TestMetadata("kt37604.kt")
         public void testKt37604() throws Exception {
             runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
@@ -13434,6 +13421,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
         public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
             runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
@@ -13448,6 +13440,79 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractFirBlackBoxCodegenTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
+            public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -16305,6 +16370,21 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator.kt");
             }
 
+            @TestMetadata("kt18911.kt")
+            public void testKt18911() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt");
+            }
+
+            @TestMetadata("kt24258.kt")
+            public void testKt24258() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt");
+            }
+
+            @TestMetadata("kt24258nn.kt")
+            public void testKt24258nn() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt");
+            }
+
             @TestMetadata("localEntities.kt")
             public void testLocalEntities() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/localEntities.kt");
@@ -17678,6 +17758,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/jvmName/functionWithDefault.kt");
         }
 
+        @TestMetadata("kt23974.kt")
+        public void testKt23974() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmName/kt23974.kt");
+        }
+
         @TestMetadata("loadJvmName.kt")
         public void testLoadJvmName() throws Exception {
             runTest("compiler/testData/codegen/box/jvmName/loadJvmName.kt");
@@ -18272,6 +18357,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -18317,6 +18407,16 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -19844,6 +19944,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -19859,6 +19964,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -21720,6 +21830,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt");
             }
 
+            @TestMetadata("kt30548.kt")
+            public void testKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("compiler/testData/codegen/box/properties/lateinit/localClass.kt");
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java
index 161da66ccdf..f28a3d025a8 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/codegen/ir/FirBytecodeTextTestGenerated.java
@@ -1525,6 +1525,16 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/simple.kt");
             }
 
+            @TestMetadata("twoRefs.kt")
+            public void testTwoRefs() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/twoRefs.kt");
+            }
+
+            @TestMetadata("unusedParamNotSpill.kt")
+            public void testUnusedParamNotSpill() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/unusedParamNotSpill.kt");
+            }
+
             @TestMetadata("when.kt")
             public void testWhen() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/when.kt");
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
index f57fcdafeaa..5f1ec072168 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java
@@ -197,6 +197,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt");
         }
 
+        @TestMetadata("kt19306.kt")
+        public void testKt19306() throws Exception {
+            runTest("compiler/testData/ir/irText/classes/kt19306.kt");
+        }
+
         @TestMetadata("kt31649.kt")
         public void testKt31649() throws Exception {
             runTest("compiler/testData/ir/irText/classes/kt31649.kt");
@@ -1848,6 +1853,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/putIfAbsent.kt");
         }
 
+        @TestMetadata("readWriteProperty.kt")
+        public void testReadWriteProperty() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/readWriteProperty.kt");
+        }
+
         @TestMetadata("recursiveCapturedTypeInPropertyReference.kt")
         public void testRecursiveCapturedTypeInPropertyReference() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt");
@@ -1863,11 +1873,21 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
             runTest("compiler/testData/ir/irText/firProblems/SignatureClash.kt");
         }
 
+        @TestMetadata("SyntheticSetterType.kt")
+        public void testSyntheticSetterType() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt");
+        }
+
         @TestMetadata("throwableStackTrace.kt")
         public void testThrowableStackTrace() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/throwableStackTrace.kt");
         }
 
+        @TestMetadata("typeParameterFromJavaClass.kt")
+        public void testTypeParameterFromJavaClass() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt");
+        }
+
         @TestMetadata("typeVariableAfterBuildMap.kt")
         public void testTypeVariableAfterBuildMap() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/typeVariableAfterBuildMap.kt");
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
index 9da1b4d0ca2..82d5c6e6cf3 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
@@ -134,9 +134,9 @@ class JavaSymbolProvider(
             classId,
             {
                 val foundClass = findClass(classId, content)
-                if (foundClass == null || foundClass.annotations.any {
-                        it.classId?.asSingleFqName() == JvmAnnotationNames.METADATA_FQ_NAME
-                    }
+                if (foundClass == null ||
+                    foundClass.hasDifferentRelativeClassName(classId) ||
+                    foundClass.hasMetadataAnnotation()
                 ) {
                     null to null
                 } else {
@@ -148,6 +148,16 @@ class JavaSymbolProvider(
         }
     }
 
+    /**
+     * We do not check the package because we can look for the class in the same package by class name without package specified.
+     * In this case, found [JavaClass] may have different `packageFqName`, but not `relativeClassName`.
+     */
+    private fun JavaClass.hasDifferentRelativeClassName(lookupClassId: ClassId): Boolean =
+        classId?.relativeClassName != lookupClassId.relativeClassName
+
+    private fun JavaClass.hasMetadataAnnotation(): Boolean =
+        annotations.any { it.classId?.asSingleFqName() == JvmAnnotationNames.METADATA_FQ_NAME }
+
     private class ValueParametersForAnnotationConstructor {
         val valueParameters: MutableList<FirJavaValueParameter> = mutableListOf()
         var valueParameterForValue: FirJavaValueParameter? = null
@@ -411,6 +421,7 @@ class JavaSymbolProvider(
                     defaultValue = buildExpressionStub()
                 }
                 isVararg = returnType is JavaArrayType && methodName == VALUE_METHOD_NAME
+                annotationBuilder = { emptyList() }
             }
             if (methodName == VALUE_METHOD_NAME) {
                 valueParametersForAnnotationConstructor.valueParameterForValue = parameterForAnnotationConstructor
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
index 4d2a66e9394..34590214bac 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
@@ -92,9 +92,12 @@ internal fun FirTypeRef.toConeKotlinTypeProbablyFlexible(
     }
 
 internal fun JavaType.toFirJavaTypeRef(session: FirSession, javaTypeParameterStack: JavaTypeParameterStack): FirJavaTypeRef {
-    val annotations = (this as? JavaClassifierType)?.annotations.orEmpty()
     return buildJavaTypeRef {
-        annotations.mapTo(this.annotations) { it.toFirAnnotationCall(session, javaTypeParameterStack) }
+        annotationBuilder = {
+            (this@toFirJavaTypeRef as? JavaClassifierType)?.annotations.orEmpty().map {
+                it.toFirAnnotationCall(session, javaTypeParameterStack)
+            }
+        }
         type = this@toFirJavaTypeRef
     }
 }
@@ -578,7 +581,7 @@ internal fun JavaValueParameter.toFirValueParameter(
         name = this@toFirValueParameter.name ?: Name.identifier("p$index")
         returnTypeRef = type.toFirJavaTypeRef(session, javaTypeParameterStack)
         isVararg = this@toFirValueParameter.isVararg
-        addAnnotationsFrom(session, this@toFirValueParameter, javaTypeParameterStack)
+        annotationBuilder = { annotations.map { it.toFirAnnotationCall(session, javaTypeParameterStack) }}
     }
 }
 
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt
index ae2033e7631..abc2d4d2de3 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt
@@ -9,52 +9,150 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.FirValueParameter
-import org.jetbrains.kotlin.fir.declarations.builder.FirValueParameterBuilder
-import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
+import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference
+import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
 import org.jetbrains.kotlin.fir.types.FirTypeRef
+import org.jetbrains.kotlin.fir.visitors.FirTransformer
+import org.jetbrains.kotlin.fir.visitors.FirVisitor
+import org.jetbrains.kotlin.fir.visitors.transformSingle
 import org.jetbrains.kotlin.name.Name
 
 @OptIn(FirImplementationDetail::class)
 class FirJavaValueParameter @FirImplementationDetail constructor(
-    source: FirSourceElement?,
-    session: FirSession,
-    resolvePhase: FirResolvePhase,
-    attributes: FirDeclarationAttributes,
-    returnTypeRef: FirTypeRef,
-    name: Name,
-    symbol: FirVariableSymbol<FirValueParameter>,
-    annotations: MutableList<FirAnnotationCall>,
-    defaultValue: FirExpression?,
-    isCrossinline: Boolean,
-    isNoinline: Boolean,
-    isVararg: Boolean,
-) : FirValueParameterImpl(
-    source,
-    session,
-    resolvePhase,
-    FirDeclarationOrigin.Java,
-    attributes,
-    returnTypeRef,
-    name,
-    symbol,
-    annotations,
-    defaultValue,
-    isCrossinline,
-    isNoinline,
-    isVararg,
-)
+    override val source: FirSourceElement?,
+    override val session: FirSession,
+    override var resolvePhase: FirResolvePhase,
+    override val attributes: FirDeclarationAttributes,
+    override var returnTypeRef: FirTypeRef,
+    override val name: Name,
+    override val symbol: FirVariableSymbol<FirValueParameter>,
+    annotationBuilder: () -> List<FirAnnotationCall>,
+    override var defaultValue: FirExpression?,
+    override val isVararg: Boolean,
+) : FirValueParameter() {
+    init {
+        symbol.bind(this)
+    }
+
+    override val isCrossinline: Boolean
+        get() = false
+
+    override val isNoinline: Boolean
+        get() = false
+
+    override val isVal: Boolean
+        get() = true
+
+    override val isVar: Boolean
+        get() = false
+
+    override val annotations: List<FirAnnotationCall> by lazy { annotationBuilder() }
+
+    override val origin: FirDeclarationOrigin
+        get() = FirDeclarationOrigin.Java
+
+    override val receiverTypeRef: FirTypeRef?
+        get() = null
+
+    override val initializer: FirExpression?
+        get() = null
+
+    override val delegate: FirExpression?
+        get() = null
+
+    override val delegateFieldSymbol: FirDelegateFieldSymbol<FirValueParameter>?
+        get() = null
+
+    override val getter: FirPropertyAccessor?
+        get() = null
+
+    override val setter: FirPropertyAccessor?
+        get() = null
+
+    override val controlFlowGraphReference: FirControlFlowGraphReference?
+        get() = null
+
+    override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
+        returnTypeRef.accept(visitor, data)
+        annotations.forEach { it.accept(visitor, data) }
+        defaultValue?.accept(visitor, data)
+    }
+
+    override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        transformReturnTypeRef(transformer, data)
+        transformOtherChildren(transformer, data)
+        return this
+    }
+
+    override fun <D> transformReturnTypeRef(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        returnTypeRef = returnTypeRef.transformSingle(transformer, data)
+        return this
+    }
+
+    override fun <D> transformReceiverTypeRef(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        return this
+    }
+
+    override fun <D> transformInitializer(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        return this
+    }
+
+    override fun <D> transformDelegate(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        return this
+    }
+
+    override fun <D> transformGetter(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        return this
+    }
+
+    override fun <D> transformSetter(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        return this
+    }
+
+    override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        return this
+    }
+
+    override fun <D> transformOtherChildren(transformer: FirTransformer<D>, data: D): FirValueParameter {
+        defaultValue = defaultValue?.transformSingle(transformer, data)
+        return this
+    }
+
+    override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) {
+        resolvePhase = newResolvePhase
+    }
+
+    override fun replaceReturnTypeRef(newReturnTypeRef: FirTypeRef) {
+        returnTypeRef = newReturnTypeRef
+    }
+
+    override fun replaceReceiverTypeRef(newReceiverTypeRef: FirTypeRef?) {
+    }
+
+    override fun replaceInitializer(newInitializer: FirExpression?) {
+    }
+
+    override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
+    }
+}
 
 @FirBuilderDsl
-class FirJavaValueParameterBuilder : FirValueParameterBuilder() {
+class FirJavaValueParameterBuilder {
+    var source: FirSourceElement? = null
+    lateinit var session: FirSession
+    var attributes: FirDeclarationAttributes = FirDeclarationAttributes()
+    lateinit var returnTypeRef: FirTypeRef
+    lateinit var name: Name
+    lateinit var annotationBuilder: () -> List<FirAnnotationCall>
+    var defaultValue: FirExpression? = null
+    var isVararg: Boolean by kotlin.properties.Delegates.notNull()
+
     @OptIn(FirImplementationDetail::class)
-    override fun build(): FirJavaValueParameter {
+    fun build(): FirJavaValueParameter {
         return FirJavaValueParameter(
             source,
             session,
@@ -63,48 +161,11 @@ class FirJavaValueParameterBuilder : FirValueParameterBuilder() {
             returnTypeRef,
             name,
             symbol = FirVariableSymbol(name),
-            annotations,
+            annotationBuilder,
             defaultValue,
-            isCrossinline = false,
-            isNoinline = false,
             isVararg,
         )
     }
-
-    @Deprecated("Modification of 'resolvePhase' has no impact for FirJavaValueParameterBuilder", level = DeprecationLevel.HIDDEN)
-    override var resolvePhase: FirResolvePhase
-        get() = throw IllegalStateException()
-        set(@Suppress("UNUSED_PARAMETER") value) {
-            throw IllegalStateException()
-        }
-
-    @Deprecated("Modification of '' has no impact for FirJavaValueParameterBuilder", level = DeprecationLevel.HIDDEN)
-    override var symbol: FirVariableSymbol<FirValueParameter>
-        get() = throw IllegalStateException()
-        set(@Suppress("UNUSED_PARAMETER") value) {
-            throw IllegalStateException()
-        }
-
-    @Deprecated("Modification of 'isCrossinline' has no impact for FirJavaValueParameterBuilder", level = DeprecationLevel.HIDDEN)
-    override var isCrossinline: Boolean
-        get() = throw IllegalStateException()
-        set(@Suppress("UNUSED_PARAMETER") value) {
-            throw IllegalStateException()
-        }
-
-    @Deprecated("Modification of 'isNoinline' has no impact for FirJavaValueParameterBuilder", level = DeprecationLevel.HIDDEN)
-    override var isNoinline: Boolean
-        get() = throw IllegalStateException()
-        set(@Suppress("UNUSED_PARAMETER") value) {
-            throw IllegalStateException()
-        }
-
-    @Deprecated("Modification of 'origin' has no impact for FirJavaValueParameterBuilder", level = DeprecationLevel.HIDDEN)
-    override var origin: FirDeclarationOrigin
-        get() = throw IllegalStateException()
-        set(@Suppress("UNUSED_PARAMETER") value) {
-            throw IllegalStateException()
-        }
 }
 
 inline fun buildJavaValueParameter(init: FirJavaValueParameterBuilder.() -> Unit): FirJavaValueParameter {
diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt
index 2d8b05fa664..edf658289f1 100644
--- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt
+++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt
@@ -5,39 +5,59 @@
 
 package org.jetbrains.kotlin.fir.types.jvm
 
+import org.jetbrains.kotlin.fir.FirAnnotationContainer
 import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.builder.FirBuilderDsl
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.types.FirQualifierPart
-import org.jetbrains.kotlin.fir.types.builder.FirUserTypeRefBuilder
-import org.jetbrains.kotlin.fir.types.impl.FirUserTypeRefImpl
+import org.jetbrains.kotlin.fir.types.FirTypeProjection
+import org.jetbrains.kotlin.fir.types.FirUserTypeRef
+import org.jetbrains.kotlin.fir.visitors.FirTransformer
+import org.jetbrains.kotlin.fir.visitors.FirVisitor
+import org.jetbrains.kotlin.fir.visitors.transformInplace
 import org.jetbrains.kotlin.load.java.structure.JavaType
 
 class FirJavaTypeRef(
     val type: JavaType,
-    annotations: MutableList<FirAnnotationCall>,
-    qualifier: MutableList<FirQualifierPart>
-) : FirUserTypeRefImpl(
-    source = null,
-    isMarkedNullable = false,
-    qualifier,
-    annotations
-)
+    annotationBuilder: () -> List<FirAnnotationCall>,
+    override val qualifier: MutableList<FirQualifierPart>
+) : FirUserTypeRef(), FirAnnotationContainer {
+    override val isMarkedNullable: Boolean
+        get() = false
 
-@FirBuilderDsl
-class FirJavaTypeRefBuilder : FirUserTypeRefBuilder() {
-    override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
-    lateinit var type: JavaType
+    override val source: FirSourceElement?
+        get() = null
 
-    override fun build(): FirJavaTypeRef {
-        return FirJavaTypeRef(type, annotations, qualifier)
+    override val annotations: List<FirAnnotationCall> by lazy { annotationBuilder() }
+
+    override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
+        for (part in qualifier) {
+            part.typeArgumentList.typeArguments.forEach { it.accept(visitor, data) }
+        }
+        annotations.forEach { it.accept(visitor, data) }
     }
 
-    @Deprecated("Modification of 'source' has no impact for FirJavaTypeRefBuilder", level = DeprecationLevel.HIDDEN)
-    override var source: FirSourceElement? = null
+    override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirUserTypeRef {
+        for (part in qualifier) {
+            (part.typeArgumentList.typeArguments as MutableList<FirTypeProjection>).transformInplace(transformer, data)
+        }
+        return this
+    }
 
-    @Deprecated("Modification of 'isMarkedNullable' has no impact for FirJavaTypeRefBuilder", level = DeprecationLevel.HIDDEN)
-    override var isMarkedNullable: Boolean = false
+    override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirUserTypeRef {
+        return this
+    }
+}
+
+@FirBuilderDsl
+class FirJavaTypeRefBuilder {
+    lateinit var annotationBuilder: () -> List<FirAnnotationCall>
+    lateinit var type: JavaType
+    val qualifier: MutableList<FirQualifierPart> = mutableListOf()
+
+    fun build(): FirJavaTypeRef {
+        return FirJavaTypeRef(type, annotationBuilder, qualifier)
+    }
 }
 
 inline fun buildJavaTypeRef(init: FirJavaTypeRefBuilder.() -> Unit): FirJavaTypeRef {
diff --git a/compiler/fir/modularized-tests/build.gradle.kts b/compiler/fir/modularized-tests/build.gradle.kts
index afe0d62cb39..a36d6f1e0e5 100644
--- a/compiler/fir/modularized-tests/build.gradle.kts
+++ b/compiler/fir/modularized-tests/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(project(":core:descriptors.runtime"))
-    testApi(projectTests(":compiler:fir:analysis-tests"))
+    testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testApi(project(":compiler:fir:resolve"))
     testApi(project(":compiler:fir:dump"))
 
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt
index d3a94e3be12..c6dd15735af 100644
--- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt
+++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/BaseConverter.kt
@@ -126,6 +126,16 @@ abstract class BaseConverter(
         return tree.getParent(this)
     }
 
+    fun LighterASTNode.getParents(): Sequence<LighterASTNode> {
+        var node = this
+        return sequence {
+            while (true) {
+                yield(node)
+                node = node.getParent() ?: break
+            }
+        }
+    }
+
     fun LighterASTNode?.getChildNodesByType(type: IElementType): List<LighterASTNode> {
         return this?.forEachChildrenReturnList { node, container ->
             when (node.tokenType) {
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
index 7def4ad4f41..5cf75ad4e89 100644
--- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
@@ -1410,7 +1410,7 @@ class DeclarationsConverter(
         return if (!stubMode) {
             val blockTree = LightTree2Fir.buildLightTreeBlockExpression(block.asText)
             return DeclarationsConverter(
-                baseSession, baseScopeProvider, stubMode, blockTree, offset = tree.getStartOffset(block), context
+                baseSession, baseScopeProvider, stubMode, blockTree, offset = offset + tree.getStartOffset(block), context
             ).convertBlockExpression(blockTree.root)
         } else {
             val firExpression = buildExpressionStub()
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
index 3ed79836a58..14f6da469f7 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.fir.resolve
 
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
 import org.jetbrains.kotlin.fir.symbols.ConeClassifierLookupTag
@@ -32,6 +33,9 @@ fun ConeClassLikeLookupTag.toSymbol(useSiteSession: FirSession): FirClassLikeSym
     }
 }
 
+fun ConeClassLikeLookupTag.toFirRegularClass(session: FirSession): FirRegularClass? =
+    session.firSymbolProvider.getSymbolByLookupTag(this)?.fir as? FirRegularClass
+
 @OptIn(LookupTagInternals::class)
 fun ConeClassLikeLookupTagImpl.bindSymbolToLookupTag(session: FirSession, symbol: FirClassLikeSymbol<*>?) {
     boundSymbol = OneElementWeakMap(session, symbol)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
index 0b8947f2440..ed9ea28cca3 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/SamResolution.kt
@@ -45,7 +45,7 @@ val SAM_PARAMETER_NAME = Name.identifier("block")
 class FirSamResolverImpl(
     private val firSession: FirSession,
     private val scopeSession: ScopeSession,
-    private val outerClassManager: FirOuterClassManager,
+    private val outerClassManager: FirOuterClassManager? = null,
 ) : FirSamResolver() {
 
     private val resolvedFunctionType: MutableMap<FirRegularClass, Any> = mutableMapOf()
@@ -70,11 +70,7 @@ class FirSamResolverImpl(
     }
 
     private fun getFunctionTypeForPossibleSamType(type: ConeClassLikeType): ConeLookupTagBasedType? {
-        val firRegularClass =
-            firSession.firSymbolProvider
-                .getSymbolByLookupTag(type.lookupTag)
-                ?.fir as? FirRegularClass
-                ?: return null
+        val firRegularClass = type.lookupTag.toFirRegularClass(firSession) ?: return null
 
         val unsubstitutedFunctionType = resolveFunctionTypeIfSamInterface(firRegularClass) ?: return null
 
@@ -210,7 +206,7 @@ class FirSamResolverImpl(
 
             resolvePhase = FirResolvePhase.BODY_RESOLVE
         }.apply {
-            containingClassAttr = outerClassManager.outerClass(firRegularClass.symbol)?.toLookupTag()
+            containingClassAttr = outerClassManager?.outerClass(firRegularClass.symbol)?.toLookupTag()
         }
     }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt
index 25593e0f709..511470096ca 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt
@@ -24,7 +24,9 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilder
 import org.jetbrains.kotlin.resolve.calls.inference.addSubtypeConstraintIfCompatible
 import org.jetbrains.kotlin.resolve.calls.inference.model.SimpleConstraintSystemConstraintPosition
+import org.jetbrains.kotlin.types.AbstractTypeChecker
 import org.jetbrains.kotlin.types.model.CaptureStatus
+import org.jetbrains.kotlin.utils.addToStdlib.runIf
 
 fun Candidate.resolveArgumentExpression(
     csBuilder: ConstraintSystemBuilder,
@@ -336,10 +338,9 @@ internal fun Candidate.resolveArgument(
     sink: CheckerSink,
     context: ResolutionContext
 ) {
-
     argument.resultType.ensureResolvedTypeDeclaration(context.session)
 
-    val expectedType = prepareExpectedType(context.session, argument, parameter, context)
+    val expectedType = prepareExpectedType(context.session, context.bodyResolveComponents.scopeSession, argument, parameter, context)
     resolveArgumentExpression(
         this.system.getBuilder(),
         argument,
@@ -354,18 +355,20 @@ internal fun Candidate.resolveArgument(
 
 private fun Candidate.prepareExpectedType(
     session: FirSession,
+    scopeSession: ScopeSession,
     argument: FirExpression,
     parameter: FirValueParameter?,
     context: ResolutionContext
 ): ConeKotlinType? {
     if (parameter == null) return null
     val basicExpectedType = argument.getExpectedTypeForSAMConversion(parameter/*, LanguageVersionSettings*/)
-    val expectedType = getExpectedTypeWithSAMConversion(session, argument, basicExpectedType, context) ?: basicExpectedType
+    val expectedType = getExpectedTypeWithSAMConversion(session, scopeSession, argument, basicExpectedType, context) ?: basicExpectedType
     return this.substitutor.substituteOrSelf(expectedType)
 }
 
 private fun Candidate.getExpectedTypeWithSAMConversion(
     session: FirSession,
+    scopeSession: ScopeSession,
     argument: FirExpression,
     candidateExpectedType: ConeKotlinType,
     context: ResolutionContext
@@ -375,20 +378,70 @@ private fun Candidate.getExpectedTypeWithSAMConversion(
     val firFunction = symbol.fir as? FirFunction<*> ?: return null
     if (!context.bodyResolveComponents.samResolver.shouldRunSamConversionForFunction(firFunction)) return null
 
-    if (!argument.isFunctional(session)) return null
-
     // TODO: resolvedCall.registerArgumentWithSamConversion(argument, SamConversionDescription(convertedTypeByOriginal, convertedTypeByCandidate!!))
 
-    return context.bodyResolveComponents.samResolver.getFunctionTypeForPossibleSamType(candidateExpectedType).apply {
-        usesSAM = true
+    val expectedFunctionType = context.bodyResolveComponents.samResolver.getFunctionTypeForPossibleSamType(candidateExpectedType)
+    return runIf(argument.isFunctional(session, scopeSession, expectedFunctionType)) {
+        expectedFunctionType.apply {
+            // Even though the `expectedFunctionalType` could be `null`, we should mark the flag to indicate that the argument is a
+            // functional type. That will help avoid ambiguous `invoke` resolutions. See KT-39824
+            usesSAM = true
+        }
     }
 }
 
-fun FirExpression.isFunctional(session: FirSession): Boolean =
+fun FirExpression.isFunctional(
+    session: FirSession,
+    scopeSession: ScopeSession,
+    expectedFunctionType: ConeKotlinType?,
+): Boolean {
     when ((this as? FirWrappedArgumentExpression)?.expression ?: this) {
-        is FirAnonymousFunction, is FirCallableReferenceAccess -> true
-        else -> typeRef.coneTypeSafe<ConeKotlinType>()?.isBuiltinFunctionalType(session) == true
+        is FirAnonymousFunction, is FirCallableReferenceAccess -> return true
+        else -> {
+            // Either a functional type or a subtype of a class that has a contributed `invoke`.
+            val coneType = typeRef.coneTypeSafe<ConeKotlinType>() ?: return false
+            if (coneType.isBuiltinFunctionalType(session)) {
+                return true
+            }
+            val classLikeExpectedFunctionType = expectedFunctionType?.lowerBoundIfFlexible() as? ConeClassLikeType
+            if (classLikeExpectedFunctionType == null || coneType is ConeIntegerLiteralType) {
+                return false
+            }
+            val invokeSymbol =
+                coneType.findContributedInvokeSymbol(
+                    session, scopeSession, classLikeExpectedFunctionType, shouldCalculateReturnTypesOfFakeOverrides = false
+                ) ?: return false
+            // Make sure the contributed `invoke` is indeed a wanted functional type by checking if types are compatible.
+            val expectedReturnType = classLikeExpectedFunctionType.returnType(session)!!.lowerBoundIfFlexible()
+            val returnTypeCompatible =
+                expectedReturnType is ConeTypeParameterType ||
+                        AbstractTypeChecker.isSubtypeOf(
+                            session.inferenceComponents.ctx,
+                            invokeSymbol.fir.returnTypeRef.coneType,
+                            expectedReturnType,
+                            isFromNullabilityConstraint = false
+                        )
+            if (!returnTypeCompatible) {
+                return false
+            }
+            if (invokeSymbol.fir.valueParameters.size != classLikeExpectedFunctionType.typeArguments.size - 1) {
+                return false
+            }
+            val parameterPairs =
+                invokeSymbol.fir.valueParameters.zip(classLikeExpectedFunctionType.valueParameterTypesIncludingReceiver(session))
+            return parameterPairs.all { (invokeParameter, expectedParameter) ->
+                val expectedParameterType = expectedParameter!!.lowerBoundIfFlexible()
+                expectedParameterType is ConeTypeParameterType ||
+                        AbstractTypeChecker.isSubtypeOf(
+                            session.inferenceComponents.ctx,
+                            invokeParameter.returnTypeRef.coneType,
+                            expectedParameterType,
+                            isFromNullabilityConstraint = false
+                        )
+            }
+        }
     }
+}
 
 fun FirExpression.getExpectedTypeForSAMConversion(
     parameter: FirValueParameter/*, languageVersionSettings: LanguageVersionSettings*/
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt
index 697b5c25814..3fcf7709d64 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt
@@ -401,6 +401,8 @@ private fun createKPropertyType(
 private fun FirVariable<*>.canBeMutableReference(candidate: Candidate): Boolean {
     if (!isVar) return false
     if (this is FirField) return true
-    return source?.kind == FirFakeSourceElementKind.PropertyFromParameter ||
-            (setter is FirMemberDeclaration && candidate.callInfo.session.visibilityChecker.isVisible(setter!!, candidate))
+    val original = this.unwrapFakeOverrides()
+    return original.source?.kind == FirFakeSourceElementKind.PropertyFromParameter ||
+            (original.setter is FirMemberDeclaration &&
+                    candidate.callInfo.session.visibilityChecker.isVisible(original.setter!!, candidate))
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
index 25e195c42c2..e81090204a9 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
@@ -80,28 +80,22 @@ class FirSyntheticPropertiesScope(
                     val parameter = setter.valueParameters.singleOrNull() ?: return
                     if (setter.typeParameters.isNotEmpty() || setter.isStatic) return
                     val parameterType = (parameter.returnTypeRef as? FirResolvedTypeRef)?.type ?: return
-                    if (getter.symbol.dispatchReceiverClassOrNull() == setter.symbol.dispatchReceiverClassOrNull()) {
-                        if (getterReturnType.withNullability(NOT_NULL) != parameterType.withNullability(NOT_NULL)) {
-                            return
-                        }
-                    } else {
-                        // TODO: at this moment it works for cases like
-                        // class Base {
-                        //     void setSomething(Object value) {}
-                        // }
-                        // class Derived extends Base {
-                        //     String getSomething() { return ""; }
-                        // }
-                        // In FE 1.0, we should have also Object getSomething() in class Base for this to work
-                        // I think details here are worth designing
-                        if (!AbstractTypeChecker.isSubtypeOf(
-                                session.typeContext,
-                                getterReturnType.withNullability(NOT_NULL),
-                                parameterType.withNullability(NOT_NULL)
-                            )
-                        ) {
-                            return
-                        }
+                    // TODO: at this moment it works for cases like
+                    // class Base {
+                    //     void setSomething(Object value) {}
+                    // }
+                    // class Derived extends Base {
+                    //     String getSomething() { return ""; }
+                    // }
+                    // In FE 1.0, we should have also Object getSomething() in class Base for this to work
+                    // I think details here are worth designing
+                    if (!AbstractTypeChecker.isSubtypeOf(
+                            session.typeContext,
+                            getterReturnType.withNullability(NOT_NULL),
+                            parameterType.withNullability(NOT_NULL)
+                        )
+                    ) {
+                        return
                     }
                     matchingSetter = setter
                 })
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
index 217f86e2997..f3dc5091520 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
@@ -5,12 +5,14 @@
 
 package org.jetbrains.kotlin.fir.resolve.inference
 
+import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
 import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameter
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.expressions.FirResolvable
 import org.jetbrains.kotlin.fir.expressions.FirStatement
+import org.jetbrains.kotlin.fir.fakeElement
 import org.jetbrains.kotlin.fir.resolve.ResolutionMode
 import org.jetbrains.kotlin.fir.resolve.calls.Candidate
 import org.jetbrains.kotlin.fir.resolve.calls.FirNamedReferenceWithCandidate
@@ -33,7 +35,6 @@ import org.jetbrains.kotlin.fir.visitors.transformSingle
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.calls.inference.buildAbstractResultingSubstitutor
 import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintSystemCompletionMode
-import org.jetbrains.kotlin.resolve.calls.inference.model.ArgumentConstraintPosition
 import org.jetbrains.kotlin.resolve.calls.inference.model.SimpleConstraintSystemConstraintPosition
 import org.jetbrains.kotlin.types.TypeApproximatorConfiguration
 import org.jetbrains.kotlin.types.model.StubTypeMarker
@@ -183,6 +184,7 @@ class FirCallCompleter(
                     val name = Name.identifier("it")
                     val itType = parameters.single()
                     buildValueParameter {
+                        source = lambdaAtom.atom.source?.fakeElement(FirFakeSourceElementKind.ItLambdaParameter)
                         session = this@FirCallCompleter.session
                         origin = FirDeclarationOrigin.Source
                         returnTypeRef = buildResolvedTypeRef { type = itType.approximateLambdaInputType() }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
index 6a9861c2657..a6e34ba1512 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
@@ -60,6 +60,14 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb
         context.addLocalScope(localScope)
     }
 
+    protected open fun needReplacePhase(firDeclaration: FirDeclaration) = true
+
+    fun replaceDeclarationResolvePhaseIfNeeded(firDeclaration: FirDeclaration, newResolvePhase: FirResolvePhase) {
+        if (needReplacePhase(firDeclaration)) {
+            firDeclaration.replaceResolvePhase(newResolvePhase)
+        }
+    }
+
     @OptIn(PrivateForInline::class)
     internal inline fun <T> withFullBodyResolve(crossinline l: () -> T): T {
         val shouldSwitchMode = implicitTypeOnly
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
index 2772a559120..42881d93694 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
@@ -57,7 +57,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
     ): CompositeTransformResult<FirDeclaration> {
         transformer.onBeforeDeclarationContentResolve(declaration)
         return context.withContainer(declaration) {
-            declaration.replaceResolvePhase(transformerPhase)
+            transformer.replaceDeclarationResolvePhaseIfNeeded(declaration, transformerPhase)
             transformer.transformDeclarationContent(declaration, data)
         }
     }
@@ -84,7 +84,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
         if (declaration.typeParameters.isEmpty()) return null
 
         for (typeParameter in declaration.typeParameters) {
-            (typeParameter as? FirTypeParameter)?.replaceResolvePhase(FirResolvePhase.STATUS)
+            (typeParameter as? FirTypeParameter)?.let { transformer.replaceDeclarationResolvePhaseIfNeeded(it, FirResolvePhase.STATUS) }
             typeParameter.transformChildren(transformer, ResolutionMode.ContextIndependent)
         }
 
@@ -115,7 +115,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
             if (returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return@withTypeParametersOf property.compose()
             if (property.resolvePhase == transformerPhase) return@withTypeParametersOf property.compose()
             if (property.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) {
-                property.replaceResolvePhase(transformerPhase)
+                transformer.replaceDeclarationResolvePhaseIfNeeded(property, transformerPhase)
                 return@withTypeParametersOf property.compose()
             }
             dataFlowAnalyzer.enterProperty(property)
@@ -142,7 +142,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
                             }
                         }
                     }
-                    property.replaceResolvePhase(transformerPhase)
+                    transformer.replaceDeclarationResolvePhaseIfNeeded(property, transformerPhase)
                     dataFlowAnalyzer.exitProperty(property)?.let {
                         property.replaceControlFlowGraphReference(FirControlFlowGraphReferenceImpl(it))
                     }
@@ -267,7 +267,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
             variable.transformAccessors()
         }
         context.storeVariable(variable)
-        variable.replaceResolvePhase(transformerPhase)
+        transformer.replaceDeclarationResolvePhaseIfNeeded(variable, transformerPhase)
         dataFlowAnalyzer.exitLocalVariableDeclaration(variable)
         return variable.compose()
     }
@@ -449,7 +449,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
     ): CompositeTransformResult<FirSimpleFunction> {
         if (simpleFunction.resolvePhase == transformerPhase) return simpleFunction.compose()
         if (simpleFunction.resolvePhase == FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE && transformerPhase == FirResolvePhase.BODY_RESOLVE) {
-            simpleFunction.replaceResolvePhase(transformerPhase)
+            transformer.replaceDeclarationResolvePhaseIfNeeded(simpleFunction, transformerPhase)
             return simpleFunction.compose()
         }
         val returnTypeRef = simpleFunction.returnTypeRef
@@ -546,7 +546,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
 
     private fun doTransformConstructor(constructor: FirConstructor, data: ResolutionMode): CompositeTransformResult<FirConstructor> {
         return context.withContainer(constructor) {
-            constructor.replaceResolvePhase(transformerPhase)
+            transformer.replaceDeclarationResolvePhaseIfNeeded(constructor, transformerPhase)
             dataFlowAnalyzer.enterFunction(constructor)
 
             constructor.transformTypeParameters(transformer, data)
@@ -640,7 +640,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
     override fun transformValueParameter(valueParameter: FirValueParameter, data: ResolutionMode): CompositeTransformResult<FirStatement> {
         context.storeVariable(valueParameter)
         if (valueParameter.returnTypeRef is FirImplicitTypeRef) {
-            valueParameter.replaceResolvePhase(transformerPhase)
+            transformer.replaceDeclarationResolvePhaseIfNeeded(valueParameter, transformerPhase)
             return valueParameter.compose()
         }
 
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
index 725bf09fb9e..caccfb7499b 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt
@@ -73,6 +73,7 @@ fun <F : FirClass<F>> F.runContractAndBodiesResolutionForLocalClass(
         components.scopeSession,
         implicitBodyResolveComputationSession,
         designationMap,
+        createTransformer = components.returnTypeCalculator.getTransformerCreator()
     )
 
     val newContext = components.context.createSnapshotForLocalClasses(returnTypeCalculator, targetedClasses)
@@ -98,6 +99,11 @@ fun <F : FirClass<F>> F.runContractAndBodiesResolutionForLocalClass(
     }
 }
 
+private fun ReturnTypeCalculator.getTransformerCreator() = when (this) {
+    is ReturnTypeCalculatorWithJump -> createTransformer
+    else -> ::FirDesignatedBodyResolveTransformerForReturnTypeCalculator
+}
+
 fun createReturnTypeCalculatorForIDE(
     session: FirSession,
     scopeSession: ScopeSession,
@@ -178,7 +184,7 @@ private class ReturnTypeCalculatorWithJump(
     private val scopeSession: ScopeSession,
     val implicitBodyResolveComputationSession: ImplicitBodyResolveComputationSession,
     val designationMapForLocalClasses: Map<FirCallableMemberDeclaration<*>, List<FirClass<*>>> = mapOf(),
-    private val createTransformer: (
+    val createTransformer: (
         designation: Iterator<FirElement>,
         session: FirSession,
         scopeSession: ScopeSession,
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt
index a3029da24a2..8d459fcd262 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt
@@ -275,7 +275,7 @@ open class FirContractResolveTransformer(
             get() = contractDescription is FirLegacyRawContractDescription || contractDescription is FirRawContractDescription
 
         private fun FirDeclaration.updatePhase() {
-            replaceResolvePhase(FirResolvePhase.CONTRACTS)
+            replaceDeclarationResolvePhaseIfNeeded(this, FirResolvePhase.CONTRACTS)
         }
     }
 }
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
index 37f4fdc2828..74af476098c 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt
@@ -8,13 +8,9 @@ package org.jetbrains.kotlin.fir.scopes
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
-import org.jetbrains.kotlin.fir.resolve.ScopeSessionKey
-import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
-import org.jetbrains.kotlin.fir.resolve.scopeSessionKey
+import org.jetbrains.kotlin.fir.resolve.*
 import org.jetbrains.kotlin.fir.scopes.impl.*
 import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
-import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLookupTagWithFixedSymbol
 import org.jetbrains.kotlin.name.FqName
 
 private object FirDefaultStarImportingScopeKey : ScopeSessionKey<DefaultImportPriority, FirScope>()
@@ -67,9 +63,6 @@ private fun doCreateImportingScopes(
 private val PACKAGE_MEMBER = scopeSessionKey<FqName, FirPackageMemberScope>()
 
 fun ConeClassLikeLookupTag.getNestedClassifierScope(session: FirSession, scopeSession: ScopeSession): FirScope? {
-    val klass = when (this) {
-        is ConeClassLookupTagWithFixedSymbol -> symbol.fir
-        else -> session.firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass ?: return null
-    }
+    val klass = toSymbol(session)?.fir as? FirRegularClass ?: return null
     return klass.scopeProvider.getNestedClassifierScope(klass, session, scopeSession)
 }
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
index bd059d3da02..2c7fe43fc43 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.fir.declarations.builder
 
 import kotlin.contracts.*
-import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder
@@ -47,7 +46,6 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder {
     open var isNoinline: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
     open var isVararg: Boolean by kotlin.properties.Delegates.notNull<Boolean>()
 
-    @OptIn(FirImplementationDetail::class)
     override fun build(): FirValueParameter {
         return FirValueParameterImpl(
             source,
diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt
index ea6ba94573c..760da4f6c9d 100644
--- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt
+++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.fir.declarations.impl
 
-import org.jetbrains.kotlin.fir.FirImplementationDetail
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes
@@ -27,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.*
  * DO NOT MODIFY IT MANUALLY
  */
 
-open class FirValueParameterImpl @FirImplementationDetail constructor(
+internal class FirValueParameterImpl(
     override val source: FirSourceElement?,
     override val session: FirSession,
     override var resolvePhase: FirResolvePhase,
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
index 0ffe3c50a01..52db4dc41f5 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
@@ -340,9 +340,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
     }
 
     override fun visitDeclaration(declaration: FirDeclaration) {
-        if (mode.renderDeclarationResolvePhase) {
-            print("[${declaration.resolvePhase}] ")
-        }
+        declaration.renderPhaseIfNeeded()
         print(
             when (declaration) {
                 is FirRegularClass -> declaration.classKind.name.toLowerCase().replace("_", " ")
@@ -359,6 +357,12 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         )
     }
 
+    private fun FirDeclaration.renderPhaseIfNeeded() {
+        if (mode.renderDeclarationResolvePhase) {
+            print("[${resolvePhase}] ")
+        }
+    }
+
     private fun List<FirDeclaration>.renderDeclarations() {
         renderInBraces {
             for (declaration in this) {
@@ -458,6 +462,7 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
         if (constructor.isActual) {
             print("actual ")
         }
+        constructor.renderPhaseIfNeeded()
         print("constructor")
         constructor.typeParameters.renderTypeParameters()
         constructor.valueParameters.renderParameters()
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt
index cc05f1bb283..bab6e154260 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSourceElement.kt
@@ -157,6 +157,10 @@ sealed class FirFakeSourceElementKind : FirSourceElementKind() {
 
     // Part of desugared x?.y
     object CheckedSafeCallSubject : FirFakeSourceElementKind()
+
+    // { it + 1} --> { it -> it + 1 }
+    // where `it` parameter declaration has fake source
+    object ItLambdaParameter : FirFakeSourceElementKind()
 }
 
 sealed class FirSourceElement {
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
index d3f114085c1..d0f4e6af615 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.types
 
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirConstKind
+import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef
 import org.jetbrains.kotlin.name.ClassId
@@ -23,7 +24,9 @@ inline fun <reified T : ConeKotlinType> FirTypeRef.coneTypeSafe(): T? {
     return (this as? FirResolvedTypeRef)?.type as? T
 }
 
-inline val FirTypeRef.coneType: ConeKotlinType get() = coneTypeUnsafe()
+inline val FirTypeRef.coneType: ConeKotlinType
+    get() = coneTypeSafe()
+        ?: error("Expected FirResolvedTypeRef with ConeKotlinType but was ${this::class.simpleName} ${render()}")
 
 val FirTypeRef.isAny: Boolean get() = isBuiltinType(StandardClassIds.Any, false)
 val FirTypeRef.isNullableAny: Boolean get() = isBuiltinType(StandardClassIds.Any, true)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt
index 3479d2782ad..7f6740bcfc7 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer
 import org.jetbrains.kotlin.fir.visitors.FirVisitor
 import org.jetbrains.kotlin.fir.visitors.transformInplace
 
-open class FirUserTypeRefImpl(
+class FirUserTypeRefImpl(
     override val source: FirSourceElement?,
     override val isMarkedNullable: Boolean,
     override val qualifier: MutableList<FirQualifierPart>,
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
index 634ec2f9339..12becc42cf6 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
@@ -440,7 +440,6 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
         }
 
         impl(valueParameter) {
-            kind = OpenClass
             defaultTrue("isVal", withGetter = true)
             defaultFalse("isVar", withGetter = true)
             defaultNull("getter", "setter", "initializer", "delegate", "receiverTypeRef", "delegateFieldSymbol", withGetter = true)
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
index 8c45cf0a20c..21d9e76a569 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.frontend.di.configureIncrementalCompilation
 import org.jetbrains.kotlin.frontend.di.configureModule
 import org.jetbrains.kotlin.frontend.di.configureStandardResolveComponents
-import org.jetbrains.kotlin.idea.MainFunctionDetector
 import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.java.AbstractJavaClassFinder
@@ -127,7 +126,7 @@ fun StorageComponentContainer.configureJavaSpecificComponents(
     useInstance(languageVersionSettings.getFlag(JvmAnalysisFlags.javaTypeEnhancementState))
 
     if (useBuiltInsProvider) {
-        useInstance((moduleContext.module.builtIns as JvmBuiltIns).settings)
+        useInstance((moduleContext.module.builtIns as JvmBuiltIns).customizer)
         useImpl<JvmBuiltInsPackageFragmentProvider>()
     }
     useImpl<OptionalAnnotationPackageFragmentProvider>()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index f0f38f9ac6f..6c449bc8fc9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -118,7 +118,8 @@ public interface Errors {
     DiagnosticFactory1<PsiElement, String> MISSING_IMPORTED_SCRIPT_PSI = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<PsiElement, String> MISSING_SCRIPT_PROVIDED_PROPERTY_CLASS = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<PsiElement, String> PRE_RELEASE_CLASS = DiagnosticFactory1.create(ERROR);
-    DiagnosticFactory1<PsiElement, String> IR_COMPILED_CLASS = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<PsiElement, String> IR_WITH_UNSTABLE_ABI_COMPILED_CLASS = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<PsiElement, String> FIR_COMPILED_CLASS = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory2<PsiElement, String, IncompatibleVersionErrorData<?>> INCOMPATIBLE_CLASS = DiagnosticFactory2.create(ERROR);
 
     //Elements with "INVISIBLE_REFERENCE" error are marked as unresolved, unlike elements with "INVISIBLE_MEMBER" error
@@ -802,6 +803,7 @@ public interface Errors {
     DiagnosticFactory1<PsiElement, InferenceErrorData> TYPE_INFERENCE_UPPER_BOUND_VIOLATED = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory2<KtElement, KotlinType, KotlinType> TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH = DiagnosticFactory2.create(ERROR);
     DiagnosticFactory0<PsiElement> TYPE_INFERENCE_CANDIDATE_WITH_SAM_AND_VARARG = DiagnosticFactory0.create(WARNING);
+    DiagnosticFactory0<PsiElement> TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE = DiagnosticFactory0.create(ERROR);
 
     DiagnosticFactory0<KtExpression> TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT = DiagnosticFactory0.create(ERROR, SPECIAL_CONSTRUCT_TOKEN);
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
index 75f9a22e5b8..4d5c0410f94 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
@@ -11,7 +11,6 @@ import kotlin.collections.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.config.LanguageVersion;
-import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
 import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.diagnostics.UnboundDiagnostic;
@@ -401,7 +400,8 @@ public class DefaultErrorMessages {
         MAP.put(MISSING_IMPORTED_SCRIPT_PSI, "Imported script file ''{0}'' is not loaded. Check your script imports", TO_STRING);
         MAP.put(MISSING_SCRIPT_PROVIDED_PROPERTY_CLASS, "Cannot access script provided property class ''{0}''. Check your module classpath for missing or conflicting dependencies", TO_STRING);
         MAP.put(PRE_RELEASE_CLASS, "{0} is compiled by a pre-release version of Kotlin and cannot be loaded by this version of the compiler", TO_STRING);
-        MAP.put(IR_COMPILED_CLASS, "{0} is compiled by a new Kotlin compiler backend and cannot be loaded by the old compiler", TO_STRING);
+        MAP.put(IR_WITH_UNSTABLE_ABI_COMPILED_CLASS, "{0} is compiled by an unstable version of the Kotlin compiler and cannot be loaded by this compiler", TO_STRING);
+        MAP.put(FIR_COMPILED_CLASS, "{0} is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler", TO_STRING);
         MAP.put(INCOMPATIBLE_CLASS,
                 "{0} was compiled with an incompatible version of Kotlin. {1}",
                 TO_STRING,
@@ -632,7 +632,7 @@ public class DefaultErrorMessages {
         MAP.put(DATA_CLASS_CANNOT_HAVE_CLASS_SUPERTYPES, "Data class inheritance from other classes is forbidden");
         MAP.put(SEALED_SUPERTYPE, "This type is sealed, so it can be inherited by only its own nested classes or objects");
         MAP.put(SEALED_SUPERTYPE_IN_LOCAL_CLASS, "Local class cannot extend a sealed class");
-        MAP.put(SEALED_INHERITOR_IN_DIFFERENT_PACKAGE, "Inheritor of sealed class or interface declared in package {1} but it must be in package {2} where base class is declared", TO_STRING, TO_STRING);
+        MAP.put(SEALED_INHERITOR_IN_DIFFERENT_PACKAGE, "Inheritor of sealed class or interface declared in package {0} but it must be in package {1} where base class is declared", TO_STRING, TO_STRING);
         MAP.put(SEALED_INHERITOR_IN_DIFFERENT_MODULE, "Inheritance of sealed classes or interfaces from different module is prohibited");
         MAP.put(CLASS_INHERITS_JAVA_SEALED_CLASS, "Inheritance of java sealed classes is prohibited");
         MAP.put(SINGLETON_IN_SUPERTYPE, "Cannot inherit from a singleton");
@@ -899,6 +899,7 @@ public class DefaultErrorMessages {
         MAP.put(TYPE_INFERENCE_UPPER_BOUND_VIOLATED, "{0}", TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER);
         MAP.put(TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, "Type inference failed. Expected type mismatch: inferred type is {1} but {0} was expected", RENDER_TYPE, RENDER_TYPE);
         MAP.put(TYPE_INFERENCE_CANDIDATE_WITH_SAM_AND_VARARG, "Please use spread operator to pass an array as vararg. It will be an error in 1.5.");
+        MAP.put(TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE, "Postponed type variable (type variable of the builder inference) can't be used in the receiver type. Use a member function instead of extension one or specify type arguments of a function which uses the builder inference, explicitly.");
 
         MAP.put(TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT, "Type inference for control flow expression failed. Please specify its type explicitly.");
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt
index 84fe95ab7e3..23758d853c3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt
@@ -19,7 +19,7 @@ class CompilerDeserializationConfiguration(languageVersionSettings: LanguageVers
     override val reportErrorsOnPreReleaseDependencies =
         !skipPrereleaseCheck && !languageVersionSettings.isPreRelease() && !KotlinCompilerVersion.isPreRelease()
 
-    override val reportErrorsOnIrDependencies = languageVersionSettings.getFlag(AnalysisFlags.reportErrorsOnIrDependencies)
+    override val allowUnstableDependencies = languageVersionSettings.getFlag(AnalysisFlags.allowUnstableDependencies)
 
     override val typeAliasesAllowed = languageVersionSettings.supportsFeature(LanguageFeature.TypeAliases)
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt
index 765afd913b8..52ea1b1df76 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.kt
@@ -545,7 +545,12 @@ class DelegatedPropertyResolver(
             traceToResolveDelegatedProperty, false, delegateExpression, ContextDependency.DEPENDENT
         )
 
-        var delegateType = delegateTypeInfo.type ?: return null
+        if (delegateTypeInfo.type == null) {
+            traceToResolveDelegatedProperty.commit()
+            return null
+        }
+
+        var delegateType = delegateTypeInfo.type
         var delegateDataFlow = delegateTypeInfo.dataFlowInfo
 
         val delegateTypeConstructor = delegateType.constructor
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
index 2714eeef1ff..ac2ed637f87 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
@@ -328,7 +328,8 @@ public class DescriptorResolver {
             }
 
             destructuringVariables = () -> {
-                assert owner.getDispatchReceiverParameter() == null
+                ReceiverParameterDescriptor dispatchReceiver = owner.getDispatchReceiverParameter();
+                assert dispatchReceiver == null || dispatchReceiver.getContainingDeclaration() instanceof ScriptDescriptor
                         : "Destructuring declarations are only be parsed for lambdas, and they must not have a dispatch receiver";
                 LexicalScope scopeForDestructuring =
                         ScopeUtilsKt.createScopeForDestructuring(scope, owner.getExtensionReceiverParameter());
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
index 3ff54236166..4827e3e4d9a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
@@ -31,13 +31,21 @@ import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluat
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
+import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.intersectWrappedTypes
 import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils
+import org.jetbrains.kotlin.types.model.TypeSystemInferenceExtensionContextDelegate
+import org.jetbrains.kotlin.types.model.TypeVariableMarker
+import org.jetbrains.kotlin.types.model.freshTypeConstructor
+import org.jetbrains.kotlin.types.typeUtil.contains
 import org.jetbrains.kotlin.types.typeUtil.isNullableNothing
 import org.jetbrains.kotlin.types.typeUtil.makeNullable
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
 
 class DiagnosticReporterByTrackingStrategy(
     val constantExpressionEvaluator: ConstantExpressionEvaluator,
@@ -45,7 +53,8 @@ class DiagnosticReporterByTrackingStrategy(
     val psiKotlinCall: PSIKotlinCall,
     val dataFlowValueFactory: DataFlowValueFactory,
     val allDiagnostics: List<KotlinCallDiagnostic>,
-    private val smartCastManager: SmartCastManager
+    private val smartCastManager: SmartCastManager,
+    private val typeSystemContext: TypeSystemInferenceExtensionContextDelegate
 ) : DiagnosticReporter {
     private val trace = context.trace as TrackingBindingTrace
     private val tracingStrategy: TracingStrategy get() = psiKotlinCall.tracingStrategy
@@ -421,21 +430,21 @@ class DiagnosticReporterByTrackingStrategy(
 
             NotEnoughInformationForTypeParameterImpl::class.java -> {
                 error as NotEnoughInformationForTypeParameterImpl
-                if (allDiagnostics.any {
-                        when (it) {
-                            is WrongCountOfTypeArguments -> true
-                            is KotlinConstraintSystemDiagnostic -> {
-                                val otherError = it.error
-                                (otherError is ConstrainingTypeIsError && otherError.typeVariable == error.typeVariable)
-                                        || otherError is NewConstraintError
-                            }
-                            else -> false
-                        }
-                    }
-                ) return
 
-                if (isSpecialFunction(error.resolvedAtom))
-                    return
+                val resolvedAtom = error.resolvedAtom
+                val isDiagnosticRedundant = !isSpecialFunction(resolvedAtom) && allDiagnostics.any {
+                    when (it) {
+                        is WrongCountOfTypeArguments -> true
+                        is KotlinConstraintSystemDiagnostic -> {
+                            val otherError = it.error
+                            (otherError is ConstrainingTypeIsError && otherError.typeVariable == error.typeVariable)
+                                    || otherError is NewConstraintError
+                        }
+                        else -> false
+                    }
+                }
+
+                if (isDiagnosticRedundant) return
                 val expression = when (val atom = error.resolvedAtom.atom) {
                     is PSIKotlinCallForInvoke -> (atom.psiCall as? CallTransformer.CallForImplicitInvoke)?.outerCall?.calleeExpression
                     is PSIKotlinCall -> atom.psiCall.calleeExpression
@@ -443,12 +452,21 @@ class DiagnosticReporterByTrackingStrategy(
                     else -> call.calleeExpression
                 } ?: return
 
-                val typeVariableName = when (val typeVariable = error.typeVariable) {
-                    is TypeVariableFromCallableDescriptor -> typeVariable.originalTypeParameter.name.asString()
-                    is TypeVariableForLambdaReturnType -> "return type of lambda"
-                    else -> error("Unsupported type variable: $typeVariable")
+                if (isSpecialFunction(resolvedAtom)) {
+                    // We locally report errors on some arguments of special calls, on which the error may not be reported directly
+                    reportNotEnoughInformationForTypeParameterForSpecialCall(resolvedAtom, error)
+                } else {
+                    val typeVariableName = when (val typeVariable = error.typeVariable) {
+                        is TypeVariableFromCallableDescriptor -> typeVariable.originalTypeParameter.name.asString()
+                        is TypeVariableForLambdaReturnType -> "return type of lambda"
+                        else -> error("Unsupported type variable: $typeVariable")
+                    }
+                    val unwrappedExpression = if (expression is KtBlockExpression) {
+                        expression.statements.lastOrNull() ?: expression
+                    } else expression
+
+                    trace.reportDiagnosticOnce(NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER.on(unwrappedExpression, typeVariableName))
                 }
-                trace.reportDiagnosticOnce(NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER.on(expression, typeVariableName))
             }
 
             OnlyInputTypesDiagnostic::class.java -> {
@@ -463,7 +481,77 @@ class DiagnosticReporterByTrackingStrategy(
         }
     }
 
+    private fun reportNotEnoughInformationForTypeParameterForSpecialCall(
+        resolvedAtom: ResolvedCallAtom,
+        error: NotEnoughInformationForTypeParameterImpl
+    ) {
+        val subResolvedAtomsToReportError =
+            getSubResolvedAtomsOfSpecialCallToReportUninferredTypeParameter(resolvedAtom, error.typeVariable)
+
+        if (subResolvedAtomsToReportError.isEmpty()) return
+
+        for (subResolvedAtom in subResolvedAtomsToReportError) {
+            val atom = subResolvedAtom.atom as? PSIKotlinCallArgument ?: continue
+            val argumentsExpression = getArgumentsExpressionOrLastExpressionInBlock(atom)
+
+            if (argumentsExpression != null) {
+                val specialFunctionName = requireNotNull(
+                    ControlStructureTypingUtils.ResolveConstruct.values().find { specialFunction ->
+                        specialFunction.specialFunctionName == resolvedAtom.candidateDescriptor.name
+                    }
+                ) { "Unsupported special construct: ${resolvedAtom.candidateDescriptor.name} not found in special construct names" }
+
+                trace.reportDiagnosticOnce(
+                    NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER.on(
+                        argumentsExpression, " for subcalls of ${specialFunctionName.getName()} expression"
+                    )
+                )
+            }
+        }
+    }
+
+    private fun getArgumentsExpressionOrLastExpressionInBlock(atom: PSIKotlinCallArgument): KtExpression? {
+        val valueArgumentExpression = atom.valueArgument.getArgumentExpression()
+
+        return if (valueArgumentExpression is KtBlockExpression) valueArgumentExpression.statements.lastOrNull() else valueArgumentExpression
+    }
+
+    private fun KotlinType.containsUninferredTypeParameter(uninferredTypeVariable: TypeVariableMarker) = contains {
+        ErrorUtils.isUninferredParameter(it) || it == TypeUtils.DONT_CARE
+                || it.constructor == uninferredTypeVariable.freshTypeConstructor(typeSystemContext)
+    }
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private fun getSubResolvedAtomsOfSpecialCallToReportUninferredTypeParameter(
+        resolvedAtom: ResolvedAtom,
+        uninferredTypeVariable: TypeVariableMarker
+    ): Set<ResolvedAtom> =
+        buildSet {
+            for (subResolvedAtom in resolvedAtom.subResolvedAtoms ?: return@buildSet) {
+                val atom = subResolvedAtom.atom
+                val typeToCheck = when {
+                    subResolvedAtom is PostponedResolvedAtom -> subResolvedAtom.expectedType ?: return@buildSet
+                    atom is SimpleKotlinCallArgument -> atom.receiver.receiverValue.type
+                    else -> return@buildSet
+                }
+
+                if (typeToCheck.containsUninferredTypeParameter(uninferredTypeVariable)) {
+                    add(subResolvedAtom)
+                }
+
+                if (!subResolvedAtom.subResolvedAtoms.isNullOrEmpty()) {
+                    addAll(
+                        getSubResolvedAtomsOfSpecialCallToReportUninferredTypeParameter(subResolvedAtom, uninferredTypeVariable)
+                    )
+                }
+            }
+        }
+
+    @OptIn(ExperimentalContracts::class)
     private fun isSpecialFunction(atom: ResolvedAtom): Boolean {
+        contract {
+            returns(true) implies (atom is ResolvedCallAtom)
+        }
         if (atom !is ResolvedCallAtom) return false
 
         return ControlStructureTypingUtils.ResolveConstruct.values().any { specialFunction ->
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
index 547442b4c47..fd143748cf1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt
@@ -519,6 +519,7 @@ class KotlinToResolvedCallTransformer(
             context.dataFlowValueFactory,
             allDiagnostics,
             smartCastManager,
+            typeSystemContext
         )
 
         for (diagnostic in allDiagnostics) {
@@ -566,6 +567,8 @@ sealed class NewAbstractResolvedCall<D : CallableDescriptor>() : ResolvedCall<D>
 
     private var nonTrivialUpdatedResultInfo: DataFlowInfo? = null
 
+    abstract fun containsOnlyOnlyInputTypesErrors(): Boolean
+
     override fun getCall(): Call = kotlinCall.psiKotlinCall.psiCall
 
     override fun getValueArguments(): Map<ValueParameterDescriptor, ResolvedValueArgument> {
@@ -710,6 +713,9 @@ class NewResolvedCallImpl<D : CallableDescriptor>(
         return typeParameters.zip(typeArguments).toMap()
     }
 
+    override fun containsOnlyOnlyInputTypesErrors() =
+        diagnostics.all { it is KotlinConstraintSystemDiagnostic && it.error is OnlyInputTypesDiagnostic }
+
     override fun getSmartCastDispatchReceiverType(): KotlinType? = smartCastDispatchReceiverType
 
     fun updateExtensionReceiverWithSmartCastIfNeeded(smartCastExtensionReceiverType: KotlinType) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
index 14b058e6443..d43f8c8a041 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
@@ -11,10 +11,9 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtExpression
-import org.jetbrains.kotlin.psi.KtNamedFunction
-import org.jetbrains.kotlin.psi.ValueArgument
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.diagnostics.reportDiagnosticOnce
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.MissingSupertypesResolver
@@ -24,6 +23,7 @@ import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator
 import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
 import org.jetbrains.kotlin.resolve.calls.commonSuperType
 import org.jetbrains.kotlin.resolve.calls.components.CallableReferenceAdaptation
+import org.jetbrains.kotlin.resolve.calls.components.CallableReferenceCandidate
 import org.jetbrains.kotlin.resolve.calls.components.SuspendConversionStrategy
 import org.jetbrains.kotlin.resolve.calls.components.isVararg
 import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext
@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.types.expressions.DoubleColonExpressionResolver
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
 import org.jetbrains.kotlin.types.expressions.typeInfoFactory.createTypeInfo
 import org.jetbrains.kotlin.types.typeUtil.asTypeProjection
+import org.jetbrains.kotlin.types.typeUtil.contains
 import org.jetbrains.kotlin.types.typeUtil.isUnit
 import org.jetbrains.kotlin.types.typeUtil.shouldBeSubstituted
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -69,6 +70,14 @@ class ResolvedAtomCompleter(
     )
     private val topLevelTrace = topLevelCallCheckerContext.trace
 
+    private data class CallableReferenceResultTypeInfo(
+        val dispatchReceiver: ReceiverValue?,
+        val extensionReceiver: ReceiverValue?,
+        val explicitReceiver: ReceiverValue?,
+        val substitutor: TypeSubstitutor,
+        val resultType: KotlinType
+    )
+
     private fun complete(resolvedAtom: ResolvedAtom) {
         if (topLevelCallContext.inferenceSession.callCompleted(resolvedAtom)) {
             return
@@ -212,6 +221,7 @@ class ResolvedAtomCompleter(
         } else {
             resultSubstitutor.safeSubstitute(lambda.returnType)
         }
+        val receiverType = lambda.receiver
 
         val approximatedValueParameterTypes = lambda.parameters.map { parameterType ->
             if (parameterType.shouldBeSubstituted()) {
@@ -229,7 +239,16 @@ class ResolvedAtomCompleter(
                 local = true,
                 languageVersionSettings = topLevelCallContext.languageVersionSettings
             )
-        updateTraceForLambda(lambda, topLevelTrace, approximatedReturnType, approximatedValueParameterTypes)
+
+        val approximatedReceiverType = if (receiverType != null) {
+            typeApproximator.approximateDeclarationType(
+                resultSubstitutor.safeSubstitute(receiverType),
+                local = true,
+                languageVersionSettings = topLevelCallContext.languageVersionSettings
+            )
+        } else null
+
+        updateTraceForLambda(lambda, topLevelTrace, approximatedReturnType, approximatedValueParameterTypes, approximatedReceiverType)
 
         for (lambdaResult in resultArgumentsInfo.nonErrorArguments) {
             val resultValueArgument = lambdaResult as? PSIKotlinCallArgument ?: continue
@@ -253,7 +272,8 @@ class ResolvedAtomCompleter(
         lambda: ResolvedLambdaAtom,
         trace: BindingTrace,
         returnType: UnwrappedType,
-        valueParameters: List<UnwrappedType>
+        valueParameters: List<UnwrappedType>,
+        receiverType: UnwrappedType?
     ) {
         val psiCallArgument = lambda.atom.psiCallArgument
 
@@ -276,6 +296,12 @@ class ResolvedAtomCompleter(
 
         functionDescriptor.setReturnType(returnType)
 
+        val extensionReceiverParameter = functionDescriptor.extensionReceiverParameter
+
+        if (receiverType != null && extensionReceiverParameter is ReceiverParameterDescriptorImpl && extensionReceiverParameter.type.shouldBeSubstituted()) {
+            extensionReceiverParameter.setOutType(receiverType)
+        }
+
         for ((i, valueParameter) in functionDescriptor.valueParameters.withIndex()) {
             if (valueParameter !is ValueParameterDescriptorImpl || !valueParameter.type.shouldBeSubstituted()) continue
             valueParameter.setOutType(valueParameters[i])
@@ -328,21 +354,16 @@ class ResolvedAtomCompleter(
         }
     }
 
-    private fun completeCallableReference(
-        resolvedAtom: ResolvedCallableReferenceAtom
-    ) {
-        val callableCandidate = resolvedAtom.candidate
-        if (callableCandidate == null || resolvedAtom.completed) {
-            // todo report meanfull diagnostic here
-            return
-        }
+    private fun updateCallableReferenceResultType(
+        callableCandidate: CallableReferenceCandidate,
+        callableReferenceExpression: KtCallableReferenceExpression
+    ): CallableReferenceResultTypeInfo {
         val resultTypeParameters =
             callableCandidate.freshSubstitutor!!.freshVariables.map { resultSubstitutor.safeSubstitute(it.defaultType) }
 
-        val typeParametersSubstitutor =
-            NewTypeSubstitutorByConstructorMap(
-                (callableCandidate.candidate.typeParameters.map { it.typeConstructor } zip resultTypeParameters).toMap()
-            )
+        val typeParametersSubstitutor = NewTypeSubstitutorByConstructorMap(
+            (callableCandidate.candidate.typeParameters.map { it.typeConstructor } zip resultTypeParameters).toMap()
+        )
 
         val resultSubstitutor = if (callableCandidate.candidate.isSupportedForCallableReference()) {
             val firstSubstitution = typeParametersSubstitutor.toOldSubstitution()
@@ -350,49 +371,16 @@ class ResolvedAtomCompleter(
             TypeSubstitutor.createChainedSubstitutor(firstSubstitution, secondSubstitution)
         } else TypeSubstitutor.EMPTY
 
-        val psiCallArgument = resolvedAtom.atom.psiCallArgument as CallableReferenceKotlinCallArgumentImpl
-        val callableReferenceExpression = psiCallArgument.ktCallableReferenceExpression
-
         // write down type for callable reference expression
         val resultType = resultSubstitutor.safeSubstitute(callableCandidate.reflectionCandidateType, Variance.INVARIANT)
+
         argumentTypeResolver.updateResultArgumentTypeIfNotDenotable(
-            topLevelTrace, expressionTypingServices.statementFilter,
-            resultType,
-            callableReferenceExpression
+            topLevelTrace, expressionTypingServices.statementFilter, resultType, callableReferenceExpression
         )
-        val reference = callableReferenceExpression.callableReference
-
-        val explicitCallableReceiver = when (callableCandidate.explicitReceiverKind) {
-            ExplicitReceiverKind.DISPATCH_RECEIVER -> callableCandidate.dispatchReceiver
-            ExplicitReceiverKind.EXTENSION_RECEIVER -> callableCandidate.extensionReceiver
-            else -> null
-        }
-
-        val explicitReceiver = explicitCallableReceiver?.receiver?.receiverValue?.updateReceiverValue(resultSubstitutor)
-        val psiCall = CallMaker.makeCall(reference, explicitReceiver, null, reference, emptyList())
-
-        val tracing = TracingStrategyImpl.create(reference, psiCall)
-        val temporaryTrace = TemporaryBindingTrace.create(topLevelTrace, "callable reference fake call")
 
         val dispatchReceiver = callableCandidate.dispatchReceiver?.receiver?.receiverValue?.updateReceiverValue(resultSubstitutor)
         val extensionReceiver = callableCandidate.extensionReceiver?.receiver?.receiverValue?.updateReceiverValue(resultSubstitutor)
 
-        val resolvedCall = ResolvedCallImpl(
-            psiCall, callableCandidate.candidate, dispatchReceiver,
-            extensionReceiver, callableCandidate.explicitReceiverKind,
-            null, temporaryTrace, tracing, MutableDataFlowInfoForArguments.WithoutArgumentsCheck(DataFlowInfo.EMPTY)
-        )
-        resolvedCall.setResultingSubstitutor(resultSubstitutor)
-
-        recordArgumentAdaptationForCallableReference(resolvedCall, callableCandidate.callableReferenceAdaptation)
-
-        tracing.bindCall(topLevelTrace, psiCall)
-        tracing.bindReference(topLevelTrace, resolvedCall)
-        tracing.bindResolvedCall(topLevelTrace, resolvedCall)
-
-        resolvedCall.setStatusToSuccess()
-        resolvedCall.markCallAsCompleted()
-
         when (callableCandidate.candidate) {
             is FunctionDescriptor -> doubleColonExpressionResolver.bindFunctionReference(
                 callableReferenceExpression,
@@ -407,17 +395,97 @@ class ResolvedAtomCompleter(
             )
         }
 
-        // TODO: probably we should also record key 'DATA_FLOW_INFO_BEFORE', see ExpressionTypingVisitorDispatcher.getTypeInfo
-        val typeInfo = createTypeInfo(resultType, resolvedAtom.atom.psiCallArgument.dataFlowInfoAfterThisArgument)
-        topLevelTrace.record(BindingContext.EXPRESSION_TYPE_INFO, callableReferenceExpression, typeInfo)
-        topLevelTrace.record(BindingContext.PROCESSED, callableReferenceExpression)
-
         doubleColonExpressionResolver.checkReferenceIsToAllowedMember(
             callableCandidate.candidate,
             topLevelCallContext.trace,
             callableReferenceExpression
         )
 
+        val explicitCallableReceiver = when (callableCandidate.explicitReceiverKind) {
+            ExplicitReceiverKind.DISPATCH_RECEIVER -> callableCandidate.dispatchReceiver
+            ExplicitReceiverKind.EXTENSION_RECEIVER -> callableCandidate.extensionReceiver
+            else -> null
+        }
+        val explicitReceiver = explicitCallableReceiver?.receiver?.receiverValue?.updateReceiverValue(resultSubstitutor)
+
+        return CallableReferenceResultTypeInfo(dispatchReceiver, extensionReceiver, explicitReceiver, resultSubstitutor, resultType)
+    }
+
+    private fun extractCallableReferenceResultTypeInfoFromDescriptor(
+        callableCandidate: CallableReferenceCandidate,
+        recorderDescriptor: CallableDescriptor
+    ): CallableReferenceResultTypeInfo {
+        val explicitCallableReceiver = when (callableCandidate.explicitReceiverKind) {
+            ExplicitReceiverKind.DISPATCH_RECEIVER -> callableCandidate.dispatchReceiver
+            ExplicitReceiverKind.EXTENSION_RECEIVER -> callableCandidate.extensionReceiver
+            else -> null
+        }
+        return CallableReferenceResultTypeInfo(
+            recorderDescriptor.dispatchReceiverParameter?.value,
+            recorderDescriptor.extensionReceiverParameter?.value,
+            explicitCallableReceiver?.receiver?.receiverValue,
+            TypeSubstitutor.EMPTY,
+            callableCandidate.reflectionCandidateType
+        )
+    }
+
+    private fun completeCallableReference(resolvedAtom: ResolvedCallableReferenceAtom) {
+        val psiCallArgument = resolvedAtom.atom.psiCallArgument as CallableReferenceKotlinCallArgumentImpl
+        val callableReferenceExpression = psiCallArgument.ktCallableReferenceExpression
+        val callableCandidate = resolvedAtom.candidate
+        if (callableCandidate == null || resolvedAtom.completed) {
+            // todo report meanfull diagnostic here
+            return
+        }
+        val recorderDescriptor = when (callableCandidate.candidate) {
+            is FunctionDescriptor -> topLevelCallContext.trace.get(BindingContext.FUNCTION, callableReferenceExpression)
+            is PropertyDescriptor -> topLevelCallContext.trace.get(BindingContext.VARIABLE, callableReferenceExpression)
+            else -> null
+        }
+
+        val rawExtensionReceiver = callableCandidate.extensionReceiver
+
+        if (rawExtensionReceiver != null && rawExtensionReceiver.receiver.receiverValue.type.contains { it is StubType }) {
+            topLevelTrace.reportDiagnosticOnce(Errors.TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE.on(callableReferenceExpression))
+            return
+        }
+
+        // For some callable references we can already have recorder descriptor (see `DoubleColonExpressionResolver.getCallableReferenceType`)
+        val resultTypeInfo = if (recorderDescriptor != null) {
+            extractCallableReferenceResultTypeInfoFromDescriptor(callableCandidate, recorderDescriptor)
+        } else {
+            updateCallableReferenceResultType(callableCandidate, psiCallArgument.ktCallableReferenceExpression)
+        }
+
+        val reference = callableReferenceExpression.callableReference
+        val psiCall = CallMaker.makeCall(reference, resultTypeInfo.explicitReceiver, null, reference, emptyList())
+
+        val tracing = TracingStrategyImpl.create(reference, psiCall)
+        val temporaryTrace = TemporaryBindingTrace.create(topLevelTrace, "callable reference fake call")
+
+        val resolvedCall = ResolvedCallImpl(
+            psiCall, callableCandidate.candidate, resultTypeInfo.dispatchReceiver,
+            resultTypeInfo.extensionReceiver, callableCandidate.explicitReceiverKind,
+            null, temporaryTrace, tracing, MutableDataFlowInfoForArguments.WithoutArgumentsCheck(DataFlowInfo.EMPTY)
+        )
+
+        resolvedCall.setResultingSubstitutor(resultTypeInfo.substitutor)
+
+        recordArgumentAdaptationForCallableReference(resolvedCall, callableCandidate.callableReferenceAdaptation)
+
+        tracing.bindCall(topLevelTrace, psiCall)
+        tracing.bindReference(topLevelTrace, resolvedCall)
+        tracing.bindResolvedCall(topLevelTrace, resolvedCall)
+
+        resolvedCall.setStatusToSuccess()
+        resolvedCall.markCallAsCompleted()
+
+        // TODO: probably we should also record key 'DATA_FLOW_INFO_BEFORE', see ExpressionTypingVisitorDispatcher.getTypeInfo
+        val typeInfo = createTypeInfo(resultTypeInfo.resultType, resolvedAtom.atom.psiCallArgument.dataFlowInfoAfterThisArgument)
+
+        topLevelTrace.record(BindingContext.EXPRESSION_TYPE_INFO, callableReferenceExpression, typeInfo)
+        topLevelTrace.record(BindingContext.PROCESSED, callableReferenceExpression)
+
         kotlinToResolvedCallTransformer.runCallCheckers(resolvedCall, topLevelCallCheckerContext)
         resolvedAtom.completed = true
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt
index b1f6bcd4ef5..2df4da03bc9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/MissingDependencyClassChecker.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext
 import org.jetbrains.kotlin.resolve.calls.checkers.isComputingDeferredType
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
 import org.jetbrains.kotlin.types.KotlinType
@@ -58,8 +59,11 @@ object MissingDependencyClassChecker : CallChecker {
             if (source.isPreReleaseInvisible) {
                 return PRE_RELEASE_CLASS.on(reportOn, source.presentableString)
             }
-            if (source.isInvisibleIrDependency) {
-                return IR_COMPILED_CLASS.on(reportOn, source.presentableString)
+            if (source.abiStability == DeserializedContainerAbiStability.FIR_UNSTABLE) {
+                return FIR_COMPILED_CLASS.on(reportOn, source.presentableString)
+            }
+            if (source.abiStability == DeserializedContainerAbiStability.IR_UNSTABLE) {
+                return IR_WITH_UNSTABLE_ABI_COMPILED_CLASS.on(reportOn, source.presentableString)
             }
         }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
index 7bced7ad3e1..08310b5da60 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt
@@ -50,7 +50,7 @@ protected constructor(
     private val propertyDescriptors: MemoizedFunctionToNotNull<Name, Collection<PropertyDescriptor>> =
         storageManager.createMemoizedFunction { doGetProperties(it) }
     private val typeAliasDescriptors: MemoizedFunctionToNotNull<Name, Collection<TypeAliasDescriptor>> =
-        storageManager.createMemoizedFunction { doGetTypeAliases(it) }
+        storageManager.createMemoizedFunction( { doGetTypeAliases(it) }, onRecursiveCall = { _,_ -> emptyList() })
 
     private val declaredFunctionDescriptors: MemoizedFunctionToNotNull<Name, Collection<SimpleFunctionDescriptor>> =
         storageManager.createMemoizedFunction { getDeclaredFunctions(it) }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
index 0753c42af28..4e37ce2acb5 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
+import org.jetbrains.kotlin.descriptors.annotations.FilteredByPredicateAnnotations
+import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtAnnotationEntry
 import org.jetbrains.kotlin.resolve.AnnotationResolver
@@ -32,6 +34,8 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.source.toSourceElement
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.storage.getValue
+import org.jetbrains.kotlin.types.AbbreviatedType
+import org.jetbrains.kotlin.types.ErrorUtils
 
 abstract class LazyAnnotationsContext(
     val annotationResolver: AnnotationResolver,
@@ -77,17 +81,30 @@ class LazyAnnotationDescriptor(
         c.trace.record(BindingContext.ANNOTATION, annotationEntry, this)
     }
 
-    override val type by c.storageManager.createLazyValue {
-        c.annotationResolver.resolveAnnotationType(scope, annotationEntry, c.trace)
-    }
+    override val type by c.storageManager.createLazyValue(
+        computable = lazy@{
+            val annotationType = c.annotationResolver.resolveAnnotationType(scope, annotationEntry, c.trace)
+            if (annotationType is AbbreviatedType) {
+                // This is needed to prevent recursion in cases like this: typealias S = @S Ann
+                if (annotationType.annotations.any { it == this }) {
+                    annotationType.abbreviation.constructor.declarationDescriptor?.let { typeAliasDescriptor ->
+                        c.trace.report(Errors.RECURSIVE_TYPEALIAS_EXPANSION.on(annotationEntry, typeAliasDescriptor))
+                    }
+                    return@lazy annotationType.replaceAnnotations(FilteredByPredicateAnnotations(annotationType.annotations) { it != this })
+                }
+            }
+            annotationType
+        },
+        onRecursiveCall = {
+            ErrorUtils.createErrorType("Recursion in type of annotation detected")
+        }
+    )
 
     override val source = annotationEntry.toSourceElement()
 
-    private val scope = if (c.scope.ownerDescriptor is PackageFragmentDescriptor) {
-        LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, c.scope.ownerDescriptor))
-    } else {
-        c.scope
-    }
+    private val scope = (c.scope.ownerDescriptor as? PackageFragmentDescriptor)?.let {
+        LexicalScope.Base(c.scope, FileDescriptorForVisibilityChecks(source, it))
+    } ?: c.scope
 
     override val allValueArguments by c.storageManager.createLazyValue {
         val resolutionResults = c.annotationResolver.resolveAnnotationCall(annotationEntry, scope, c.trace)
@@ -110,10 +127,9 @@ class LazyAnnotationDescriptor(
 
     private class FileDescriptorForVisibilityChecks(
         private val source: SourceElement,
-        private val containingDeclaration: DeclarationDescriptor
-    ) : DeclarationDescriptorWithSource {
+        private val containingDeclaration: PackageFragmentDescriptor
+    ) : DeclarationDescriptorWithSource, PackageFragmentDescriptor by containingDeclaration {
         override val annotations: Annotations get() = Annotations.EMPTY
-        override fun getContainingDeclaration() = containingDeclaration
         override fun getSource() = source
         override fun getOriginal() = this
         override fun getName() = Name.special("< file descriptor for annotation resolution >")
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
index 99fd1c63a4b..817a738da66 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
@@ -60,6 +60,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability;
 import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind;
 import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate;
 import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy;
+import org.jetbrains.kotlin.resolve.calls.tower.NewAbstractResolvedCall;
 import org.jetbrains.kotlin.resolve.calls.util.CallMaker;
 import org.jetbrains.kotlin.resolve.checkers.UnderscoreChecker;
 import org.jetbrains.kotlin.resolve.constants.*;
@@ -823,10 +824,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
             DiagnosticFactory0<PsiElement> diagnosticFactory =
                     isFunctionLiteral ? NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION : NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE;
             context.trace.report(diagnosticFactory.on(operationSign));
-            if (baseTypeInfo == null) {
-                return TypeInfoFactoryKt.createTypeInfo(ErrorUtils.createErrorType("Unresolved lambda expression"), context);
-            }
-            return baseTypeInfo;
+            return baseTypeInfo != null ? baseTypeInfo : components.expressionTypingServices.getTypeInfo(baseExpression, context);
         }
         assert baseTypeInfo != null : "Base expression was not processed: " + expression;
         KotlinType baseType = baseTypeInfo.getType();
@@ -1397,14 +1395,26 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
             rightTypeInfo = rightTypeInfo.replaceDataFlowInfo(dataFlowInfo);
         }
 
-        if (resolutionResult.isSuccess()) {
+        if (resolutionResult.isSuccess() || isResolutionSuccessfulWithOnlyInputTypesWarnings(resolutionResult.getResultingCalls(), context)) {
             return rightTypeInfo.replaceType(components.builtIns.getBooleanType());
-        }
-        else {
+        } else {
             return rightTypeInfo.clearType();
         }
     }
 
+    private static boolean isResolutionSuccessfulWithOnlyInputTypesWarnings(
+            @Nullable Collection<? extends ResolvedCall<FunctionDescriptor>> allCandidates,
+            @NotNull ExpressionTypingContext context
+    ) {
+        if (allCandidates == null || allCandidates.isEmpty()) return false;
+
+        boolean areAllCandidatesFailedWithOnlyInputTypesError = allCandidates.stream().allMatch((resolvedCall) ->
+            resolvedCall instanceof NewAbstractResolvedCall<?> && ((NewAbstractResolvedCall<?>) resolvedCall).containsOnlyOnlyInputTypesErrors()
+        );
+        boolean isNonStrictOnlyInputTypesCheckEnabled = context.languageVersionSettings.supportsFeature(LanguageFeature.NonStrictOnlyInputTypesChecks);
+
+        return areAllCandidatesFailedWithOnlyInputTypesError && isNonStrictOnlyInputTypesCheckEnabled;
+    }
 
     private boolean ensureBooleanResult(KtExpression operationSign, Name name, KotlinType resultType, ExpressionTypingContext context) {
         return ensureBooleanResultWithCustomSubject(operationSign, resultType, "'" + name + "'", context);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt
index 2f2a5942567..604a8d18588 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt
@@ -15,8 +15,8 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor
-import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.Errors.*
+import org.jetbrains.kotlin.diagnostics.reportDiagnosticOnce
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
@@ -49,6 +49,7 @@ import org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE
 import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
 import org.jetbrains.kotlin.types.expressions.FunctionWithBigAritySupport.LanguageVersionDependent
 import org.jetbrains.kotlin.types.expressions.typeInfoFactory.createTypeInfo
+import org.jetbrains.kotlin.types.expressions.typeInfoFactory.noTypeInfo
 import org.jetbrains.kotlin.types.refinement.TypeRefinement
 import org.jetbrains.kotlin.types.typeUtil.*
 import org.jetbrains.kotlin.utils.yieldIfNotNull
@@ -540,6 +541,16 @@ class DoubleColonExpressionResolver(
 
         val (lhs, resolutionResults) = resolveCallableReference(expression, c, ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS)
         val result = getCallableReferenceType(expression, lhs, resolutionResults, c)
+        val doesSomeExtensionReceiverContainsStubType =
+            resolutionResults != null && resolutionResults.resultingCalls.any { resolvedCall ->
+                resolvedCall.extensionReceiver?.type?.contains { it is StubType } == true
+            }
+
+        if (doesSomeExtensionReceiverContainsStubType) {
+            c.trace.reportDiagnosticOnce(TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE.on(expression))
+            return noTypeInfo(c)
+        }
+
         val dataFlowInfo = (lhs as? DoubleColonLHS.Expression)?.dataFlowInfo ?: c.dataFlowInfo
 
         if (c.inferenceSession is CoroutineInferenceSession && result?.contains { it is StubType } == true) {
@@ -637,9 +648,9 @@ class DoubleColonExpressionResolver(
             bigAritySupport.shouldCheckLanguageVersionSettings &&
             !languageVersionSettings.supportsFeature(LanguageFeature.FunctionTypesWithBigArity)
         ) {
-            context.trace.report(Errors.UNSUPPORTED_FEATURE.on(
-                expression, LanguageFeature.FunctionTypesWithBigArity to languageVersionSettings
-            ))
+            context.trace.report(
+                UNSUPPORTED_FEATURE.on(expression, LanguageFeature.FunctionTypesWithBigArity to languageVersionSettings)
+            )
         }
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
index e47863a21e8..907a1a3cca8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.resolve.*;
 import org.jetbrains.kotlin.resolve.calls.components.InferenceSession;
 import org.jetbrains.kotlin.resolve.calls.context.ContextDependency;
 import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext;
+import org.jetbrains.kotlin.resolve.calls.inference.CoroutineInferenceSession;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue;
 import org.jetbrains.kotlin.resolve.calls.tower.KotlinResolutionCallbacksImpl;
@@ -423,7 +424,8 @@ public class ExpressionTypingServices {
             @NotNull KtExpression statementExpression,
             @NotNull ExpressionTypingContext context
     ) {
-        if (!context.languageVersionSettings.supportsFeature(LanguageFeature.NewInference)) return null;
+        if (!context.languageVersionSettings.supportsFeature(LanguageFeature.NewInference) || context.inferenceSession instanceof CoroutineInferenceSession)
+            return null;
         KtFunctionLiteral functionLiteral = PsiUtilsKt.getNonStrictParentOfType(statementExpression, KtFunctionLiteral.class);
         if (functionLiteral != null) {
             KotlinResolutionCallbacksImpl.LambdaInfo info =
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt
index 614ef1cf05a..30859ffb09f 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDeclarations.kt
@@ -16,26 +16,16 @@
 
 package org.jetbrains.kotlin.backend.common
 
-import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.declarations.IrVariable
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrLoop
-import org.jetbrains.kotlin.ir.util.DeepCopyIrTreeWithSymbols
-import org.jetbrains.kotlin.ir.util.DeepCopySymbolRemapper
-import org.jetbrains.kotlin.ir.util.DeepCopyTypeRemapper
-import org.jetbrains.kotlin.ir.util.DescriptorsRemapper
+import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
 
 @Suppress("UNCHECKED_CAST")
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 fun <T : IrElement> T.deepCopyWithVariables(): T {
-    val descriptorsRemapper = object : DescriptorsRemapper {
-        override fun remapDeclaredVariable(descriptor: VariableDescriptor) = WrappedVariableDescriptor()
-    }
-
-    val symbolsRemapper = DeepCopySymbolRemapper(descriptorsRemapper)
+    val symbolsRemapper = DeepCopySymbolRemapper(NullDescriptorsRemapper)
     acceptVoid(symbolsRemapper)
 
     val typesRemapper = DeepCopyTypeRemapper(symbolsRemapper)
@@ -45,12 +35,6 @@ fun <T : IrElement> T.deepCopyWithVariables(): T {
                 override fun getNonTransformedLoop(irLoop: IrLoop): IrLoop {
                     return irLoop
                 }
-
-                override fun visitVariable(declaration: IrVariable): IrVariable {
-                    val variable = super.visitVariable(declaration)
-                    variable.descriptor.let { if (it is WrappedVariableDescriptor) it.bind(variable) }
-                    return variable
-                }
             },
             null
     ) as T
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt
index efbdfc2fe6e..44671ca21a8 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt
@@ -6,11 +6,9 @@
 package org.jetbrains.kotlin.backend.common.ir
 
 import org.jetbrains.kotlin.backend.common.lower.VariableRemapper
-import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.ir.IrStatement
+import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrReturnableBlockImpl
@@ -83,12 +81,6 @@ private fun IrBody.move(
 // TODO use a generic inliner (e.g. JS/Native's FunctionInlining.Inliner)
 // Inline simple function calls without type parameters, default parameters, or varargs.
 fun IrFunction.inline(target: IrDeclarationParent, arguments: List<IrValueDeclaration> = listOf()): IrReturnableBlock =
-    IrReturnableBlockImpl(startOffset, endOffset, returnType, IrReturnableBlockSymbolImpl(getNewWrappedDescriptor()), null, symbol).apply {
+    IrReturnableBlockImpl(startOffset, endOffset, returnType, IrReturnableBlockSymbolImpl(), null, symbol).apply {
         statements += body!!.move(this@inline, target, symbol, valueParameters.zip(arguments).toMap()).statements
-    }
-
-fun IrFunction.getNewWrappedDescriptor(): FunctionDescriptor = when (this) {
-    is IrConstructor -> WrappedClassConstructorDescriptor().apply { bind(this@getNewWrappedDescriptor) }
-    is IrSimpleFunction -> WrappedSimpleFunctionDescriptor().apply { bind(this@getNewWrappedDescriptor) }
-    else -> error("Unknown IrFunction kind: $this")
-}
+    }
\ No newline at end of file
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
index 9ea06bc92a7..358e6b8fdfe 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt
@@ -36,7 +36,6 @@ import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
 import java.io.StringWriter
 
 fun ir2string(ir: IrElement?): String = ir?.render() ?: ""
@@ -129,12 +128,7 @@ fun IrValueParameter.copyTo(
     isNoinline: Boolean = this.isNoinline,
     isAssignable: Boolean = this.isAssignable
 ): IrValueParameter {
-    val descriptor = if (index < 0) {
-        WrappedReceiverParameterDescriptor()
-    } else {
-        WrappedValueParameterDescriptor()
-    }
-    val symbol = IrValueParameterSymbolImpl(descriptor)
+    val symbol = IrValueParameterSymbolImpl()
     val defaultValueCopy = defaultValue?.let { originalDefault ->
         factory.createExpressionBody(originalDefault.startOffset, originalDefault.endOffset) {
             expression = originalDefault.expression.deepCopyWithVariables().also {
@@ -147,7 +141,6 @@ fun IrValueParameter.copyTo(
         name, index, type, varargElementType, isCrossinline = isCrossinline,
         isNoinline = isNoinline, isHidden = false, isAssignable = isAssignable
     ).also {
-        descriptor.bind(it)
         it.parent = irFunction
         it.defaultValue = defaultValueCopy
         it.copyAnnotationsFrom(this)
@@ -167,10 +160,9 @@ fun IrTypeParameter.copyToWithoutSuperTypes(
 
 fun IrFunction.copyReceiverParametersFrom(from: IrFunction, substitutionMap: Map<IrTypeParameterSymbol, IrType>) {
     dispatchReceiverParameter = from.dispatchReceiverParameter?.run {
-        val newDescriptor = WrappedReceiverParameterDescriptor()
         factory.createValueParameter(
             startOffset, endOffset, origin,
-            IrValueParameterSymbolImpl(newDescriptor),
+            IrValueParameterSymbolImpl(),
             name, index,
             type.substitute(substitutionMap),
             varargElementType?.substitute(substitutionMap),
@@ -178,7 +170,6 @@ fun IrFunction.copyReceiverParametersFrom(from: IrFunction, substitutionMap: Map
             isHidden, isAssignable
         ).also { parameter ->
             parameter.parent = this@copyReceiverParametersFrom
-            newDescriptor.bind(this)
         }
     }
     extensionReceiverParameter = from.extensionReceiverParameter?.copyTo(this)
@@ -428,11 +419,10 @@ fun IrClass.createParameterDeclarations() {
 fun IrFunction.createDispatchReceiverParameter(origin: IrDeclarationOrigin? = null) {
     assert(dispatchReceiverParameter == null)
 
-    val newDescriptor = WrappedReceiverParameterDescriptor()
     dispatchReceiverParameter = factory.createValueParameter(
         startOffset, endOffset,
         origin ?: parentAsClass.origin,
-        IrValueParameterSymbolImpl(newDescriptor),
+        IrValueParameterSymbolImpl(),
         Name.special("<this>"),
         -1,
         parentAsClass.defaultType,
@@ -443,7 +433,6 @@ fun IrFunction.createDispatchReceiverParameter(origin: IrDeclarationOrigin? = nu
         isAssignable = false
     ).apply {
         parent = this@createDispatchReceiverParameter
-        newDescriptor.bind(this)
     }
 }
 
@@ -469,11 +458,11 @@ val IrFunction.allParametersCount: Int
 private class FakeOverrideBuilderForLowerings : FakeOverrideBuilderStrategy() {
 
     override fun linkFunctionFakeOverride(declaration: IrFakeOverrideFunction) {
-        declaration.acquireSymbol(IrSimpleFunctionSymbolImpl(WrappedSimpleFunctionDescriptor()))
+        declaration.acquireSymbol(IrSimpleFunctionSymbolImpl())
     }
 
     override fun linkPropertyFakeOverride(declaration: IrFakeOverrideProperty) {
-        val propertySymbol = IrPropertySymbolImpl(WrappedPropertyDescriptor())
+        val propertySymbol = IrPropertySymbolImpl()
         declaration.getter?.let { it.correspondingPropertySymbol = propertySymbol }
         declaration.setter?.let { it.correspondingPropertySymbol = propertySymbol }
 
@@ -509,11 +498,10 @@ fun IrFactory.createStaticFunctionWithReceivers(
         copyMetadata: Boolean = true,
         typeParametersFromContext: List<IrTypeParameter> = listOf()
 ): IrSimpleFunction {
-    val descriptor = WrappedSimpleFunctionDescriptor()
     return createFunction(
         oldFunction.startOffset, oldFunction.endOffset,
         origin,
-        IrSimpleFunctionSymbolImpl(descriptor),
+        IrSimpleFunctionSymbolImpl(),
         name,
         visibility,
         modality,
@@ -528,7 +516,6 @@ fun IrFactory.createStaticFunctionWithReceivers(
         isInfix = oldFunction is IrSimpleFunction && oldFunction.isInfix,
         containerSource = oldFunction.containerSource,
     ).apply {
-        descriptor.bind(this)
         parent = irParent
 
         val newTypeParametersFromContext = copyAndRenameConflictingTypeParametersFrom(
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FinallyBlocksLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FinallyBlocksLowering.kt
index 2faee457a37..b2f7bb156b6 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FinallyBlocksLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/FinallyBlocksLowering.kt
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.ir.builders.declarations.buildVariable
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrReturnTargetSymbol
@@ -175,7 +174,7 @@ class FinallyBlocksLowering(val context: CommonBackendContext, private val throw
         currentTryScope.jumps.getOrPut(jump) {
             val type = (jump as? Return)?.target?.owner?.returnType(context) ?: value.type
             jump.toString()
-            val symbol = IrReturnableBlockSymbolImpl(WrappedSimpleFunctionDescriptor())
+            val symbol = IrReturnableBlockSymbolImpl()
             with(currentTryScope) {
                 irBuilder.run {
                     val inlinedFinally = irInlineFinally(symbol, type, expression, finallyExpression)
@@ -234,7 +233,7 @@ class FinallyBlocksLowering(val context: CommonBackendContext, private val throw
             using(TryScope(syntheticTry, transformedFinallyExpression, this)) {
 
                 val fallThroughType = aTry.type
-                val fallThroughSymbol = IrReturnableBlockSymbolImpl(WrappedSimpleFunctionDescriptor())
+                val fallThroughSymbol = IrReturnableBlockSymbolImpl()
                 val transformedResult = aTry.tryResult.transform(transformer, null)
                 val returnedResult = irReturn(fallThroughSymbol, transformedResult)
 
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
index 5c8c782a254..c6781ef62db 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InlineClassDeclarationLowering.kt
@@ -39,8 +39,9 @@ class InlineClassLowering(val context: CommonBackendContext) {
             }
         }
 
-        private fun transformConstructor(irConstructor: IrConstructor): List<IrDeclaration>? {
-            if (irConstructor.isPrimary) return null
+        private fun transformConstructor(irConstructor: IrConstructor): List<IrDeclaration> {
+            if (irConstructor.isPrimary)
+                return transformPrimaryConstructor(irConstructor)
 
             // Secondary constructors are lowered into static function
             val result = getOrCreateStaticMethod(irConstructor)
@@ -67,6 +68,72 @@ class InlineClassLowering(val context: CommonBackendContext) {
             return listOf(function, staticMethod)
         }
 
+        private fun transformPrimaryConstructor(irConstructor: IrConstructor): List<IrDeclaration> {
+            val klass = irConstructor.parentAsClass
+            val inlineClassType = klass.defaultType
+            val initFunction = getOrCreateStaticMethod(irConstructor).also {
+                it.returnType = inlineClassType
+            }
+            var delegatingCtorCall: IrDelegatingConstructorCall? = null
+            var setMemberField: IrSetField? = null
+
+            initFunction.body = context.irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET) {
+                val origParameterSymbol = irConstructor.valueParameters.single().symbol
+                statements += context.createIrBuilder(initFunction.symbol).irBlockBody(initFunction) {
+                    val builder = this
+                    fun unboxedInlineClassValue() = builder.irReinterpretCast(
+                        builder.irGet(initFunction.valueParameters.single()),
+                        type = klass.defaultType,
+                    )
+
+                    (irConstructor.body as IrBlockBody).deepCopyWithSymbols(initFunction).statements.forEach { statement ->
+                        +statement.transformStatement(object : IrElementTransformerVoid() {
+                            override fun visitDelegatingConstructorCall(expression: IrDelegatingConstructorCall): IrExpression {
+                                delegatingCtorCall = expression.deepCopyWithSymbols(irConstructor)
+                                return builder.irBlock {}  // Removing delegating constructor call
+                            }
+
+                            override fun visitSetField(expression: IrSetField): IrExpression {
+                                val isMemberFieldSet = expression.symbol.owner.parent == klass
+                                if (isMemberFieldSet) {
+                                    setMemberField = expression.deepCopyWithSymbols(irConstructor)
+                                }
+                                expression.transformChildrenVoid()
+                                if (isMemberFieldSet) {
+                                    return expression.value
+                                }
+                                return expression
+                            }
+
+                            override fun visitGetField(expression: IrGetField): IrExpression {
+                                expression.transformChildrenVoid()
+                                if (expression.symbol.owner.parent == klass)
+                                    return builder.irGet(initFunction.valueParameters.single())
+                                return expression
+                            }
+
+                            override fun visitGetValue(expression: IrGetValue): IrExpression {
+                                expression.transformChildrenVoid()
+                                if (expression.symbol.owner.parent == klass)
+                                    return unboxedInlineClassValue()
+                                if (expression.symbol == origParameterSymbol)
+                                    return builder.irGet(initFunction.valueParameters.single())
+                                return expression
+                            }
+                        })
+                    }
+                    +irReturn(unboxedInlineClassValue())
+                }.statements
+            }
+
+            irConstructor.body = context.irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET) {
+                statements += delegatingCtorCall!!
+                statements += setMemberField!!
+            }
+
+            return listOf(irConstructor, initFunction)
+        }
+
         private fun transformConstructorBody(irConstructor: IrConstructor, staticMethod: IrSimpleFunction) {
             if (irConstructor.isPrimary) return // TODO error() maybe?
 
@@ -232,7 +299,7 @@ class InlineClassLowering(val context: CommonBackendContext) {
                 override fun visitConstructorCall(expression: IrConstructorCall): IrExpression {
                     expression.transformChildrenVoid(this)
                     val function = expression.symbol.owner
-                    if (!function.parentAsClass.isInline || function.isPrimary) {
+                    if (!function.parentAsClass.isInline) {
                         return expression
                     }
 
@@ -263,7 +330,6 @@ class InlineClassLowering(val context: CommonBackendContext) {
                     val klass = function.parentAsClass
                     return when {
                         !klass.isInline -> expression
-                        function.isPrimary -> irConstructorCall(expression, function.symbol)
                         else -> irCall(expression, getOrCreateStaticMethod(function))
                     }
                 }
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/KotlinNothingValueExceptionLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/KotlinNothingValueExceptionLowering.kt
index f41342edce7..f904a5a1797 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/KotlinNothingValueExceptionLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/KotlinNothingValueExceptionLowering.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.backend.common.BodyLoweringPass
 import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
-import org.jetbrains.kotlin.ir.declarations.IrSymbolDeclaration
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
@@ -23,7 +22,7 @@ class KotlinNothingValueExceptionLowering(
 ) : BodyLoweringPass {
     override fun lower(irBody: IrBody, container: IrDeclaration) {
         if (!skip(container)) {
-            irBody.transformChildrenVoid(Transformer((container as IrSymbolDeclaration<*>).symbol))
+            irBody.transformChildrenVoid(Transformer(container.symbol))
         }
     }
 
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
index e164769b05d..a2cb3dcca7b 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/StringConcatenationLowering.kt
@@ -121,10 +121,6 @@ private class StringConcatenationTransformer(val lower: StringConcatenationLower
     }
 
     override fun visitDeclaration(declaration: IrDeclarationBase): IrStatement {
-        if (declaration !is IrSymbolDeclaration<*>) {
-            return super.visitDeclaration(declaration)
-        }
-
         with(declaration) {
             buildersStack.add(
                 context.createIrBuilder(declaration.symbol, startOffset, endOffset)
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/DeepCopyIrTreeWithDescriptors.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/DeepCopyIrTreeWithDescriptors.kt
index 7c4789271a3..9f76c576905 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/DeepCopyIrTreeWithDescriptors.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/DeepCopyIrTreeWithDescriptors.kt
@@ -5,8 +5,6 @@
 
 package org.jetbrains.kotlin.backend.common.lower.inline
 
-import org.jetbrains.kotlin.ir.util.DescriptorsToIrRemapper
-import org.jetbrains.kotlin.ir.util.WrappedDescriptorPatcher
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
@@ -37,9 +35,6 @@ internal class DeepCopyIrTreeWithSymbolsForInliner(
         // Copy IR.
         val result = irElement.transform(copier, data = null)
 
-        // Bind newly created IR with wrapped descriptors.
-        result.acceptVoid(WrappedDescriptorPatcher)
-
         result.patchDeclarationParents(parent)
         return result
     }
@@ -133,7 +128,7 @@ internal class DeepCopyIrTreeWithSymbolsForInliner(
         }
     }
 
-    private val symbolRemapper = SymbolRemapperImpl(DescriptorsToIrRemapper)
+    private val symbolRemapper = SymbolRemapperImpl(NullDescriptorsRemapper)
     private val typeRemapper = InlinerTypeRemapper(symbolRemapper, typeArguments)
     private val copier = object : DeepCopyIrTreeWithSymbols(symbolRemapper, typeRemapper, InlinerSymbolRenamer()) {
         private fun IrType.remapTypeAndErase() = typeRemapper.remapTypeAndOptionallyErase(this, erase = true)
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
index 370e2487544..1a29f8e91c9 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.common.lower.inline
 
 import org.jetbrains.kotlin.backend.common.*
 import org.jetbrains.kotlin.backend.common.ir.Symbols
-import org.jetbrains.kotlin.backend.common.ir.getNewWrappedDescriptor
 import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
@@ -178,7 +177,7 @@ class FunctionInlining(
             val evaluationStatements = evaluateArguments(callSite, copiedCallee)
             val statements = (copiedCallee.body as IrBlockBody).statements
 
-            val irReturnableBlockSymbol = IrReturnableBlockSymbolImpl(callee.getNewWrappedDescriptor())
+            val irReturnableBlockSymbol = IrReturnableBlockSymbolImpl()
             val endOffset = callee.endOffset
             /* creates irBuilder appending to the end of the given returnable block: thus why we initialize
              * irBuilder with (..., endOffset, endOffset).
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/DumperVerifier.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/DumperVerifier.kt
index db767d4bacf..5fd4ecc7905 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/DumperVerifier.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/phaser/DumperVerifier.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.backend.common.IrValidatorConfig
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.util.dump
+import org.jetbrains.kotlin.ir.util.dumpKotlinLike
 import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
@@ -62,6 +63,9 @@ fun dumpIrElement(actionState: ActionState, data: IrElement, @Suppress("UNUSED_P
     var dumpText: String = ""
     val elementName: String
 
+    val dumpStrategy = System.getProperty("org.jetbrains.kotlin.compiler.ir.dump.strategy")
+    val dump: IrElement.() -> String = if (dumpStrategy == "KotlinLike") IrElement::dumpKotlinLike else IrElement::dump
+
     val dumpOnlyFqName = actionState.config.dumpOnlyFqName
     if (dumpOnlyFqName != null) {
         elementName = dumpOnlyFqName
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt
index 4314229c78f..546b0615482 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/ir/builders/declarations/declarationBuilders.kt
@@ -21,15 +21,12 @@ import org.jetbrains.kotlin.types.Variance
 
 @PublishedApi
 internal fun IrFactory.buildClass(builder: IrClassBuilder): IrClass = with(builder) {
-    val wrappedDescriptor = WrappedClassDescriptor()
     createClass(
         startOffset, endOffset, origin,
-        IrClassSymbolImpl(wrappedDescriptor),
+        IrClassSymbolImpl(),
         name, kind, visibility, modality,
         isCompanion, isInner, isData, isExternal, isInline, isExpect, isFun
-    ).also {
-        wrappedDescriptor.bind(it)
-    }
+    )
 }
 
 inline fun IrFactory.buildClass(builder: IrClassBuilder.() -> Unit) =
@@ -40,14 +37,12 @@ inline fun IrFactory.buildClass(builder: IrClassBuilder.() -> Unit) =
 
 @PublishedApi
 internal fun IrFactory.buildField(builder: IrFieldBuilder): IrField = with(builder) {
-    val wrappedDescriptor = WrappedFieldDescriptor()
     createField(
         startOffset, endOffset, origin,
-        IrFieldSymbolImpl(wrappedDescriptor),
+        IrFieldSymbolImpl(),
         name, type, visibility, isFinal, isExternal, isStatic,
     ).also {
         it.metadata = metadata
-        wrappedDescriptor.bind(it)
     }
 }
 
@@ -75,17 +70,13 @@ fun IrClass.addField(fieldName: String, fieldType: IrType, fieldVisibility: Desc
 
 @PublishedApi
 internal fun IrFactory.buildProperty(builder: IrPropertyBuilder): IrProperty = with(builder) {
-    val wrappedDescriptor = WrappedPropertyDescriptor()
-
     createProperty(
         startOffset, endOffset, origin,
-        IrPropertySymbolImpl(wrappedDescriptor),
+        IrPropertySymbolImpl(),
         name, visibility, modality,
         isVar, isConst, isLateinit, isDelegated, isExternal, isExpect, isFakeOverride,
         containerSource,
-    ).also {
-        wrappedDescriptor.bind(it)
-    }
+    )
 }
 
 inline fun IrFactory.buildProperty(builder: IrPropertyBuilder.() -> Unit) =
@@ -113,31 +104,25 @@ inline fun IrProperty.addGetter(builder: IrFunctionBuilder.() -> Unit = {}): IrS
 
 @PublishedApi
 internal fun IrFactory.buildFunction(builder: IrFunctionBuilder): IrSimpleFunction = with(builder) {
-    val wrappedDescriptor = WrappedSimpleFunctionDescriptor()
     createFunction(
         startOffset, endOffset, origin,
-        IrSimpleFunctionSymbolImpl(wrappedDescriptor),
+        IrSimpleFunctionSymbolImpl(),
         name, visibility, modality, returnType,
         isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, isFakeOverride,
         containerSource,
-    ).also {
-        wrappedDescriptor.bind(it)
-    }
+    )
 }
 
 @PublishedApi
 internal fun IrFactory.buildConstructor(builder: IrFunctionBuilder): IrConstructor = with(builder) {
-    val wrappedDescriptor = WrappedClassConstructorDescriptor()
     return createConstructor(
         startOffset, endOffset, origin,
-        IrConstructorSymbolImpl(wrappedDescriptor),
+        IrConstructorSymbolImpl(),
         Name.special("<init>"),
         visibility, returnType,
         isInline = isInline, isExternal = isExternal, isPrimary = isPrimary, isExpect = isExpect,
         containerSource = containerSource
-    ).also {
-        wrappedDescriptor.bind(it)
-    }
+    )
 }
 
 inline fun IrFactory.buildFun(builder: IrFunctionBuilder.() -> Unit): IrSimpleFunction =
@@ -207,28 +192,24 @@ fun <D> buildReceiverParameter(
     startOffset: Int = parent.startOffset,
     endOffset: Int = parent.endOffset
 ): IrValueParameter
-    where D : IrDeclaration, D : IrDeclarationParent = WrappedReceiverParameterDescriptor().let { wrappedDescriptor ->
+        where D : IrDeclaration, D : IrDeclarationParent =
     parent.factory.createValueParameter(
         startOffset, endOffset, origin,
-        IrValueParameterSymbolImpl(wrappedDescriptor),
+        IrValueParameterSymbolImpl(),
         RECEIVER_PARAMETER_NAME, -1, type, null, isCrossinline = false, isNoinline = false,
         isHidden = false, isAssignable = false
     ).also {
-        wrappedDescriptor.bind(it)
         it.parent = parent
     }
-}
 
 @PublishedApi
 internal fun IrFactory.buildValueParameter(builder: IrValueParameterBuilder, parent: IrDeclarationParent): IrValueParameter =
     with(builder) {
-        val wrappedDescriptor = WrappedValueParameterDescriptor()
         return createValueParameter(
             startOffset, endOffset, origin,
-            IrValueParameterSymbolImpl(wrappedDescriptor),
+            IrValueParameterSymbolImpl(),
             name, index, type, varargElementType, isCrossInline, isNoinline, isHidden, isAssignable
         ).also {
-            wrappedDescriptor.bind(it)
             it.parent = parent
         }
     }
@@ -283,13 +264,11 @@ fun IrSimpleFunction.addExtensionReceiver(type: IrType, origin: IrDeclarationOri
 @PublishedApi
 internal fun IrFactory.buildTypeParameter(builder: IrTypeParameterBuilder, parent: IrDeclarationParent): IrTypeParameter =
     with(builder) {
-        val wrappedDescriptor = WrappedTypeParameterDescriptor()
         createTypeParameter(
             startOffset, endOffset, origin,
-            IrTypeParameterSymbolImpl(wrappedDescriptor),
+            IrTypeParameterSymbolImpl(),
             name, index, isReified, variance
         ).also {
-            wrappedDescriptor.bind(it)
             it.superTypes = superTypes
             it.parent = parent
         }
@@ -330,13 +309,11 @@ fun buildVariable(
     isConst: Boolean = false,
     isLateinit: Boolean = false,
 ): IrVariable {
-    val wrappedDescriptor = WrappedVariableDescriptor()
     return IrVariableImpl(
         startOffset, endOffset, origin,
-        IrVariableSymbolImpl(wrappedDescriptor),
+        IrVariableSymbolImpl(),
         name, type, isVar, isConst, isLateinit
     ).also {
-        wrappedDescriptor.bind(it)
         if (parent != null) {
             it.parent = parent
         }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
index f58a6310878..d20400aab4a 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIntrinsics.kt
@@ -17,11 +17,9 @@ import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
-import org.jetbrains.kotlin.ir.types.IrType
-import org.jetbrains.kotlin.ir.types.defaultType
+import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeBuilder
 import org.jetbrains.kotlin.ir.types.impl.buildSimpleType
-import org.jetbrains.kotlin.ir.types.isLong
 import org.jetbrains.kotlin.ir.util.constructors
 import org.jetbrains.kotlin.ir.util.findDeclaration
 import org.jetbrains.kotlin.ir.util.kotlinPackageFqn
@@ -169,7 +167,9 @@ class JsIntrinsics(private val irBuiltIns: IrBuiltIns, val context: JsIrBackendC
     val jsGetContinuation = getInternalFunction("getContinuation")
     val jsGetKClass = getInternalWithoutPackage("getKClass")
     val jsGetKClassFromExpression = getInternalWithoutPackage("getKClassFromExpression")
-    val jsClass = getInternalFunction("jsClass")
+
+    private val jsClassClassSymbol = getInternalClassWithoutPackage("kotlin.js.JsClass")
+    val jsClass = defineJsClassIntrinsic().symbol
 
     val jsNumberRangeToNumber = getInternalFunction("numberRangeToNumber")
     val jsNumberRangeToLong = getInternalFunction("numberRangeToLong")
@@ -448,6 +448,21 @@ class JsIntrinsics(private val irBuiltIns: IrBuiltIns, val context: JsIrBackendC
         }
     }
 
+    private fun defineJsClassIntrinsic(): IrSimpleFunction {
+        return irFactory.addFunction(externalPackageFragment) {
+            name = Name.identifier("jsClass")
+            origin = JsLoweredDeclarationOrigin.JS_INTRINSICS_STUB
+            isInline = true
+        }.apply {
+            val typeParameter = addTypeParameter {
+                name = Name.identifier("T")
+                isReified = true
+                superTypes += irBuiltIns.anyType
+            }
+            returnType = jsClassClassSymbol.typeWithParameters(listOf(typeParameter))
+        }
+    }
+
     private fun unOp(name: String, returnType: IrType = irBuiltIns.anyNType) =
         irBuiltIns.run { defineOperator(name, returnType, listOf(anyNType)) }
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
index 7b66b386d04..871a74b222f 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.backend.js.lower.calls.CallsLowering
 import org.jetbrains.kotlin.ir.backend.js.lower.cleanup.CleanupLowering
 import org.jetbrains.kotlin.ir.backend.js.lower.coroutines.JsSuspendFunctionsLowering
 import org.jetbrains.kotlin.ir.backend.js.lower.inline.CopyInlineFunctionBodyLowering
-import org.jetbrains.kotlin.ir.backend.js.lower.inline.RemoveInlineFunctionsWithReifiedTypeParametersLowering
+import org.jetbrains.kotlin.ir.backend.js.lower.inline.RemoveInlineDeclarationsWithReifiedTypeParametersLowering
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 
@@ -234,8 +234,8 @@ private val copyInlineFunctionBodyLoweringPhase = makeDeclarationTransformerPhas
     prerequisite = setOf(functionInliningPhase)
 )
 
-private val removeInlineFunctionsWithReifiedTypeParametersLoweringPhase = makeDeclarationTransformerPhase(
-    { RemoveInlineFunctionsWithReifiedTypeParametersLowering() },
+private val removeInlineDeclarationsWithReifiedTypeParametersLoweringPhase = makeDeclarationTransformerPhase(
+    { RemoveInlineDeclarationsWithReifiedTypeParametersLowering() },
     name = "RemoveInlineFunctionsWithReifiedTypeParametersLowering",
     description = "Remove Inline functions with reified parameters from context",
     prerequisite = setOf(functionInliningPhase)
@@ -370,6 +370,13 @@ private val propertyAccessorInlinerLoweringPhase = makeBodyLoweringPhase(
     description = "[Optimization] Inline property accessors"
 )
 
+private val copyPropertyAccessorBodiesLoweringPass = makeDeclarationTransformerPhase(
+    ::CopyAccessorBodyLowerings,
+    name = "CopyAccessorBodyLowering",
+    description = "Copy accessor bodies so that ist can be safely read in PropertyAccessorInlineLowering",
+    prerequisite = setOf(propertyAccessorInlinerLoweringPhase)
+)
+
 private val foldConstantLoweringPhase = makeBodyLoweringPhase(
     { FoldConstantLowering(it, true) },
     name = "FoldConstantLowering",
@@ -571,7 +578,7 @@ private val typeOperatorLoweringPhase = makeBodyLoweringPhase(
     description = "Lower IrTypeOperator with corresponding logic",
     prerequisite = setOf(
         bridgesConstructionPhase,
-        removeInlineFunctionsWithReifiedTypeParametersLoweringPhase,
+        removeInlineDeclarationsWithReifiedTypeParametersLoweringPhase,
         singleAbstractMethodPhase, errorExpressionLoweringPhase
     )
 )
@@ -603,6 +610,12 @@ private val secondaryFactoryInjectorLoweringPhase = makeBodyLoweringPhase(
     prerequisite = setOf(innerClassesLoweringPhase)
 )
 
+private val constLoweringPhase = makeBodyLoweringPhase(
+    ::ConstLowering,
+    name = "ConstLowering",
+    description = "Wrap Long and Char constants into constructor invocation"
+)
+
 private val inlineClassDeclarationLoweringPhase = makeDeclarationTransformerPhase(
     { InlineClassLowering(it).inlineClassDeclarationLowering },
     name = "InlineClassDeclarationLowering",
@@ -612,7 +625,12 @@ private val inlineClassDeclarationLoweringPhase = makeDeclarationTransformerPhas
 private val inlineClassUsageLoweringPhase = makeBodyLoweringPhase(
     { InlineClassLowering(it).inlineClassUsageLowering },
     name = "InlineClassUsageLowering",
-    description = "Handle inline class usages"
+    description = "Handle inline class usages",
+    prerequisite = setOf(
+        // Const lowering generates inline class constructors for unsigned integers
+        // which should be lowered by this lowering
+        constLoweringPhase
+    )
 )
 
 private val autoboxingTransformerPhase = makeBodyLoweringPhase(
@@ -640,12 +658,6 @@ private val primitiveCompanionLoweringPhase = makeBodyLoweringPhase(
     description = "Replace common companion object access with platform one"
 )
 
-private val constLoweringPhase = makeBodyLoweringPhase(
-    ::ConstLowering,
-    name = "ConstLowering",
-    description = "Wrap Long and Char constants into constructor invocation"
-)
-
 private val callsLoweringPhase = makeBodyLoweringPhase(
     ::CallsLowering,
     name = "CallsLowering",
@@ -704,6 +716,7 @@ val loweringList = listOf<Lowering>(
     localClassesExtractionFromInlineFunctionsPhase,
     functionInliningPhase,
     copyInlineFunctionBodyLoweringPhase,
+    removeInlineDeclarationsWithReifiedTypeParametersLoweringPhase,
     createScriptFunctionsPhase,
     callableReferenceLowering,
     singleAbstractMethodPhase,
@@ -742,6 +755,7 @@ val loweringList = listOf<Lowering>(
     propertyLazyInitLoweringPhase,
     removeInitializersForLazyProperties,
     propertyAccessorInlinerLoweringPhase,
+    copyPropertyAccessorBodiesLoweringPass,
     foldConstantLoweringPhase,
     privateMembersLoweringPhase,
     privateMemberUsagesLoweringPhase,
@@ -750,7 +764,6 @@ val loweringList = listOf<Lowering>(
     defaultParameterInjectorPhase,
     defaultParameterCleanerPhase,
     jsDefaultCallbackGeneratorPhase,
-    removeInlineFunctionsWithReifiedTypeParametersLoweringPhase,
     throwableSuccessorsLoweringPhase,
     es6AddInternalParametersToConstructorPhase,
     es6ConstructorLowering,
@@ -763,11 +776,11 @@ val loweringList = listOf<Lowering>(
     secondaryConstructorLoweringPhase,
     secondaryFactoryInjectorLoweringPhase,
     classReferenceLoweringPhase,
+    constLoweringPhase,
     inlineClassDeclarationLoweringPhase,
     inlineClassUsageLoweringPhase,
     autoboxingTransformerPhase,
     blockDecomposerLoweringPhase,
-    constLoweringPhase,
     objectDeclarationLoweringPhase,
     invokeStaticInitializersPhase,
     objectUsageLoweringPhase,
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CopyAccessorBodyLowerings.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CopyAccessorBodyLowerings.kt
new file mode 100644
index 00000000000..b96406de4ae
--- /dev/null
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/CopyAccessorBodyLowerings.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2020 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.ir.backend.js.lower
+
+import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.common.DeclarationTransformer
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrField
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.expressions.IrBlockBody
+import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
+
+// Copies property accessors and initializers so that the PropertyAccessorInilineLowering may access them safely.
+class CopyAccessorBodyLowerings(private val context: CommonBackendContext) : DeclarationTransformer {
+    override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
+        if (declaration is IrSimpleFunction && declaration.correspondingPropertySymbol != null) {
+            declaration.body?.let { originalBody ->
+                declaration.body = context.irFactory.createBlockBody(originalBody.startOffset, originalBody.endOffset) {
+                    statements += (originalBody.deepCopyWithSymbols(declaration) as IrBlockBody).statements
+                }
+            }
+        }
+
+        if (declaration is IrField) {
+            declaration.initializer?.let { originalBody ->
+                declaration.initializer = context.irFactory.createExpressionBody(originalBody.startOffset, originalBody.endOffset) {
+                    this.expression = originalBody.expression.deepCopyWithSymbols(declaration)
+                }
+            }
+        }
+
+        return null
+    }
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt
index 371f0c2c74c..948a3b33230 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/MoveBodilessDeclarationsToSeparatePlace.kt
@@ -54,6 +54,10 @@ private class DescriptorlessIrFileSymbol : IrFileSymbol {
     override val descriptor: PackageFragmentDescriptor
         get() = error("Operation is unsupported")
 
+    @ObsoleteDescriptorBasedAPI
+    override val hasDescriptor: Boolean
+        get() = error("Operation is unsupported")
+
     private var _owner: IrFile? = null
     override val owner get() = _owner!!
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/CallsLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/CallsLowering.kt
index a77455da59d..20d3ff41a5c 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/CallsLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/CallsLowering.kt
@@ -16,8 +16,6 @@ import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
 import org.jetbrains.kotlin.ir.util.hasAnnotation
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
-import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
-import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 
 class CallsLowering(val context: JsIrBackendContext) : BodyLoweringPass {
     private val transformers = listOf(
@@ -32,6 +30,7 @@ class CallsLowering(val context: JsIrBackendContext) : BodyLoweringPass {
         BuiltInConstructorCalls(context),
         JsonIntrinsics(context),
         NativeGetterSetterTransformer(context),
+        ReplaceCallsWithInvalidTypeArgumentForReifiedParameters(context),
     )
 
     override fun lower(irBody: IrBody, container: IrDeclaration) {
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/ReplaceCallsWithInvalidTypeArgumentForReifiedParameters.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/ReplaceCallsWithInvalidTypeArgumentForReifiedParameters.kt
new file mode 100644
index 00000000000..35637c6ad82
--- /dev/null
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/calls/ReplaceCallsWithInvalidTypeArgumentForReifiedParameters.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2020 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.ir.backend.js.lower.calls
+
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
+import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
+import org.jetbrains.kotlin.ir.expressions.IrExpression
+import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
+import org.jetbrains.kotlin.ir.expressions.impl.IrCompositeImpl
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
+import org.jetbrains.kotlin.ir.types.classOrNull
+import org.jetbrains.kotlin.ir.util.getArgumentsWithIr
+import org.jetbrains.kotlin.ir.util.render
+
+
+class ReplaceCallsWithInvalidTypeArgumentForReifiedParameters(val context: JsIrBackendContext) : CallsTransformer {
+    override fun transformFunctionAccess(call: IrFunctionAccessExpression, doNotIntrinsify: Boolean): IrExpression {
+        if (!context.errorPolicy.allowErrors) return call
+
+        val function = call.symbol.owner
+
+        for (typeParameter in function.typeParameters) {
+            if (!typeParameter.isReified) continue
+            val typeArgument = call.getTypeArgument(typeParameter.index)
+
+            if (typeArgument?.classOrNull == null) {
+                val args = call.getArgumentsWithIr().map { it.second }
+
+                val callErrorCode = JsIrBuilder.buildCall(context.errorCodeSymbol!!).apply {
+                    putValueArgument(
+                        0,
+                        IrConstImpl.string(
+                            UNDEFINED_OFFSET,
+                            UNDEFINED_OFFSET,
+                            context.irBuiltIns.stringType,
+                            "Invalid type argument (${typeArgument?.render()}) for reified type parameter (${typeParameter.render()})"
+                        )
+                    )
+                }
+
+                if (args.isEmpty()) return callErrorCode
+
+                return IrCompositeImpl(-1, -1, call.type, call.origin, args + listOf(callErrorCode))
+            }
+        }
+
+        return call
+    }
+}
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/RemoveInlineFunctionsWithReifiedTypeParametersLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/RemoveInlineDeclarationsWithReifiedTypeParametersLowering.kt
similarity index 78%
rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/RemoveInlineFunctionsWithReifiedTypeParametersLowering.kt
rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/RemoveInlineDeclarationsWithReifiedTypeParametersLowering.kt
index c7e0a16fdf9..043f1fd8d93 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/RemoveInlineFunctionsWithReifiedTypeParametersLowering.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/RemoveInlineDeclarationsWithReifiedTypeParametersLowering.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -9,15 +9,19 @@ import org.jetbrains.kotlin.backend.common.DeclarationTransformer
 import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
 
-class RemoveInlineFunctionsWithReifiedTypeParametersLowering: DeclarationTransformer {
+class RemoveInlineDeclarationsWithReifiedTypeParametersLowering: DeclarationTransformer {
 
     override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
+        fun IrFunction.isInlineFunWithReifiedParameter() = isInline && typeParameters.any { it.isReified }
 
-        if (declaration is IrFunction && declaration.isInline && declaration.typeParameters.any { it.isReified }) {
+        if (declaration is IrFunction && declaration.isInlineFunWithReifiedParameter() ||
+            declaration is IrProperty && declaration.getter?.isInlineFunWithReifiedParameter() == true
+        ) {
             return emptyList()
         }
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
index 0c3334b390a..2889b4cc274 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
@@ -7,7 +7,10 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
 
 import org.jetbrains.kotlin.backend.common.ir.isElseBranch
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.ir.backend.js.utils.*
+import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext
+import org.jetbrains.kotlin.ir.backend.js.utils.Namer
+import org.jetbrains.kotlin.ir.backend.js.utils.emptyScope
+import org.jetbrains.kotlin.ir.backend.js.utils.getJsNameOrKotlinName
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
@@ -20,6 +23,18 @@ import org.jetbrains.kotlin.js.backend.ast.*
 @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsExpression, JsGenerationContext> {
 
+    override fun visitComposite(expression: IrComposite, data: JsGenerationContext): JsExpression {
+        val size = expression.statements.size
+        if (size == 0) TODO("Empty IrComposite is not supported")
+
+        val first = expression.statements[0].accept(this, data)
+        if (size == 1) return first
+
+        return expression.statements.fold(first) { left, right ->
+            JsBinaryOperation(JsBinaryOperator.COMMA, left, right.accept(this, data))
+        }
+    }
+
     override fun visitVararg(expression: IrVararg, context: JsGenerationContext): JsExpression {
         assert(expression.elements.none { it is IrSpreadElement })
         return JsArrayLiteral(expression.elements.map { it.accept(this, context) })
@@ -146,39 +161,36 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
         val function = expression.symbol.owner
         val arguments = translateCallArguments(expression, context, this)
         val klass = function.parentAsClass
-        return if (klass.isInline) {
-            assert(function.isPrimary) {
-                "Inline class secondary constructors must be lowered into static methods"
+
+        require(!klass.isInline) {
+            "All inline class constructor calls must be lowered to static function calls"
+        }
+
+        return when {
+            klass.isEffectivelyExternal() -> {
+                val refForExternalClass = context.getRefForExternalClass(klass)
+                val varargParameterIndex = expression.symbol.owner.varargParameterIndex()
+                if (varargParameterIndex == -1) {
+                    JsNew(refForExternalClass, arguments)
+                } else {
+                    val argumentsAsSingleArray = argumentsWithVarargAsSingleArray(
+                        JsNullLiteral(),
+                        arguments,
+                        varargParameterIndex
+                    )
+                    JsNew(
+                        JsInvocation(
+                            JsNameRef("apply", JsNameRef("bind", JsNameRef("Function"))),
+                            refForExternalClass,
+                            argumentsAsSingleArray
+                        ),
+                        emptyList()
+                    )
+                }
             }
-            // Argument value constructs unboxed inline class instance
-            arguments.single()
-        } else {
-            when {
-                klass.isEffectivelyExternal() -> {
-                    val refForExternalClass = context.getRefForExternalClass(klass)
-                    val varargParameterIndex = expression.symbol.owner.varargParameterIndex()
-                    if (varargParameterIndex == -1) {
-                        JsNew(refForExternalClass, arguments)
-                    } else {
-                        val argumentsAsSingleArray = argumentsWithVarargAsSingleArray(
-                            JsNullLiteral(),
-                            arguments,
-                            varargParameterIndex
-                        )
-                        JsNew(
-                            JsInvocation(
-                                JsNameRef("apply", JsNameRef("bind", JsNameRef("Function"))),
-                                refForExternalClass,
-                                argumentsAsSingleArray
-                            ),
-                            emptyList()
-                        )
-                    }
-                }
-                else -> {
-                    val ref = context.getNameForClass(klass).makeRef()
-                    JsNew(ref, arguments)
-                }
+            else -> {
+                val ref = context.getNameForClass(klass).makeRef()
+                JsNew(ref, arguments)
             }
         }
     }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt
index 004be491487..22f1aa5ab77 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIntrinsicTransformers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -17,9 +17,11 @@ import org.jetbrains.kotlin.ir.expressions.IrFunctionReference
 import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
+import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.types.classifierOrFail
 import org.jetbrains.kotlin.ir.util.getInlineClassBackingField
 import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
+import org.jetbrains.kotlin.ir.util.render
 import org.jetbrains.kotlin.js.backend.ast.*
 
 typealias IrCallTransformer = (IrCall, context: JsGenerationContext) -> JsExpression
@@ -89,15 +91,18 @@ class JsIntrinsicTransformers(backendContext: JsIrBackendContext) {
             }
 
             add(intrinsics.jsClass) { call, context ->
-                val classifier: IrClassifierSymbol = call.getTypeArgument(0)!!.classifierOrFail
-                val owner = classifier.owner
+                val typeArgument = call.getTypeArgument(0)
+                val classSymbol = typeArgument?.classOrNull
+                    ?: error("Type argument of jsClass must be statically known class, but " + typeArgument?.render())
+
+                val klass = classSymbol.owner
 
                 when {
-                    owner is IrClass && owner.isEffectivelyExternal() ->
-                        context.getRefForExternalClass(owner)
+                    klass.isEffectivelyExternal() ->
+                        context.getRefForExternalClass(klass)
 
                     else ->
-                        context.getNameForStaticDeclaration(owner as IrDeclarationWithName).makeRef()
+                        context.getNameForStaticDeclaration(klass as IrDeclarationWithName).makeRef()
                 }
             }
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
index 09fb29e1ce7..ee950a66aa4 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -26,24 +26,24 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
 import java.util.*
 
-fun <T> mapToKey(declaration: T): String {
+// TODO remove direct usages of [mapToKey] from [NameTable] & co and move it to scripting & REPL infrastructure. Review usages.
+private fun <T> mapToKey(declaration: T): String {
     return with(JsManglerIr) {
-        if (declaration is IrDeclaration && isPublic(declaration)) {
+        if (declaration is IrDeclaration) {
             declaration.hashedMangle.toString()
         } else if (declaration is Signature) {
             declaration.toString().hashMangle.toString()
-        } else "key_have_not_generated"
+        } else {
+            error("Key is not generated for " + declaration?.let { it::class.simpleName })
+        }
     }
 }
 
-fun JsManglerIr.isPublic(declaration: IrDeclaration) =
-    declaration.isExported() && declaration !is IrScript && declaration !is IrVariable && declaration !is IrValueParameter
-
 class NameTable<T>(
     val parent: NameTable<*>? = null,
     val reserved: MutableSet<String> = mutableSetOf(),
     val sanitizer: (String) -> String = ::sanitizeName,
-    val mappedNames: MutableMap<String, String> = mutableMapOf()
+    val mappedNames: MutableMap<String, String>? = null
 ) {
     var finished = false
     val names = mutableMapOf<T, String>()
@@ -59,7 +59,7 @@ class NameTable<T>(
         assert(!finished)
         names[declaration] = name
         reserved.add(name)
-        mappedNames[mapToKey(declaration)] = name
+        mappedNames?.set(mapToKey(declaration), name)
     }
 
     fun declareFreshName(declaration: T, suggestedName: String): String {
@@ -151,7 +151,7 @@ class NameTables(
     packages: List<IrPackageFragment>,
     reservedForGlobal: MutableSet<String> = mutableSetOf(),
     reservedForMember: MutableSet<String> = mutableSetOf(),
-    val mappedNames: MutableMap<String, String> = mutableMapOf()
+    val mappedNames: MutableMap<String, String>? = null
 ) {
     val globalNames: NameTable<IrDeclaration>
     private val memberNames: NameTable<Signature>
@@ -172,8 +172,6 @@ class NameTables(
             mappedNames = mappedNames
         )
 
-        mappedNames.addAllIfAbsent(mappedNames)
-
         val classDeclaration = mutableListOf<IrClass>()
         for (p in packages) {
             for (declaration in p.declarations) {
@@ -249,7 +247,7 @@ class NameTables(
         this += other.filter { it.key !in this }
     }
 
-    private fun packagesAdded() = mappedNames.isEmpty()
+    private fun packagesAdded() = mappedNames.isNullOrEmpty()
 
     fun merge(files: List<IrPackageFragment>, additionalPackages: List<IrPackageFragment>) {
         val packages = mutableListOf<IrPackageFragment>().also { it.addAll(files) }
@@ -311,13 +309,17 @@ class NameTables(
             parent = parent.parent
         }
 
-        return mappedNames[mapToKey(declaration)]
-            ?: error("Can't find name for declaration ${declaration.render()}")
+
+        mappedNames?.get(mapToKey(declaration))?.let {
+            return it
+        }
+
+        error("Can't find name for declaration ${declaration.render()}")
     }
 
     fun getNameForMemberField(field: IrField): String {
         val signature = fieldSignature(field)
-        val name = memberNames.names[signature] ?: mappedNames[mapToKey(signature)]
+        val name = memberNames.names[signature] ?: mappedNames?.get(mapToKey(signature))
 
         // TODO investigate
         if (name == null) {
@@ -329,7 +331,7 @@ class NameTables(
 
     fun getNameForMemberFunction(function: IrSimpleFunction): String {
         val signature = jsFunctionSignature(function)
-        val name = memberNames.names[signature] ?: mappedNames[mapToKey(signature)]
+        val name = memberNames.names[signature] ?: mappedNames?.get(mapToKey(signature))
 
         // TODO Add a compiler flag, which enables this behaviour
         // TODO remove in DCE
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt
index 10c4e2dde5a..c46c3929030 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendContext.kt
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.backend.jvm.lower.CollectionStubComputer
 import org.jetbrains.kotlin.backend.jvm.lower.JvmInnerClassesSupport
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.InlineClassAbi
 import org.jetbrains.kotlin.backend.jvm.lower.inlineclasses.MemoizedInlineClassReplacements
-import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
@@ -41,8 +40,6 @@ import org.jetbrains.kotlin.psi2ir.PsiSourceManager
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.org.objectweb.asm.Type
 
-typealias MetadataSerializerFactory = (JvmBackendContext, IrClass, Type, JvmSerializationBindings, MetadataSerializer?) -> MetadataSerializer
-
 class JvmBackendContext(
     val state: GenerationState,
     val psiSourceManager: PsiSourceManager,
@@ -51,7 +48,7 @@ class JvmBackendContext(
     private val symbolTable: SymbolTable,
     val phaseConfig: PhaseConfig,
     val generatorExtensions: JvmGeneratorExtensions,
-    val serializerFactory: MetadataSerializerFactory
+    val backendExtension: JvmBackendExtension,
 ) : CommonBackendContext {
     // If the JVM fqname of a class differs from what is implied by its parent, e.g. if it's a file class
     // annotated with @JvmPackageName, the correct name is recorded here.
@@ -131,6 +128,8 @@ class JvmBackendContext(
 
     val inlineClassReplacements = MemoizedInlineClassReplacements(state.functionsWithInlineClassReturnTypesMangled, irFactory, this)
 
+    internal val continuationClassesVarsCountByType: MutableMap<IrAttributeContainer, Map<Type, Int>> = hashMapOf()
+
     internal fun referenceClass(descriptor: ClassDescriptor): IrClassSymbol =
         symbolTable.lazyWrapper.referenceClass(descriptor)
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendExtension.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendExtension.kt
new file mode 100644
index 00000000000..6f8185c9a9a
--- /dev/null
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendExtension.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2020 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.backend.jvm
+
+import org.jetbrains.kotlin.backend.jvm.codegen.DescriptorMetadataSerializer
+import org.jetbrains.kotlin.backend.jvm.codegen.MetadataSerializer
+import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings
+import org.jetbrains.kotlin.config.JvmAbiStability
+import org.jetbrains.kotlin.ir.declarations.IrClass
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames
+import org.jetbrains.org.objectweb.asm.Type
+
+interface JvmBackendExtension {
+    fun createSerializer(
+        context: JvmBackendContext, klass: IrClass, type: Type, bindings: JvmSerializationBindings, parentSerializer: MetadataSerializer?
+    ): MetadataSerializer
+
+    fun generateMetadataExtraFlags(abiStability: JvmAbiStability?): Int
+
+    object Default : JvmBackendExtension {
+        override fun createSerializer(
+            context: JvmBackendContext,
+            klass: IrClass,
+            type: Type,
+            bindings: JvmSerializationBindings,
+            parentSerializer: MetadataSerializer?
+        ): MetadataSerializer {
+            return DescriptorMetadataSerializer(context, klass, type, bindings, parentSerializer)
+        }
+
+        override fun generateMetadataExtraFlags(abiStability: JvmAbiStability?): Int =
+            JvmAnnotationNames.METADATA_JVM_IR_FLAG or
+                    (if (abiStability != JvmAbiStability.UNSTABLE) JvmAnnotationNames.METADATA_JVM_IR_STABLE_ABI_FLAG else 0)
+    }
+}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
index 28fa2b6499d..903e79cfd1e 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmIrCodegenFactory.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
 import org.jetbrains.kotlin.backend.common.ir.BuiltinSymbolsBase
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.jvm.codegen.ClassCodegen
-import org.jetbrains.kotlin.backend.jvm.codegen.DescriptorMetadataSerializer
 import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
 import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor
 import org.jetbrains.kotlin.codegen.CodegenFactory
@@ -41,7 +40,23 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.CleanableBindingContext
 
 class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory {
+    data class JvmIrBackendInput(
+        val state: GenerationState,
+        val irModuleFragment: IrModuleFragment,
+        val symbolTable: SymbolTable,
+        val sourceManager: PsiSourceManager,
+        val phaseConfig: PhaseConfig,
+        val irProviders: List<IrProvider>,
+        val extensions: JvmGeneratorExtensions,
+        val backendExtension: JvmBackendExtension,
+    )
+
     override fun generateModule(state: GenerationState, files: Collection<KtFile>) {
+        val input = convertToIr(state, files)
+        doGenerateFilesInternal(input)
+    }
+
+    fun convertToIr(state: GenerationState, files: Collection<KtFile>): JvmIrBackendInput {
         val extensions = JvmGeneratorExtensions()
         val mangler = JvmManglerDesc(MainFunctionDetector(state.bindingContext, state.languageVersionSettings))
         val psi2ir = Psi2IrTranslator(state.languageVersionSettings, Psi2IrConfiguration())
@@ -117,26 +132,23 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory
                 ?: error("BindingContext should be cleanable in JVM IR to avoid leaking memory: ${state.originalFrontendBindingContext}")
             originalBindingContext.clear()
         }
-
-        doGenerateFilesInternal(
-            state, irModuleFragment, psi2irContext.symbolTable, psi2irContext.sourceManager, phaseConfig,
-            irProviders, extensions, ::DescriptorMetadataSerializer
+        return JvmIrBackendInput(
+            state,
+            irModuleFragment,
+            symbolTable,
+            psi2irContext.sourceManager,
+            phaseConfig,
+            irProviders,
+            extensions,
+            JvmBackendExtension.Default,
         )
     }
 
-    fun doGenerateFilesInternal(
-        state: GenerationState,
-        irModuleFragment: IrModuleFragment,
-        symbolTable: SymbolTable,
-        sourceManager: PsiSourceManager,
-        phaseConfig: PhaseConfig,
-        irProviders: List<IrProvider>,
-        extensions: JvmGeneratorExtensions,
-        serializerFactory: MetadataSerializerFactory,
-    ) {
+    fun doGenerateFilesInternal(input: JvmIrBackendInput) {
+        val (state, irModuleFragment, symbolTable, sourceManager, phaseConfig, irProviders, extensions, backendExtension) = input
         val context = JvmBackendContext(
             state, sourceManager, irModuleFragment.irBuiltins, irModuleFragment,
-            symbolTable, phaseConfig, extensions, serializerFactory
+            symbolTable, phaseConfig, extensions, backendExtension
         )
         /* JvmBackendContext creates new unbound symbols, have to resolve them. */
         ExternalDependenciesGenerator(symbolTable, irProviders, state.languageVersionSettings).generateUnboundSymbolsAsDependencies()
@@ -178,15 +190,22 @@ class JvmIrCodegenFactory(private val phaseConfig: PhaseConfig) : CodegenFactory
         symbolTable: SymbolTable,
         sourceManager: PsiSourceManager,
         extensions: JvmGeneratorExtensions,
-        serializerFactory: MetadataSerializerFactory
+        backendExtension: JvmBackendExtension,
     ) {
-        irModuleFragment.irBuiltins.functionFactory = IrFunctionFactory(irModuleFragment.irBuiltins, symbolTable)
-        val irProviders = generateTypicalIrProviderList(
-            irModuleFragment.descriptor, irModuleFragment.irBuiltins, symbolTable, extensions = extensions
-        )
-
+        val irProviders = configureBuiltInsAndgenerateIrProvidersInFrontendIRMode(irModuleFragment, symbolTable, extensions)
         doGenerateFilesInternal(
-            state, irModuleFragment, symbolTable, sourceManager, phaseConfig, irProviders, extensions, serializerFactory
+            JvmIrBackendInput(state, irModuleFragment, symbolTable, sourceManager, phaseConfig, irProviders, extensions, backendExtension)
+        )
+    }
+
+    fun configureBuiltInsAndgenerateIrProvidersInFrontendIRMode(
+        irModuleFragment: IrModuleFragment,
+        symbolTable: SymbolTable,
+        extensions: JvmGeneratorExtensions
+    ): List<IrProvider> {
+        irModuleFragment.irBuiltins.functionFactory = IrFunctionFactory(irModuleFragment.irBuiltins, symbolTable)
+        return generateTypicalIrProviderList(
+            irModuleFragment.descriptor, irModuleFragment.irBuiltins, symbolTable, extensions = extensions
         )
     }
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
index a36bfd41d89..1c0e59c8543 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/AnnotationCodegen.kt
@@ -286,7 +286,8 @@ abstract class AnnotationCodegen(
             when {
                 declaration.origin.isSynthetic ->
                     true
-                declaration.origin == JvmLoweredDeclarationOrigin.INLINE_CLASS_GENERATED_IMPL_METHOD ->
+                declaration.origin == JvmLoweredDeclarationOrigin.INLINE_CLASS_GENERATED_IMPL_METHOD ||
+                        declaration.origin == IrDeclarationOrigin.GENERATED_SAM_IMPLEMENTATION ->
                     true
                 else ->
                     false
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
index 21758e69cd7..01a5d8c4541 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
@@ -10,9 +10,8 @@ import org.jetbrains.kotlin.backend.jvm.JvmLoweredDeclarationOrigin
 import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry
 import org.jetbrains.kotlin.backend.jvm.lower.buildAssertionsDisabledField
 import org.jetbrains.kotlin.backend.jvm.lower.hasAssertionsDisabledField
-import org.jetbrains.kotlin.codegen.DescriptorAsmUtil
+import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.inline.*
-import org.jetbrains.kotlin.codegen.writeKotlinMetadata
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
@@ -190,14 +189,13 @@ class ClassCodegen private constructor(
     }
 
     private val metadataSerializer: MetadataSerializer =
-        context.serializerFactory(context, irClass, type, visitor.serializationBindings, parentClassCodegen?.metadataSerializer)
+        context.backendExtension.createSerializer(
+            context, irClass, type, visitor.serializationBindings, parentClassCodegen?.metadataSerializer
+        )
 
     private fun generateKotlinMetadataAnnotation() {
         // TODO: if `-Xmultifile-parts-inherit` is enabled, write the corresponding flag for parts and facades to [Metadata.extraInt].
-        var extraFlags = JvmAnnotationNames.METADATA_JVM_IR_FLAG
-        if (state.isIrWithStableAbi) {
-            extraFlags += JvmAnnotationNames.METADATA_JVM_IR_STABLE_ABI_FLAG
-        }
+        val extraFlags = context.backendExtension.generateMetadataExtraFlags(state.abiStability)
 
         val facadeClassName = context.multifileFacadeForPart[irClass.attributeOwnerId]
         val metadata = irClass.metadata
@@ -310,7 +308,7 @@ class ClassCodegen private constructor(
 
         if (irClass.hasAnnotation(JVM_RECORD_ANNOTATION_FQ_NAME) && !field.isStatic) {
             // TODO: Write annotations to the component
-            visitor.newRecordComponent(fieldName, fieldType.descriptor, fieldSignature)
+            visitor.addRecordComponent(fieldName, fieldType.descriptor, fieldSignature)
         }
     }
 
@@ -360,7 +358,19 @@ class ClassCodegen private constructor(
             // lazily so that if tail call optimization kicks in, the unused class will not be written to the output.
             val continuationClass = method.continuationClass() // null if `SuspendLambda.invokeSuspend` - `this` is continuation itself
             val continuationClassCodegen = lazy { if (continuationClass != null) getOrCreate(continuationClass, context, method) else this }
-            node.acceptWithStateMachine(method, this, smapCopyingVisitor) { continuationClassCodegen.value.visitor }
+
+            // For suspend lambdas continuation class is null, and we need to use containing class to put L$ fields
+            val attributeContainer = continuationClass?.attributeOwnerId ?: irClass.attributeOwnerId
+
+            node.acceptWithStateMachine(
+                method,
+                this,
+                smapCopyingVisitor,
+                context.continuationClassesVarsCountByType[attributeContainer] ?: emptyMap()
+            ) {
+                continuationClassCodegen.value.visitor
+            }
+
             if (continuationClass != null && (continuationClassCodegen.isInitialized() || method.isSuspendCapturingCrossinline())) {
                 continuationClassCodegen.value.generate()
             }
@@ -404,7 +414,7 @@ class ClassCodegen private constructor(
                     ?: containerClass.declarations.firstIsInstanceOrNull<IrConstructor>()
                     ?: error("Class in a non-static initializer found, but container has no constructors: ${containerClass.render()}")
             } else parentFunction
-            if (enclosingFunction != null || irClass.isAnonymousObject) {
+            if (enclosingFunction != null || irClass.isAnonymousInnerClass) {
                 val method = enclosingFunction?.let(context.methodSignatureMapper::mapAsmMethod)
                 visitor.visitOuterClass(parentClassCodegen.type.internalName, method?.name, method?.descriptor)
             }
@@ -413,13 +423,26 @@ class ClassCodegen private constructor(
         for (klass in innerClasses) {
             val innerClass = typeMapper.classInternalName(klass)
             val outerClass =
-                if (klass.attributeOwnerId in context.isEnclosedInConstructor) null
-                else klass.parent.safeAs<IrClass>()?.let(typeMapper::classInternalName)
-            val innerName = klass.name.takeUnless { it.isSpecial }?.asString()
-            visitor.visitInnerClass(innerClass, outerClass, innerName, klass.calculateInnerClassAccessFlags(context))
+                if (klass.isSamWrapper || klass.attributeOwnerId in context.isEnclosedInConstructor)
+                    null
+                else {
+                    when (val parent = klass.parent) {
+                        is IrClass -> typeMapper.classInternalName(parent)
+                        else -> null
+                    }
+                }
+            val innerName = if (klass.isAnonymousInnerClass) null else klass.name.asString()
+            val accessFlags = klass.calculateInnerClassAccessFlags(context)
+            visitor.visitInnerClass(innerClass, outerClass, innerName, accessFlags)
         }
     }
 
+    private val IrClass.isAnonymousInnerClass: Boolean
+        get() = isSamWrapper || name.isSpecial // NB '<Continuation>' is treated as anonymous inner class here
+
+    private val IrClass.isSamWrapper: Boolean
+        get() = origin == IrDeclarationOrigin.GENERATED_SAM_IMPLEMENTATION
+
     override fun addInnerClassInfoFromAnnotation(innerClass: IrClass) {
         // It's necessary for proper recovering of classId by plain string JVM descriptor when loading annotations
         // See FileBasedKotlinClass.convertAnnotationVisitor
@@ -458,7 +481,7 @@ private val IrClass.flags: Int
                 isAnnotationClass -> Opcodes.ACC_ANNOTATION or Opcodes.ACC_INTERFACE or Opcodes.ACC_ABSTRACT
                 isInterface -> Opcodes.ACC_INTERFACE or Opcodes.ACC_ABSTRACT
                 isEnumClass -> Opcodes.ACC_ENUM or Opcodes.ACC_SUPER or modality.flags
-                hasAnnotation(JVM_RECORD_ANNOTATION_FQ_NAME) -> Opcodes.ACC_RECORD or Opcodes.ACC_SUPER or modality.flags
+                hasAnnotation(JVM_RECORD_ANNOTATION_FQ_NAME) -> VersionIndependentOpcodes.ACC_RECORD or Opcodes.ACC_SUPER or modality.flags
                 else -> Opcodes.ACC_SUPER or modality.flags
             }
 
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt.201 b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt.201
index f27ad043172..134d805adca 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt.201
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt.201
@@ -190,14 +190,13 @@ class ClassCodegen private constructor(
     }
 
     private val metadataSerializer: MetadataSerializer =
-        context.serializerFactory(context, irClass, type, visitor.serializationBindings, parentClassCodegen?.metadataSerializer)
+        context.backendExtension.createSerializer(
+            context, irClass, type, visitor.serializationBindings, parentClassCodegen?.metadataSerializer
+        )
 
     private fun generateKotlinMetadataAnnotation() {
         // TODO: if `-Xmultifile-parts-inherit` is enabled, write the corresponding flag for parts and facades to [Metadata.extraInt].
-        var extraFlags = JvmAnnotationNames.METADATA_JVM_IR_FLAG
-        if (state.isIrWithStableAbi) {
-            extraFlags += JvmAnnotationNames.METADATA_JVM_IR_STABLE_ABI_FLAG
-        }
+        val extraFlags = context.backendExtension.generateMetadataExtraFlags(state.abiStability)
 
         val facadeClassName = context.multifileFacadeForPart[irClass.attributeOwnerId]
         val metadata = irClass.metadata
@@ -360,7 +359,19 @@ class ClassCodegen private constructor(
             // lazily so that if tail call optimization kicks in, the unused class will not be written to the output.
             val continuationClass = method.continuationClass() // null if `SuspendLambda.invokeSuspend` - `this` is continuation itself
             val continuationClassCodegen = lazy { if (continuationClass != null) getOrCreate(continuationClass, context, method) else this }
-            node.acceptWithStateMachine(method, this, smapCopyingVisitor) { continuationClassCodegen.value.visitor }
+
+            // For suspend lambdas continuation class is null, and we need to use containing class to put L$ fields
+            val attributeContainer = continuationClass?.attributeOwnerId ?: irClass.attributeOwnerId
+
+            node.acceptWithStateMachine(
+                method,
+                this,
+                smapCopyingVisitor,
+                context.continuationClassesVarsCountByType[attributeContainer] ?: emptyMap()
+            ) {
+                continuationClassCodegen.value.visitor
+            }
+
             if (continuationClass != null && (continuationClassCodegen.isInitialized() || method.isSuspendCapturingCrossinline())) {
                 continuationClassCodegen.value.generate()
             }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
index dcb505a6d3e..4a7e23e4a72 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/CoroutineCodegen.kt
@@ -35,13 +35,15 @@ import org.jetbrains.kotlin.ir.util.parentAsClass
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.org.objectweb.asm.MethodVisitor
+import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
 
 internal fun MethodNode.acceptWithStateMachine(
     irFunction: IrFunction,
     classCodegen: ClassCodegen,
     methodVisitor: MethodVisitor,
-    obtainContinuationClassBuilder: () -> ClassBuilder
+    varsCountByType: Map<Type, Int>,
+    obtainContinuationClassBuilder: () -> ClassBuilder,
 ) {
     val state = classCodegen.context.state
     val languageVersionSettings = state.languageVersionSettings
@@ -82,7 +84,8 @@ internal fun MethodNode.acceptWithStateMachine(
         disableTailCallOptimizationForFunctionReturningUnit = irFunction.isSuspend && irFunction.suspendFunctionOriginal().let {
             it.returnType.isUnit() && it.anyOfOverriddenFunctionsReturnsNonUnit()
         },
-        useOldSpilledVarTypeAnalysis = state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS)
+        useOldSpilledVarTypeAnalysis = state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS),
+        initialVarsCountByType = varsCountByType,
     )
     accept(visitor)
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt
index 352daa678cc..e3f8c554f92 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrGetValue
@@ -95,14 +94,12 @@ class JvmSharedVariablesManager(
             typeArguments.forEachIndexed(::putTypeArgument)
         }
         return with(originalDeclaration) {
-            val descriptor = WrappedVariableDescriptor()
             IrVariableImpl(
-                startOffset, endOffset, origin, IrVariableSymbolImpl(descriptor), name, refType,
+                startOffset, endOffset, origin, IrVariableSymbolImpl(), name, refType,
                 isVar = false, // writes are remapped to field stores
                 isConst = false, // const vals could not possibly require ref wrappers
                 isLateinit = false
             ).apply {
-                descriptor.bind(this)
                 initializer = refConstructorCall
             }
         }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt
index ae5a6c1eff5..386a61c9a71 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/AdditionalClassAnnotationLowering.kt
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.ir.builders.declarations.buildValueParameter
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrEnumEntryImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedEnumEntryDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue
@@ -84,13 +83,11 @@ private class AdditionalClassAnnotationLowering(private val context: JvmBackendC
     }
 
     private fun buildEnumEntry(enumClass: IrClass, entryName: String): IrEnumEntry {
-        val descriptor = WrappedEnumEntryDescriptor()
         return IrEnumEntryImpl(
             UNDEFINED_OFFSET, UNDEFINED_OFFSET, IrDeclarationOrigin.IR_EXTERNAL_JAVA_DECLARATION_STUB,
-            IrEnumEntrySymbolImpl(descriptor),
+            IrEnumEntrySymbolImpl(),
             Name.identifier(entryName)
         ).apply {
-            descriptor.bind(this)
             parent = enumClass
             enumClass.addChild(this)
         }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
index 020956c48a5..74f5944f4b9 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FileClassLowering.kt
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.backend.common.phaser.makeIrModulePhase
 import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.config.JvmAnalysisFlags
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.Modality
@@ -31,7 +30,6 @@ import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.fileClasses.JvmSimpleFileClassInfo
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
 import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.NaiveSourceBasedFileEntryImpl
@@ -82,17 +80,14 @@ private class FileClassLowering(val context: JvmBackendContext) : FileLoweringPa
     private fun createFileClass(irFile: IrFile, fileClassMembers: List<IrDeclaration>): IrClass {
         val fileEntry = irFile.fileEntry
         val fileClassInfo: JvmFileClassInfo?
-        val descriptor: ClassDescriptor
         when (fileEntry) {
             is PsiSourceManager.PsiFileEntry -> {
                 val ktFile = context.psiSourceManager.getKtFile(fileEntry)
                     ?: throw AssertionError("Unexpected file entry: $fileEntry")
                 fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(ktFile)
-                descriptor = WrappedClassDescriptor()
             }
             is NaiveSourceBasedFileEntryImpl -> {
                 fileClassInfo = JvmSimpleFileClassInfo(PackagePartClassUtils.getPackagePartFqName(irFile.fqName, fileEntry.name), false)
-                descriptor = WrappedClassDescriptor()
             }
             else -> error("unknown kind of file entry: $fileEntry")
         }
@@ -101,13 +96,12 @@ private class FileClassLowering(val context: JvmBackendContext) : FileLoweringPa
             0, fileEntry.maxOffset,
             if (!isMultifilePart || context.state.languageVersionSettings.getFlag(JvmAnalysisFlags.inheritMultifileParts))
                 IrDeclarationOrigin.FILE_CLASS else IrDeclarationOrigin.SYNTHETIC_FILE_CLASS,
-            symbol = IrClassSymbolImpl(descriptor),
+            symbol = IrClassSymbolImpl(),
             name = fileClassInfo.fileClassFqName.shortName(),
             kind = ClassKind.CLASS,
             visibility = if (!isMultifilePart) DescriptorVisibilities.PUBLIC else JavaDescriptorVisibilities.PACKAGE_VISIBILITY,
             modality = Modality.FINAL
         ).apply {
-            descriptor.bind(this)
             superTypes = listOf(context.irBuiltIns.anyType)
             parent = irFile
             declarations.addAll(fileClassMembers)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
index 81472cabd43..501929fb039 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
@@ -425,7 +424,7 @@ private inline fun IrClass.addAnonymousInitializer(builder: IrFunctionBuilder.()
         returnType = defaultType
         IrAnonymousInitializerImpl(
             startOffset, endOffset, origin,
-            IrAnonymousInitializerSymbolImpl(WrappedClassDescriptor())
+            IrAnonymousInitializerSymbolImpl()
         )
     }.also { anonymousInitializer ->
         declarations.add(anonymousInitializer)
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt
index b9c7b3ab7d7..29d9c49f08e 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SuspendLambdaLowering.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.backend.jvm.lower
 
-import com.intellij.lang.jvm.source.JvmDeclarationSearch
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.ir.*
@@ -19,6 +18,7 @@ import org.jetbrains.kotlin.backend.jvm.ir.IrInlineReferenceLocator
 import org.jetbrains.kotlin.codegen.coroutines.COROUTINE_LABEL_FIELD_NAME
 import org.jetbrains.kotlin.codegen.coroutines.INVOKE_SUSPEND_METHOD_NAME
 import org.jetbrains.kotlin.codegen.coroutines.SUSPEND_FUNCTION_COMPLETION_PARAMETER_NAME
+import org.jetbrains.kotlin.codegen.coroutines.normalize
 import org.jetbrains.kotlin.codegen.inline.coroutines.FOR_INLINE_SUFFIX
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.Modality
@@ -27,21 +27,20 @@ import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.*
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.IrValueParameterSymbol
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
-import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
-import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
+import org.jetbrains.kotlin.ir.visitors.*
 import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.name.SpecialNames
+import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
+import org.jetbrains.org.objectweb.asm.Type
 
 internal val suspendLambdaPhase = makeIrFilePhase(
     ::SuspendLambdaLowering,
@@ -168,19 +167,40 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
                         + context.irBuiltIns.anyNType
             )
             superTypes = listOf(suspendLambda.defaultType, functionNType)
+            val usedParams = mutableSetOf<IrSymbolOwner>()
+
+            // marking the parameters referenced in the function
+            function.acceptChildrenVoid(
+                object : IrElementVisitorVoid {
+                    override fun visitElement(element: IrElement) = element.acceptChildrenVoid(this)
+
+                    override fun visitGetValue(expression: IrGetValue) {
+                        if (expression.symbol is IrValueParameterSymbol && expression.symbol.owner in function.explicitParameters) {
+                            usedParams += expression.symbol.owner
+                        }
+                    }
+                },
+            )
 
             addField(COROUTINE_LABEL_FIELD_NAME, context.irBuiltIns.intType, JavaDescriptorVisibilities.PACKAGE_VISIBILITY)
+            val varsCountByType = HashMap<Type, Int>()
 
             val parametersFields = function.explicitParameters.map {
-                addField {
+                val field = if (it in usedParams) addField {
+                    val normalizedType = context.typeMapper.mapType(it.type).normalize()
+                    val index = varsCountByType[normalizedType]?.plus(1) ?: 0
+                    varsCountByType[normalizedType] = index
                     // Rename `$this` to avoid being caught by inlineCodegenUtils.isCapturedFieldName()
-                    name = if (it.index < 0) Name.identifier("p\$") else it.name
-                    type = it.type
+                    name = Name.identifier("${normalizedType.descriptor[0]}$$index")
+                    type = if (normalizedType == AsmTypes.OBJECT_TYPE) context.irBuiltIns.anyNType else it.type
                     origin = LocalDeclarationsLowering.DECLARATION_ORIGIN_FIELD_FOR_CAPTURED_VALUE
                     isFinal = false
                     visibility = if (it.index < 0) DescriptorVisibilities.PRIVATE else JavaDescriptorVisibilities.PACKAGE_VISIBILITY
-                }
+                } else null
+                ParameterInfo(field, it.type, it.name)
             }
+
+            context.continuationClassesVarsCountByType[attributeOwnerId] = varsCountByType
             val constructor = addPrimaryConstructorForLambda(suspendLambda, arity)
             val invokeToOverride = functionNClass.functions.single {
                 it.owner.valueParameters.size == arity + 1 && it.owner.name.asString() == "invoke"
@@ -202,26 +222,34 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
             context.suspendLambdaToOriginalFunctionMap[attributeOwnerId as IrFunctionReference] = function
         }
 
-    private fun IrClass.addInvokeSuspendForLambda(irFunction: IrFunction, suspendLambda: IrClass, fields: List<IrField>): IrSimpleFunction {
+    private fun IrClass.addInvokeSuspendForLambda(
+        irFunction: IrFunction,
+        suspendLambda: IrClass,
+        fields: List<ParameterInfo>
+    ): IrSimpleFunction {
         val superMethod = suspendLambda.functions.single {
             it.name.asString() == INVOKE_SUSPEND_METHOD_NAME && it.valueParameters.size == 1 &&
                     it.valueParameters[0].type.isKotlinResult()
         }
         return addFunctionOverride(superMethod, irFunction.startOffset, irFunction.endOffset).apply {
-            val localVals: List<IrVariable> = fields.mapIndexed { index, field ->
-                buildVariable(
-                    parent = this,
-                    startOffset = UNDEFINED_OFFSET,
-                    endOffset = UNDEFINED_OFFSET,
-                    origin = IrDeclarationOrigin.DEFINED,
-                    name = field.name,
-                    type = field.type
-                ).apply {
-                    val receiver = IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, dispatchReceiverParameter!!.symbol)
-                    val initializerBlock = IrBlockImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, field.type)
-                    initializerBlock.statements += IrGetFieldImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, field.symbol, field.type, receiver)
-                    initializer = initializerBlock
-                }
+            val localVals: List<IrVariable?> = fields.mapIndexed { index, param ->
+                if (param.isUsed) {
+                    buildVariable(
+                        parent = this,
+                        startOffset = UNDEFINED_OFFSET,
+                        endOffset = UNDEFINED_OFFSET,
+                        origin = IrDeclarationOrigin.DEFINED,
+                        name = param.name,
+                        type = param.type
+                    ).apply {
+                        val receiver = IrGetValueImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, dispatchReceiverParameter!!.symbol)
+                        val initializerBlock = IrBlockImpl(UNDEFINED_OFFSET, UNDEFINED_OFFSET, type)
+                        initializerBlock.statements += IrGetFieldImpl(
+                            UNDEFINED_OFFSET, UNDEFINED_OFFSET, param.field!!.symbol, type, receiver
+                        )
+                        initializer = initializerBlock
+                    }
+                } else null
             }
 
             body = irFunction.moveBodyTo(this, mapOf())?.let { body ->
@@ -230,10 +258,11 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
                         val parameter = (expression.symbol.owner as? IrValueParameter)?.takeIf { it.parent == irFunction }
                             ?: return expression
                         val lvar = localVals[parameter.index + if (irFunction.extensionReceiverParameter != null) 1 else 0]
+                            ?: return expression
                         return IrGetValueImpl(expression.startOffset, expression.endOffset, lvar.symbol)
                     }
                 }, null)
-                context.irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET, localVals + body.statements)
+                context.irFactory.createBlockBody(UNDEFINED_OFFSET, UNDEFINED_OFFSET, localVals.filterNotNull() + body.statements)
             }
         }
     }
@@ -276,7 +305,7 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
         constructor: IrFunction,
         invokeSuspend: IrSimpleFunction,
         invokeToOverride: IrSimpleFunctionSymbol,
-        fieldsForUnbound: List<IrField>
+        fieldsForUnbound: List<ParameterInfo>
     ) = addFunctionOverride(invokeToOverride.owner) { function ->
         +irReturn(callInvokeSuspend(invokeSuspend, cloneLambda(function, constructor, fieldsForUnbound)))
     }
@@ -284,7 +313,7 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
     private fun IrClass.addCreate(
         constructor: IrFunction,
         createToOverride: IrSimpleFunctionSymbol,
-        fieldsForUnbound: List<IrField>
+        fieldsForUnbound: List<ParameterInfo>
     ) = addFunctionOverride(createToOverride.owner) { function ->
         +irReturn(cloneLambda(function, constructor, fieldsForUnbound))
     }
@@ -292,7 +321,7 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
     private fun IrBlockBodyBuilder.cloneLambda(
         scope: IrFunction,
         constructor: IrFunction,
-        fieldsForUnbound: List<IrField>
+        fieldsForUnbound: List<ParameterInfo>
     ): IrExpression {
         val constructorCall = irCall(constructor).also {
             for (typeParameter in constructor.parentAsClass.typeParameters) {
@@ -300,12 +329,14 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
             }
             it.putValueArgument(0, irGet(scope.valueParameters.last()))
         }
-        if (fieldsForUnbound.isEmpty()) {
+        if (fieldsForUnbound.none { it.isUsed }) {
             return constructorCall
         }
         val result = irTemporary(constructorCall, "result")
         for ((index, field) in fieldsForUnbound.withIndex()) {
-            +irSetField(irGet(result), field, irGet(scope.valueParameters[index]))
+            if (field.isUsed) {
+                +irSetField(irGet(result), field.field!!, irGet(scope.valueParameters[index]))
+            }
         }
         return irGet(result)
     }
@@ -332,3 +363,7 @@ private class SuspendLambdaLowering(context: JvmBackendContext) : SuspendLowerin
             }
         }
 }
+
+private data class ParameterInfo(val field: IrField?, val type: IrType, val name: Name) {
+    val isUsed = field != null
+}
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
index e272e123bfa..e6400d94e35 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/TypeOperatorLowering.kt
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrCompositeImpl
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
-import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.isInlined
 import org.jetbrains.kotlin.ir.util.render
@@ -148,7 +147,7 @@ private class TypeOperatorLowering(private val context: JvmBackendContext) : Fil
 
             IrTypeOperator.IMPLICIT_NOTNULL -> {
                 val owner = scope.scopeOwnerSymbol.owner
-                val source = if (owner is IrFunction && owner.origin == IrDeclarationOrigin.DELEGATED_MEMBER) {
+                val source = if (owner is IrFunction && owner.isDelegated()) {
                     "${owner.name.asString()}(...)"
                 } else {
                     val (startOffset, endOffset) = expression.extents()
@@ -173,6 +172,10 @@ private class TypeOperatorLowering(private val context: JvmBackendContext) : Fil
         }
     }
 
+    private fun IrFunction.isDelegated() =
+        origin == IrDeclarationOrigin.DELEGATED_PROPERTY_ACCESSOR ||
+                origin == IrDeclarationOrigin.DELEGATED_MEMBER
+
     private fun IrElement.extents(): Pair<Int, Int> {
         var startOffset = UNDEFINED_OFFSET
         var endOffset = UNDEFINED_OFFSET
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt
index 0ade294322a..8ffab3c343f 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/inlineclasses/InlineClassAbi.kt
@@ -132,7 +132,7 @@ object InlineClassAbi {
     private fun IrType.asInfoForMangling(): InfoForMangling =
         InfoForMangling(
             erasedUpperBound.fqNameWhenAvailable!!.toUnsafe(),
-            isInline = getClass()?.isInline == true,
+            isInline = erasedUpperBound.isInline,
             isNullable = isNullable()
         )
 
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
index 56b32d80129..68f2e0a271e 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.backend.common.lower.loops.ForLoopsLowering
 import org.jetbrains.kotlin.backend.common.phaser.*
 import org.jetbrains.kotlin.backend.wasm.lower.*
 import org.jetbrains.kotlin.ir.backend.js.lower.*
-import org.jetbrains.kotlin.ir.backend.js.lower.inline.RemoveInlineFunctionsWithReifiedTypeParametersLowering
+import org.jetbrains.kotlin.ir.backend.js.lower.inline.RemoveInlineDeclarationsWithReifiedTypeParametersLowering
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.util.patchDeclarationParents
 
@@ -96,8 +96,8 @@ private val functionInliningPhase = makeCustomWasmModulePhase(
     prerequisite = setOf(expectDeclarationsRemovingPhase)
 )
 
-private val removeInlineFunctionsWithReifiedTypeParametersLoweringPhase = makeWasmModulePhase(
-    { RemoveInlineFunctionsWithReifiedTypeParametersLowering() },
+private val removeInlineDeclarationsWithReifiedTypeParametersLoweringPhase = makeWasmModulePhase(
+    { RemoveInlineDeclarationsWithReifiedTypeParametersLowering() },
     name = "RemoveInlineFunctionsWithReifiedTypeParametersLowering",
     description = "Remove Inline functions with reified parameters from context",
     prerequisite = setOf(functionInliningPhase)
@@ -461,7 +461,7 @@ val wasmPhases = NamedCompilerPhase(
             defaultArgumentPatchOverridesPhase then
             defaultParameterInjectorPhase then
             defaultParameterCleanerPhase then
-            removeInlineFunctionsWithReifiedTypeParametersLoweringPhase then
+            removeInlineDeclarationsWithReifiedTypeParametersLoweringPhase then
 
 //            TODO:
 //            multipleCatchesLoweringPhase then
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
index bcbfb912fb1..fb7f0837b60 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt
@@ -41,6 +41,11 @@ class BodyGenerator(val context: WasmFunctionCodegenContext) : IrElementVisitorV
         error("Unexpected element of type ${element::class}")
     }
 
+    override fun visitTypeOperator(expression: IrTypeOperatorCall) {
+        require(expression.operator == IrTypeOperator.REINTERPRET_CAST) { "Other types of casts must be lowered" }
+        generateExpression(expression.argument)
+    }
+
     override fun <T> visitConst(expression: IrConst<T>) {
         when (val kind = expression.kind) {
             is IrConstKind.Null -> generateDefaultInitializerForType(context.transformType(expression.type), body)
@@ -129,10 +134,8 @@ class BodyGenerator(val context: WasmFunctionCodegenContext) : IrElementVisitorV
     override fun visitConstructorCall(expression: IrConstructorCall) {
         val klass: IrClass = expression.symbol.owner.parentAsClass
 
-        if (backendContext.inlineClassesUtils.isClassInlineLike(klass)) {
-            // Unboxed instance is just a constructor argument.
-            generateExpression(expression.getValueArgument(0)!!)
-            return
+        require(!backendContext.inlineClassesUtils.isClassInlineLike(klass)) {
+            "All inline class constructor calls must be lowered to static function calls"
         }
 
         val wasmGcType: WasmSymbol<WasmTypeDeclaration> = context.referenceGcType(klass.symbol)
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt
index ad7ec9ce650..133bdabec6b 100644
--- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt
+++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmSharedVariablesManager.kt
@@ -54,19 +54,17 @@ class WasmSharedVariablesManager(val context: JsCommonBackendContext, val builtI
                     putValueArgument(0, initializer)
                 }
 
-        val descriptor = WrappedVariableDescriptor()
         return IrVariableImpl(
             originalDeclaration.startOffset,
             originalDeclaration.endOffset,
             originalDeclaration.origin,
-            IrVariableSymbolImpl(descriptor),
+            IrVariableSymbolImpl(),
             originalDeclaration.name,
             irCall.type,
             false,
             false,
             false
         ).also {
-            descriptor.bind(it)
             it.parent = originalDeclaration.parent
             it.initializer = irCall
         }
@@ -165,8 +163,7 @@ class WasmSharedVariablesManager(val context: JsCommonBackendContext, val builtI
     }
 
     private fun createClosureBoxPropertyDeclaration(): IrField {
-        val descriptor = WrappedFieldDescriptor()
-        val symbol = IrFieldSymbolImpl(descriptor)
+        val symbol = IrFieldSymbolImpl()
         val fieldName = Name.identifier("v")
         return context.irFactory.createField(
             UNDEFINED_OFFSET,
@@ -180,15 +177,13 @@ class WasmSharedVariablesManager(val context: JsCommonBackendContext, val builtI
             isExternal = false,
             isStatic = false,
         ).also {
-            descriptor.bind(it)
             it.parent = closureBoxClassDeclaration
             closureBoxClassDeclaration.declarations += it
         }
     }
 
     private fun createClosureBoxConstructorDeclaration(): IrConstructor {
-        val descriptor = WrappedClassConstructorDescriptor()
-        val symbol = IrConstructorSymbolImpl(descriptor)
+        val symbol = IrConstructorSymbolImpl()
 
         val declaration = context.irFactory.createConstructor(
             UNDEFINED_OFFSET, UNDEFINED_OFFSET, JsLoweredDeclarationOrigin.JS_CLOSURE_BOX_CLASS_DECLARATION, symbol,
@@ -196,7 +191,6 @@ class WasmSharedVariablesManager(val context: JsCommonBackendContext, val builtI
             isInline = false, isExternal = false, isPrimary = true, isExpect = false
         )
 
-        descriptor.bind(declaration)
         declaration.parent = closureBoxClassDeclaration
 
         val parameterDeclaration = createClosureBoxConstructorParameterDeclaration(declaration)
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt
index ce574d96186..ffc989df5fb 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
+import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtElement
@@ -358,41 +358,26 @@ private fun StatementGenerator.createFunctionForSuspendConversion(
     val suspendFunReturnType = suspendFunType.arguments.last().type
     val irSuspendFunReturnType = suspendFunReturnType.toIrType()
 
-    val adapterFunctionDescriptor = WrappedSimpleFunctionDescriptor()
+    val irAdapterFun = context.irFactory.createFunction(
+        startOffset, endOffset,
+        IrDeclarationOrigin.ADAPTER_FOR_SUSPEND_CONVERSION,
+        IrSimpleFunctionSymbolImpl(),
+        Name.identifier(scope.inventNameForTemporary("suspendConversion")),
+        DescriptorVisibilities.LOCAL, Modality.FINAL,
+        irSuspendFunReturnType,
+        isInline = false, isExternal = false, isTailrec = false,
+        isSuspend = true,
+        isOperator = false, isInfix = false, isExpect = false, isFakeOverride = false
+    )
 
-    val irAdapterFun = context.symbolTable.declareSimpleFunction(
-        adapterFunctionDescriptor
-    ) { irAdapterSymbol ->
-        context.irFactory.createFunction(
-            startOffset, endOffset,
-            IrDeclarationOrigin.ADAPTER_FOR_SUSPEND_CONVERSION,
-            irAdapterSymbol,
-            Name.identifier(scope.inventNameForTemporary("suspendConversion")),
-            DescriptorVisibilities.LOCAL, Modality.FINAL,
-            irSuspendFunReturnType,
-            isInline = false, isExternal = false, isTailrec = false,
-            isSuspend = true,
-            isOperator = false, isInfix = false, isExpect = false, isFakeOverride = false
+    context.symbolTable.enterScope(irAdapterFun)
+
+    fun createValueParameter(name: String, index: Int, type: IrType): IrValueParameter =
+        context.irFactory.createValueParameter(
+            startOffset, endOffset, IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION, IrValueParameterSymbolImpl(),
+            Name.identifier(name), index, type, varargElementType = null, isCrossinline = false, isNoinline = false,
+            isHidden = false, isAssignable = false
         )
-    }
-    adapterFunctionDescriptor.bind(irAdapterFun)
-
-    context.symbolTable.enterScope(adapterFunctionDescriptor)
-
-    fun createValueParameter(name: String, index: Int, type: IrType): IrValueParameter {
-        val descriptor = WrappedValueParameterDescriptor()
-        return context.symbolTable.declareValueParameter(
-            startOffset, endOffset, IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION, descriptor, type
-        ) {
-            context.irFactory.createValueParameter(
-                startOffset, endOffset, IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_SUSPEND_CONVERSION,
-                it, Name.identifier(name), index, type, varargElementType = null, isCrossinline = false, isNoinline = false,
-                isHidden = false, isAssignable = false
-            )
-        }.also {
-            descriptor.bind(it)
-        }
-    }
 
     irAdapterFun.extensionReceiverParameter = createValueParameter("callee", -1, funType.toIrType())
     irAdapterFun.valueParameters = suspendFunType.arguments
@@ -434,7 +419,7 @@ private fun StatementGenerator.createFunctionForSuspendConversion(
         }
     }
 
-    context.symbolTable.leaveScope(adapterFunctionDescriptor)
+    context.symbolTable.leaveScope(irAdapterFun)
 
     return irAdapterFun
 }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt
index 0c9f09e84bb..8adfb284602 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt
@@ -17,15 +17,23 @@
 package org.jetbrains.kotlin.psi2ir.generators
 
 import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
+import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.toKotlinType
 import org.jetbrains.kotlin.ir.util.DataClassMembersGenerator
 import org.jetbrains.kotlin.ir.util.declareSimpleFunctionWithOverrides
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.scopes.MemberScope
+import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound
 
 /**
  * A generator that generates synthetic members of data class as well as part of inline class.
@@ -72,14 +80,57 @@ class DataClassMembersGenerator(
             override fun getProperty(parameter: ValueParameterDescriptor?, irValueParameter: IrValueParameter?): IrProperty? =
                 parameter?.let {
                     val property = getOrFail(BindingContext.VALUE_PARAMETER_AS_PROPERTY, parameter)
-                    return getProperty(property)
+                    return getIrProperty(property)
                 }
 
             override fun transform(typeParameterDescriptor: TypeParameterDescriptor): IrType =
                 typeParameterDescriptor.defaultType.toIrType()
 
-            override fun commitSubstituted(irMemberAccessExpression: IrMemberAccessExpression<*>, descriptor: CallableDescriptor) {
-                irMemberAccessExpression.commitSubstituted(descriptor)
+            private fun MemberScope.findHashCodeFunctionOrNull() =
+                getContributedFunctions(Name.identifier("hashCode"), NoLookupLocation.FROM_BACKEND)
+                    .find { it.valueParameters.isEmpty() && it.extensionReceiverParameter == null }
+
+            private fun getHashCodeFunction(type: KotlinType): FunctionDescriptor =
+                type.memberScope.findHashCodeFunctionOrNull()
+                    ?: context.builtIns.any.unsubstitutedMemberScope.findHashCodeFunctionOrNull()!!
+
+            private fun getHashCodeFunction(
+                type: KotlinType,
+                symbolResolve: (FunctionDescriptor) -> IrSimpleFunctionSymbol
+            ): IrSimpleFunctionSymbol =
+                when (val typeConstructorDescriptor = type.constructor.declarationDescriptor) {
+                    is ClassDescriptor ->
+                        if (KotlinBuiltIns.isArrayOrPrimitiveArray(typeConstructorDescriptor))
+                            context.irBuiltIns.dataClassArrayMemberHashCodeSymbol
+                        else
+                            symbolResolve(getHashCodeFunction(type))
+
+                    is TypeParameterDescriptor ->
+                        getHashCodeFunction(typeConstructorDescriptor.representativeUpperBound, symbolResolve)
+
+                    else ->
+                        throw AssertionError("Unexpected type: $type")
+                }
+
+
+            inner class Psi2IrHashCodeFunctionInfo(
+                override val symbol: IrSimpleFunctionSymbol,
+                val substituted: CallableDescriptor
+            ) : HashCodeFunctionInfo {
+
+                override fun commitSubstituted(irMemberAccessExpression: IrMemberAccessExpression<*>) {
+                    irMemberAccessExpression.commitSubstituted(substituted)
+                }
+
+            }
+
+            override fun getHashCodeFunctionInfo(type: IrType): HashCodeFunctionInfo {
+                var substituted: CallableDescriptor? = null
+                val symbol = getHashCodeFunction(type.toKotlinType()) { hashCodeDescriptor ->
+                    substituted = hashCodeDescriptor
+                    symbolTable.referenceSimpleFunction(hashCodeDescriptor.original)
+                }
+                return Psi2IrHashCodeFunctionInfo(symbol, substituted ?: symbol.descriptor)
             }
         }
 
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
index 6175f70a369..f9ee95beb29 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DelegatedPropertyGenerator.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.psi2ir.generators
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.irBlockBody
 import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.builders.irReturn
@@ -27,6 +28,7 @@ import org.jetbrains.kotlin.ir.descriptors.IrLocalDelegatedPropertyDelegateDescr
 import org.jetbrains.kotlin.ir.descriptors.IrPropertyDelegateDescriptor
 import org.jetbrains.kotlin.ir.descriptors.IrPropertyDelegateDescriptorImpl
 import org.jetbrains.kotlin.ir.expressions.*
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
 import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
@@ -391,21 +393,17 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
         irPropertyReference: IrCallableReference<*>
     ): IrBody =
         with(createBodyGenerator(irGetter.symbol)) {
-            val startOffset = ktDelegate.startOffsetSkippingComments
-            val endOffset = ktDelegate.endOffset
+            val ktDelegateExpression = ktDelegate.expression!!
+            val startOffset = ktDelegateExpression.startOffsetSkippingComments
+            val endOffset = ktDelegateExpression.endOffset
             irBlockBody(startOffset, endOffset) {
                 val statementGenerator = createStatementGenerator()
                 val conventionMethodResolvedCall = getOrFail(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, getterDescriptor)
                 val conventionMethodCall = statementGenerator.pregenerateCall(conventionMethodResolvedCall)
                 conventionMethodCall.setExplicitReceiverValue(delegateReceiverValue)
+                updateNullThisRefValue(conventionMethodCall)
                 conventionMethodCall.irValueArgumentsByIndex[1] = irPropertyReference
-                +irReturn(
-                    CallGenerator(statementGenerator).generateCall(
-                        startOffset,
-                        endOffset,
-                        conventionMethodCall
-                    )
-                )
+                +irReturn(CallGenerator(statementGenerator).generateCall(startOffset, endOffset, conventionMethodCall))
             }
         }
 
@@ -415,18 +413,29 @@ class DelegatedPropertyGenerator(declarationGenerator: DeclarationGenerator) : D
         setterDescriptor: VariableAccessorDescriptor,
         delegateReceiverValue: IntermediateValue,
         irPropertyReference: IrCallableReference<*>
-    ): IrBody = with(createBodyGenerator(irSetter.symbol)) {
-        val startOffset = ktDelegate.startOffsetSkippingComments
-        val endOffset = ktDelegate.endOffset
-        irBlockBody(startOffset, endOffset) {
-            val statementGenerator = createStatementGenerator()
-            val conventionMethodResolvedCall = getOrFail(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, setterDescriptor)
-            val conventionMethodCall = statementGenerator.pregenerateCall(conventionMethodResolvedCall)
-            conventionMethodCall.setExplicitReceiverValue(delegateReceiverValue)
-            conventionMethodCall.irValueArgumentsByIndex[1] = irPropertyReference
-            val irSetterParameter = irSetter.valueParameters[0]
-            conventionMethodCall.irValueArgumentsByIndex[2] = irGet(irSetterParameter.type, irSetterParameter.symbol)
-            +irReturn(CallGenerator(statementGenerator).generateCall(startOffset, endOffset, conventionMethodCall))
+    ): IrBody =
+        with(createBodyGenerator(irSetter.symbol)) {
+            val ktDelegateExpression = ktDelegate.expression!!
+            val startOffset = ktDelegateExpression.startOffsetSkippingComments
+            val endOffset = ktDelegateExpression.endOffset
+            irBlockBody(startOffset, endOffset) {
+                val statementGenerator = createStatementGenerator()
+                val conventionMethodResolvedCall = getOrFail(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, setterDescriptor)
+                val conventionMethodCall = statementGenerator.pregenerateCall(conventionMethodResolvedCall)
+                conventionMethodCall.setExplicitReceiverValue(delegateReceiverValue)
+                updateNullThisRefValue(conventionMethodCall)
+                conventionMethodCall.irValueArgumentsByIndex[1] = irPropertyReference
+                val irSetterParameter = irSetter.valueParameters[0]
+                conventionMethodCall.irValueArgumentsByIndex[2] = irGet(irSetterParameter)
+                +irReturn(CallGenerator(statementGenerator).generateCall(startOffset, endOffset, conventionMethodCall))
+            }
+        }
+
+    private fun updateNullThisRefValue(conventionMethodCall: CallBuilder) {
+        val arg0 = conventionMethodCall.irValueArgumentsByIndex[0]
+        if (arg0 is IrConstImpl<*> && arg0.kind == IrConstKind.Null) {
+            conventionMethodCall.irValueArgumentsByIndex[0] =
+                IrConstImpl.constNull(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.irBuiltIns.nothingNType)
         }
     }
 }
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt
index 62c8337ccc2..7abed0ee355 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ReflectionReferencesGenerator.kt
@@ -25,14 +25,14 @@ import org.jetbrains.kotlin.ir.declarations.DescriptorMetadataSource
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
+import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
 import org.jetbrains.kotlin.ir.util.referenceClassifier
 import org.jetbrains.kotlin.ir.util.referenceFunction
 import org.jetbrains.kotlin.ir.util.withScope
@@ -313,49 +313,41 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St
         callBuilder: CallBuilder,
         callableReferenceType: KotlinType
     ): IrSimpleFunction {
-        val adapterFunctionDescriptor = WrappedSimpleFunctionDescriptor()
-
         val hasSuspendConversion = !adapteeDescriptor.isSuspend &&
                 callableReferenceType.isKSuspendFunctionType
 
-        return context.symbolTable.declareSimpleFunction(
-            adapterFunctionDescriptor
-        ) { irAdapterSymbol ->
-            context.irFactory.createFunction(
-                startOffset, endOffset,
-                IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE,
-                irAdapterSymbol,
-                adapteeDescriptor.name,
-                DescriptorVisibilities.LOCAL,
-                Modality.FINAL,
-                ktExpectedReturnType.toIrType(),
-                isInline = adapteeDescriptor.isInline, // TODO ?
-                isExternal = false,
-                isTailrec = false,
-                isSuspend = adapteeDescriptor.isSuspend || hasSuspendConversion,
-                isOperator = adapteeDescriptor.isOperator, // TODO ?
-                isInfix = adapteeDescriptor.isInfix,
-                isExpect = false,
-                isFakeOverride = false
-            ).also { irAdapterFun ->
-                adapterFunctionDescriptor.bind(irAdapterFun)
+        return context.irFactory.createFunction(
+            startOffset, endOffset,
+            IrDeclarationOrigin.ADAPTER_FOR_CALLABLE_REFERENCE,
+            IrSimpleFunctionSymbolImpl(),
+            adapteeDescriptor.name,
+            DescriptorVisibilities.LOCAL,
+            Modality.FINAL,
+            ktExpectedReturnType.toIrType(),
+            isInline = adapteeDescriptor.isInline, // TODO ?
+            isExternal = false,
+            isTailrec = false,
+            isSuspend = adapteeDescriptor.isSuspend || hasSuspendConversion,
+            isOperator = adapteeDescriptor.isOperator, // TODO ?
+            isInfix = adapteeDescriptor.isInfix,
+            isExpect = false,
+            isFakeOverride = false
+        ).also { irAdapterFun ->
+            context.symbolTable.withScope(irAdapterFun) {
+                irAdapterFun.metadata = DescriptorMetadataSource.Function(adapteeDescriptor)
 
-                context.symbolTable.withScope(adapterFunctionDescriptor) {
-                    irAdapterFun.metadata = DescriptorMetadataSource.Function(adapteeDescriptor)
+                irAdapterFun.dispatchReceiverParameter = null
 
-                    irAdapterFun.dispatchReceiverParameter = null
+                val boundReceiver = callBuilder.original.selectBoundReceiver()
+                if (boundReceiver != null) {
+                    irAdapterFun.extensionReceiverParameter =
+                        createAdapterParameter(startOffset, endOffset, Name.identifier("receiver"), -1, boundReceiver.type)
+                } else {
+                    irAdapterFun.extensionReceiverParameter = null
+                }
 
-                    val boundReceiver = callBuilder.original.selectBoundReceiver()
-                    if (boundReceiver != null) {
-                        irAdapterFun.extensionReceiverParameter =
-                            createAdapterParameter(startOffset, endOffset, Name.identifier("receiver"), -1, boundReceiver.type)
-                    } else {
-                        irAdapterFun.extensionReceiverParameter = null
-                    }
-
-                    irAdapterFun.valueParameters += ktExpectedParameterTypes.mapIndexed { index, ktExpectedParameterType ->
-                        createAdapterParameter(startOffset, endOffset, Name.identifier("p$index"), index, ktExpectedParameterType)
-                    }
+                irAdapterFun.valueParameters += ktExpectedParameterTypes.mapIndexed { index, ktExpectedParameterType ->
+                    createAdapterParameter(startOffset, endOffset, Name.identifier("p$index"), index, ktExpectedParameterType)
                 }
             }
         }
@@ -371,24 +363,16 @@ class ReflectionReferencesGenerator(statementGenerator: StatementGenerator) : St
         }
     }
 
-    private fun createAdapterParameter(startOffset: Int, endOffset: Int, name: Name, index: Int, type: KotlinType): IrValueParameter {
-        val descriptor = WrappedValueParameterDescriptor()
-        return context.symbolTable.declareValueParameter(
-            startOffset, endOffset, IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE, descriptor, type.toIrType()
-        ) { irAdapterParameterSymbol ->
-            context.irFactory.createValueParameter(
-                startOffset, endOffset,
-                IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE,
-                irAdapterParameterSymbol,
-                name,
-                index,
-                type.toIrType(),
-                varargElementType = null, isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false
-            ).also { irAdapterValueParameter ->
-                descriptor.bind(irAdapterValueParameter)
-            }
-        }
-    }
+    private fun createAdapterParameter(startOffset: Int, endOffset: Int, name: Name, index: Int, type: KotlinType): IrValueParameter =
+        context.irFactory.createValueParameter(
+            startOffset, endOffset,
+            IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE,
+            IrValueParameterSymbolImpl(),
+            name,
+            index,
+            type.toIrType(),
+            varargElementType = null, isCrossinline = false, isNoinline = false, isHidden = false, isAssignable = false
+        )
 
     fun generateCallableReference(
         ktElement: KtElement,
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt
index 776cc8a17c4..667e15dcc6f 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/StandaloneDeclarationGenerator.kt
@@ -194,7 +194,7 @@ class StandaloneDeclarationGenerator(private val context: GeneratorContext) {
         }
         irFunction.metadata = DescriptorMetadataSource.Function(descriptor)
 
-        symbolTable.withScope(descriptor) {
+        symbolTable.withScope(irFunction) {
             generateOverridenSymbols(irFunction, descriptor.overriddenDescriptors)
             generateScopedTypeParameterDeclarations(irFunction, descriptor.propertyIfAccessor.typeParameters)
             generateValueParameterDeclarations(irFunction, descriptor, defaultArgumentFactory)
diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
index 711465e7a0c..601bbe06e6c 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/transformations/InsertImplicitCasts.kt
@@ -28,15 +28,15 @@ import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrVariable
+import org.jetbrains.kotlin.ir.descriptors.IrBasedDeclarationDescriptor
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrTypeOperatorCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
-import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.types.impl.originalKotlinType
-import org.jetbrains.kotlin.ir.types.toKotlinType
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
@@ -355,7 +355,7 @@ internal class InsertImplicitCasts(
             valueType.hasEnhancedNullability() && !expectedType.acceptsNullValues() ->
                 implicitNonNull(valueType, expectedType)
 
-            KotlinTypeChecker.DEFAULT.isSubtypeOf(valueType, expectedType.makeNullable()) ->
+            KotlinTypeChecker.DEFAULT.isSubtypeOf(valueType.toNonIrBased(), expectedType.toNonIrBased().makeNullable()) ->
                 this
 
             KotlinBuiltIns.isInt(valueType) && notNullableExpectedType.isBuiltInIntegerType() ->
@@ -485,4 +485,23 @@ internal class InsertImplicitCasts(
                 this
             )
     }
+
+    // KotlinType subtype checking fails when one of the types uses IR-based descriptors, the other one regular descriptors.
+    // This is a kludge to remove IR-based descriptors where possible.
+    private fun KotlinType.toNonIrBased(): KotlinType {
+        if (this !is SimpleType) return this
+        val newDescriptor = constructor.declarationDescriptor?.let {
+            if (it is IrBasedDeclarationDescriptor<*> && it.owner.symbol.hasDescriptor)
+                it.owner.symbol.descriptor as ClassifierDescriptor
+            else
+                it
+        } ?: return this
+        val newArguments = arguments.mapIndexed { index, it ->
+            if (it.isStarProjection)
+                StarProjectionImpl((newDescriptor as ClassDescriptor).typeConstructor.parameters[index])
+            else
+                TypeProjectionImpl(it.projectionKind, it.type.toNonIrBased())
+        }
+        return newDescriptor.defaultType.replace(newArguments = newArguments).makeNullableAsSpecified(isMarkedNullable)
+    }
 }
diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt
index 7689b17e41b..c469c1a3e2a 100644
--- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt
+++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt
@@ -22,14 +22,18 @@ import org.jetbrains.kotlin.ir.declarations.IrFactory
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrErrorDeclaration
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 class IrErrorDeclarationImpl(
     override val startOffset: Int,
     override val endOffset: Int,
-    override val descriptor: DeclarationDescriptor
+    private val _descriptor: DeclarationDescriptor?
 ) : IrErrorDeclaration() {
+    override val descriptor: DeclarationDescriptor
+        get() = _descriptor ?: this.toIrBasedDescriptor()
+
     override var origin: IrDeclarationOrigin = IrDeclarationOrigin.DEFINED
 
     override val factory: IrFactory
diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt
index cf68503e852..f1939e4a0ae 100644
--- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt
+++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFactoryImpl.kt
@@ -83,7 +83,7 @@ object IrFactoryImpl : IrFactory {
     override fun createErrorDeclaration(
         startOffset: Int,
         endOffset: Int,
-        descriptor: DeclarationDescriptor,
+        descriptor: DeclarationDescriptor?,
     ): IrErrorDeclaration =
         IrErrorDeclarationImpl(startOffset, endOffset, descriptor)
 
diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
index 16d5a30ae20..21fe68874af 100644
--- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
+++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
@@ -130,14 +130,13 @@ class IrFakeOverrideFunctionImpl(
 
     @ObsoleteDescriptorBasedAPI
     override val descriptor
-        get() = _symbol?.descriptor ?: WrappedSimpleFunctionDescriptor()
+        get() = _symbol?.descriptor ?: this.toIrBasedDescriptor()
 
     @OptIn(ObsoleteDescriptorBasedAPI::class)
     override fun acquireSymbol(symbol: IrSimpleFunctionSymbol): IrSimpleFunction {
         assert(_symbol == null) { "$this already has symbol _symbol" }
         _symbol = symbol
         symbol.bind(this)
-        (symbol.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(this)
         return this
     }
 }
diff --git a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
index 17725e92fe7..ec97784ef1a 100644
--- a/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
+++ b/compiler/ir/ir.tree.impl/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.name.Name
@@ -114,14 +114,13 @@ class IrFakeOverridePropertyImpl(
 
     @ObsoleteDescriptorBasedAPI
     override val descriptor
-        get() = _symbol?.descriptor ?: WrappedPropertyDescriptor()
+        get() = _symbol?.descriptor ?: this.toIrBasedDescriptor()
 
     @OptIn(ObsoleteDescriptorBasedAPI::class)
     override fun acquireSymbol(symbol: IrPropertySymbol): IrProperty {
         assert(_symbol == null) { "$this already has symbol _symbol" }
         _symbol = symbol
         symbol.bind(this)
-        (symbol.descriptor as? WrappedPropertyDescriptor)?.bind(this)
         return this
     }
 }
diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrErrorDeclaration.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrErrorDeclaration.kt
index 2864d65eb5c..e474cc26e43 100644
--- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrErrorDeclaration.kt
+++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrErrorDeclaration.kt
@@ -24,14 +24,18 @@ import org.jetbrains.kotlin.ir.declarations.IrErrorDeclaration
 import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier
 import org.jetbrains.kotlin.ir.declarations.persistent.carriers.ErrorCarrier
 import org.jetbrains.kotlin.ir.declarations.stageController
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 internal class PersistentIrErrorDeclaration(
     override val startOffset: Int,
     override val endOffset: Int,
-    override val descriptor: DeclarationDescriptor
+    private val _descriptor: DeclarationDescriptor?
 ) : PersistentIrDeclarationBase<ErrorCarrier>, IrErrorDeclaration(), ErrorCarrier {
+    override val descriptor: DeclarationDescriptor
+        get() = _descriptor ?: this.toIrBasedDescriptor()
+
     override var lastModified: Int = stageController.currentStage
     override var loweredUpTo: Int = stageController.currentStage
     override var values: Array<Carrier>? = null
diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt
index 13fa08ea6a0..1cbbd63941c 100644
--- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt
+++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt
@@ -83,7 +83,7 @@ object PersistentIrFactory : IrFactory {
     override fun createErrorDeclaration(
         startOffset: Int,
         endOffset: Int,
-        descriptor: DeclarationDescriptor,
+        descriptor: DeclarationDescriptor?,
     ): IrErrorDeclaration =
         PersistentIrErrorDeclaration(startOffset, endOffset, descriptor)
 
diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt
index c512b193050..6802894d21e 100644
--- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt
+++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier
 import org.jetbrains.kotlin.ir.declarations.persistent.carriers.FunctionCarrier
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
@@ -236,14 +236,13 @@ internal class PersistentIrFakeOverrideFunction(
 
     @ObsoleteDescriptorBasedAPI
     override val descriptor
-        get() = _symbol?.descriptor ?: WrappedSimpleFunctionDescriptor()
+        get() = _symbol?.descriptor ?: this.toIrBasedDescriptor()
 
     @OptIn(ObsoleteDescriptorBasedAPI::class)
     override fun acquireSymbol(symbol: IrSimpleFunctionSymbol): IrSimpleFunction {
         assert(_symbol == null) { "$this already has symbol _symbol" }
         _symbol = symbol
         symbol.bind(this)
-        (symbol.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(this)
         return this
     }
 }
diff --git a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt
index a88ac15d1b6..12407ba9537 100644
--- a/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt
+++ b/compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.persistent.carriers.Carrier
 import org.jetbrains.kotlin.ir.declarations.persistent.carriers.PropertyCarrier
-import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 import org.jetbrains.kotlin.name.Name
@@ -165,14 +165,13 @@ internal class PersistentIrFakeOverrideProperty(
 
     @ObsoleteDescriptorBasedAPI
     override val descriptor
-        get() = _symbol?.descriptor ?: WrappedPropertyDescriptor()
+        get() = _symbol?.descriptor ?: this.toIrBasedDescriptor()
 
     @OptIn(ObsoleteDescriptorBasedAPI::class)
     override fun acquireSymbol(symbol: IrPropertySymbol): IrProperty {
         assert(_symbol == null) { "$this already has symbol _symbol" }
         _symbol = symbol
         symbol.bind(this)
-        (symbol.descriptor as? WrappedPropertyDescriptor)?.bind(this)
         return this
     }
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/Scope.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/Scope.kt
index 4755f19430f..e92a6f28739 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/Scope.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/builders/Scope.kt
@@ -16,15 +16,12 @@
 
 package org.jetbrains.kotlin.ir.builders
 
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrVariable
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.*
@@ -61,12 +58,10 @@ class Scope(val scopeOwnerSymbol: IrSymbol) {
         endOffset: Int = UNDEFINED_OFFSET
     ): IrVariable {
         val name = Name.identifier(getNameForTemporary(nameHint))
-        val descriptor = WrappedVariableDescriptor()
         return IrVariableImpl(
-            startOffset, endOffset, origin, IrVariableSymbolImpl(descriptor), name,
+            startOffset, endOffset, origin, IrVariableSymbolImpl(), name,
             irType, isMutable, isConst = false, isLateinit = false
         ).apply {
-            descriptor.bind(this)
             parent = getLocalDeclarationParent()
         }
     }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt
index cffadea14d9..7c8f0f0ca38 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt
@@ -23,9 +23,10 @@ import org.jetbrains.kotlin.ir.symbols.IrAnonymousInitializerSymbol
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
-abstract class IrAnonymousInitializer : IrDeclarationBase(), IrSymbolDeclaration<IrAnonymousInitializerSymbol> {
+abstract class IrAnonymousInitializer : IrDeclarationBase() {
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: ClassDescriptor // TODO special descriptor for anonymous initializer blocks
+    abstract override val symbol: IrAnonymousInitializerSymbol
 
     abstract val isStatic: Boolean
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt
index 356e8674162..59b68ebdf0f 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt
@@ -29,11 +29,12 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
 abstract class IrClass :
-    IrDeclarationBase(), IrSymbolDeclaration<IrClassSymbol>, IrDeclarationWithName, IrDeclarationWithVisibility,
+    IrDeclarationBase(), IrDeclarationWithName, IrDeclarationWithVisibility,
     IrDeclarationContainer, IrTypeParametersContainer, IrAttributeContainer, IrMetadataSourceOwner {
 
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: ClassDescriptor
+    abstract override val symbol: IrClassSymbol
 
     abstract val kind: ClassKind
     abstract var modality: Modality
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt
index 0d07f928444..756f8a0c9c0 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt
@@ -21,9 +21,10 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
-abstract class IrConstructor : IrFunction(), IrSymbolDeclaration<IrConstructorSymbol> {
+abstract class IrConstructor : IrFunction() {
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: ClassConstructorDescriptor
+    abstract override val symbol: IrConstructorSymbol
 
     abstract val isPrimary: Boolean
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt
index 83658d9b115..2d296e31522 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt
@@ -35,7 +35,7 @@ interface IrMetadataSourceOwner : IrElement {
     var metadata: MetadataSource?
 }
 
-interface IrDeclaration : IrStatement, IrMutableAnnotationContainer {
+interface IrDeclaration : IrStatement, IrSymbolOwner, IrMutableAnnotationContainer {
     @ObsoleteDescriptorBasedAPI
     val descriptor: DeclarationDescriptor
 
@@ -48,10 +48,6 @@ interface IrDeclaration : IrStatement, IrMutableAnnotationContainer {
 
 abstract class IrDeclarationBase : IrElementBase(), IrDeclaration
 
-interface IrSymbolDeclaration<out S : IrSymbol> : IrDeclaration, IrSymbolOwner {
-    override val symbol: S
-}
-
 interface IrOverridableDeclaration<S : IrSymbol> : IrDeclaration {
     var overriddenSymbols: List<S>
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt
index 761bf1251a5..4c9276b4c0f 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt
@@ -23,9 +23,10 @@ import org.jetbrains.kotlin.ir.symbols.IrEnumEntrySymbol
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
-abstract class IrEnumEntry : IrDeclarationBase(), IrSymbolDeclaration<IrEnumEntrySymbol>, IrDeclarationWithName {
+abstract class IrEnumEntry : IrDeclarationBase(), IrDeclarationWithName {
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: ClassDescriptor
+    abstract override val symbol: IrEnumEntrySymbol
 
     abstract var correspondingClass: IrClass?
     abstract var initializerExpression: IrExpressionBody?
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrErrorDeclaration.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrErrorDeclaration.kt
index 08f8140d167..e4f4961eeca 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrErrorDeclaration.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrErrorDeclaration.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.ir.declarations
 
+import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
@@ -30,4 +31,7 @@ abstract class IrErrorDeclaration : IrDeclarationBase() {
     override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
         // no children
     }
+
+    override val symbol: IrSymbol
+        get() = error("Should never be called")
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt
index 89e67e51841..2735fa12fc8 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFactory.kt
@@ -70,7 +70,7 @@ interface IrFactory {
     fun createErrorDeclaration(
         startOffset: Int,
         endOffset: Int,
-        descriptor: DeclarationDescriptor,
+        descriptor: DeclarationDescriptor? = null,
     ): IrErrorDeclaration
 
     fun createField(
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideFunction.kt
index 6d39f830ec9..bda12785227 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideFunction.kt
@@ -8,7 +8,9 @@ package org.jetbrains.kotlin.ir.declarations
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 
-interface IrFakeOverrideFunction : IrSymbolDeclaration<IrSimpleFunctionSymbol> {
+interface IrFakeOverrideFunction : IrDeclaration {
+    override val symbol: IrSimpleFunctionSymbol
+
     var modality: Modality
 
     fun acquireSymbol(symbol: IrSimpleFunctionSymbol): IrSimpleFunction
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideProperty.kt
index ccd9a9bea65..f8f6c435c0c 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideProperty.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFakeOverrideProperty.kt
@@ -8,7 +8,9 @@ package org.jetbrains.kotlin.ir.declarations
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
 
-interface IrFakeOverrideProperty : IrSymbolDeclaration<IrPropertySymbol> {
+interface IrFakeOverrideProperty : IrDeclaration {
+    override val symbol: IrPropertySymbol
+
     var modality: Modality
     var getter: IrSimpleFunction?
     var setter: IrSimpleFunction?
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt
index 8b39978db30..43d7d2cf599 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt
@@ -16,11 +16,11 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
 abstract class IrField :
     IrDeclarationBase(),
-    IrSymbolDeclaration<IrFieldSymbol>,
     IrDeclarationWithName, IrDeclarationWithVisibility, IrDeclarationParent, IrMetadataSourceOwner {
 
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: PropertyDescriptor
+    abstract override val symbol: IrFieldSymbol
 
     abstract var type: IrType
     abstract val isFinal: Boolean
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt
index 8f242cc2d3b..2ab4f201e8a 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrScript.kt
@@ -13,9 +13,11 @@ import org.jetbrains.kotlin.ir.types.IrType
 //TODO: make IrScript as IrPackageFragment, because script is used as a file, not as a class
 //NOTE: declarations and statements stored separately
 abstract class IrScript :
-    IrDeclarationBase(), IrSymbolDeclaration<IrScriptSymbol>, IrDeclarationWithName,
+    IrDeclarationBase(), IrDeclarationWithName,
     IrDeclarationParent, IrStatementContainer {
 
+    abstract override val symbol: IrScriptSymbol
+
     // NOTE: is the result of the FE conversion, because there script interpreted as a class and has receiver
     // TODO: consider removing from here and handle appropriately in the lowering
     abstract var thisReceiver: IrValueParameter
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
index 6a41b6e6eec..78caf32b5fc 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt
@@ -11,11 +11,12 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
 abstract class IrSimpleFunction :
     IrFunction(),
-    IrSymbolDeclaration<IrSimpleFunctionSymbol>,
     IrOverridableDeclaration<IrSimpleFunctionSymbol>,
     IrOverridableMember,
     IrAttributeContainer {
 
+    abstract override val symbol: IrSimpleFunctionSymbol
+
     abstract val isTailrec: Boolean
     abstract val isSuspend: Boolean
     abstract val isFakeOverride: Boolean
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt
index f2fee1943e2..c8a2eb933ef 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt
@@ -15,13 +15,13 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
 abstract class IrTypeAlias :
     IrDeclarationBase(),
-    IrSymbolDeclaration<IrTypeAliasSymbol>,
     IrDeclarationWithName,
     IrDeclarationWithVisibility,
     IrTypeParametersContainer {
 
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: TypeAliasDescriptor
+    abstract override val symbol: IrTypeAliasSymbol
 
     abstract val isActual: Boolean
     abstract var expandedType: IrType
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt
index e6efde84b05..3b9c8b55600 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt
@@ -24,9 +24,10 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.types.Variance
 
-abstract class IrTypeParameter : IrDeclarationBase(), IrSymbolDeclaration<IrTypeParameterSymbol>, IrDeclarationWithName {
+abstract class IrTypeParameter : IrDeclarationBase(), IrDeclarationWithName {
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: TypeParameterDescriptor
+    abstract override val symbol: IrTypeParameterSymbol
 
     abstract val variance: Variance
     abstract val index: Int
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt
index dd3db5a6a42..88da0d7d526 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt
@@ -24,9 +24,10 @@ import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
-abstract class IrValueParameter : IrValueDeclaration(), IrSymbolDeclaration<IrValueParameterSymbol> {
+abstract class IrValueParameter : IrValueDeclaration() {
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: ParameterDescriptor
+    abstract override val symbol: IrValueParameterSymbol
 
     abstract val index: Int
     abstract var varargElementType: IrType?
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt
index 62bf477a1cb..8aff48e4522 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt
@@ -21,9 +21,10 @@ import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.symbols.IrVariableSymbol
 
-abstract class IrVariable : IrValueDeclaration(), IrSymbolDeclaration<IrVariableSymbol> {
+abstract class IrVariable : IrValueDeclaration() {
     @ObsoleteDescriptorBasedAPI
     abstract override val descriptor: VariableDescriptor
+    abstract override val symbol: IrVariableSymbol
 
     abstract val isVar: Boolean
     abstract val isConst: Boolean
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt
index 9614778dbe9..81928a1efd8 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyConstructor.kt
@@ -58,7 +58,7 @@ class IrLazyConstructor(
 
     override var typeParameters: List<IrTypeParameter> by lazyVar {
         typeTranslator.buildWithScope(this) {
-            stubGenerator.symbolTable.withScope(descriptor) {
+            stubGenerator.symbolTable.withScope(this) {
                 val classTypeParametersCount = descriptor.constructedClass.original.declaredTypeParameters.size
                 val allConstructorTypeParameters = descriptor.typeParameters
                 allConstructorTypeParameters.subList(classTypeParametersCount, allConstructorTypeParameters.size).mapTo(ArrayList()) {
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt
index 20d7be42be4..1ca7751f7ff 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/lazy/IrLazyFunction.kt
@@ -66,7 +66,7 @@ class IrLazyFunction(
 
     override var typeParameters: List<IrTypeParameter> by lazyVar {
         typeTranslator.buildWithScope(this) {
-            stubGenerator.symbolTable.withScope(descriptor) {
+            stubGenerator.symbolTable.withScope(this) {
                 val propertyIfAccessor = descriptor.propertyIfAccessor
                 propertyIfAccessor.typeParameters.mapTo(arrayListOf()) { typeParameterDescriptor ->
                     if (descriptor != propertyIfAccessor) {
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
index 0fc45178264..c85caf34316 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBasedDescriptors.kt
@@ -14,9 +14,7 @@ import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
-import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
-import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
+import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.Name
@@ -30,11 +28,13 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.types.*
 
 /* Descriptors that serve purely as a view into IR structures.
    Created each time at the borderline between IR-based and descriptor-based code (such as inliner).
-   Compared to WrappedDescriptors, no method calls ever return true descriptors.
+   Compared to WrappedDescriptors, no method calls ever return true descriptors, except when
+   unbound symbols are encountered (see `Ir...Symbol.toIrBasedDescriptorIfPossible()`).
  */
 
 abstract class IrBasedDeclarationDescriptor<T : IrDeclaration>(val owner: T) : DeclarationDescriptor {
@@ -108,9 +108,12 @@ fun IrDeclaration.toIrBasedDescriptor(): DeclarationDescriptor = when (this) {
     is IrLocalDelegatedProperty -> toIrBasedDescriptor()
     is IrFunction -> toIrBasedDescriptor()
     is IrClass -> toIrBasedDescriptor()
+    is IrAnonymousInitializer -> parentAsClass.toIrBasedDescriptor()
     is IrEnumEntry -> toIrBasedDescriptor()
     is IrProperty -> toIrBasedDescriptor()
     is IrField -> toIrBasedDescriptor()
+    is IrTypeAlias -> toIrBasedDescriptor()
+    is IrErrorDeclaration -> toIrBasedDescriptor()
     else -> error("Unknown declaration kind")
 }
 
@@ -657,6 +660,27 @@ open class IrBasedClassDescriptor(owner: IrClass) : ClassDescriptor, IrBasedDecl
 
 fun IrClass.toIrBasedDescriptor() = IrBasedClassDescriptor(this)
 
+class LazyTypeConstructor(
+    val classDescriptor: ClassDescriptor,
+    val parametersBuilder: () -> List<TypeParameterDescriptor>,
+    val superTypesBuilder: () -> List<KotlinType>,
+    storageManager: StorageManager
+) : AbstractClassTypeConstructor(storageManager) {
+    val parameters_ by lazy { parametersBuilder() }
+    val superTypes_ by lazy { superTypesBuilder() }
+
+    override fun getParameters() = parameters_
+
+    override fun computeSupertypes() = superTypes_
+
+    override fun isDenotable() = true
+
+    override fun getDeclarationDescriptor() = classDescriptor
+
+    override val supertypeLoopChecker: SupertypeLoopChecker
+        get() = SupertypeLoopChecker.EMPTY
+}
+
 open class IrBasedEnumEntryDescriptor(owner: IrEnumEntry) : ClassDescriptor, IrBasedDeclarationDescriptor<IrEnumEntry>(owner) {
     override fun getName() = owner.name
 
@@ -934,6 +958,8 @@ open class IrBasedTypeAliasDescriptor(owner: IrTypeAlias) : IrBasedDeclarationDe
     }
 }
 
+fun IrTypeAlias.toIrBasedDescriptor() = IrBasedTypeAliasDescriptor(this)
+
 open class IrBasedFieldDescriptor(owner: IrField) : PropertyDescriptor, IrBasedDeclarationDescriptor<IrField>(owner) {
     override fun getModality() = if (owner.isFinal) Modality.FINAL else Modality.OPEN
 
@@ -1034,6 +1060,25 @@ open class IrBasedFieldDescriptor(owner: IrField) : PropertyDescriptor, IrBasedD
 
 fun IrField.toIrBasedDescriptor() = IrBasedFieldDescriptor(this)
 
+class IrBasedErrorDescriptor(owner: IrErrorDeclaration) : IrBasedDeclarationDescriptor<IrErrorDeclaration>(owner) {
+    override fun getName(): Name = error("IrBasedErrorDescriptor.getName: Should not be reached")
+
+    override fun getOriginal(): DeclarationDescriptorWithSource =
+        error("IrBasedErrorDescriptor.getOriginal: Should not be reached")
+
+    override fun getContainingDeclaration(): DeclarationDescriptor =
+        error("IrBasedErrorDescriptor.getContainingDeclaration: Should not be reached")
+
+    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R {
+        error("IrBasedErrorDescriptor.accept: Should not be reached")
+    }
+
+    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
+    }
+}
+
+fun IrErrorDeclaration.toIrBasedDescriptor() = IrBasedErrorDescriptor(this)
+
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 private fun getContainingDeclaration(declaration: IrDeclaration): DeclarationDescriptor {
     val parent = declaration.parent
@@ -1060,9 +1105,9 @@ private fun makeKotlinType(
     hasQuestionMark: Boolean
 ): SimpleType =
     when (classifier) {
-        is IrTypeParameterSymbol -> classifier.owner.toIrBasedDescriptor().defaultType
+        is IrTypeParameterSymbol -> classifier.toIrBasedDescriptorIfPossible().defaultType
         is IrClassSymbol -> {
-            val classDescriptor = classifier.owner.toIrBasedDescriptor()
+            val classDescriptor = classifier.toIrBasedDescriptorIfPossible()
             val kotlinTypeArguments = arguments.mapIndexed { index, it ->
                 when (it) {
                     is IrTypeProjection -> TypeProjectionImpl(it.variance, it.type.toIrBasedKotlinType())
@@ -1094,3 +1139,20 @@ private fun makeKotlinType(
         }
         else -> error("unknown classifier kind $classifier")
     }
+
+/* When IR-based descriptors are used from Psi2Ir, symbols may be unbound, thus we may need to resort to real descriptors. */
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+private fun IrClassSymbol.toIrBasedDescriptorIfPossible(): ClassDescriptor =
+    if (isBound) owner.toIrBasedDescriptor() else descriptor
+
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+private fun IrTypeParameterSymbol.toIrBasedDescriptorIfPossible(): TypeParameterDescriptor =
+    if (isBound) owner.toIrBasedDescriptor() else descriptor
+
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+private fun IrSimpleFunctionSymbol.toIrBasedDescriptorIfPossible(): FunctionDescriptor =
+    if (isBound) owner.toIrBasedDescriptor() else descriptor
+
+@OptIn(ObsoleteDescriptorBasedAPI::class)
+private fun IrPropertySymbol.toIrBasedDescriptorIfPossible(): PropertyDescriptor =
+    if (isBound) owner.toIrBasedDescriptor() else descriptor
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt
index bc2dd3b00db..a69cae6c09b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrFunctionFactory.kt
@@ -273,8 +273,6 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa
             isAssignable = false
         )
 
-        if (vDescriptor is WrappedReceiverParameterDescriptor) vDescriptor.bind(vDeclaration)
-
         return vDeclaration
     }
 
@@ -339,7 +337,6 @@ class IrFunctionFactory(private val irBuiltIns: IrBuiltIns, private val symbolTa
                     isAssignable = false
                 )
                 vDeclaration.parent = fDeclaration
-                if (vDescriptor is WrappedValueParameterDescriptor) vDescriptor.bind(vDeclaration)
                 fDeclaration.valueParameters += vDeclaration
             }
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt
deleted file mode 100644
index 27be9b26ef3..00000000000
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/WrappedDescriptors.kt
+++ /dev/null
@@ -1,1197 +0,0 @@
-/*
- * Copyright 2010-2019 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.ir.descriptors
-
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
-import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
-import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.types.classifierOrFail
-import org.jetbrains.kotlin.ir.types.toKotlinType
-import org.jetbrains.kotlin.ir.types.typeConstructorParameters
-import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.constants.*
-import org.jetbrains.kotlin.resolve.descriptorUtil.classId
-import org.jetbrains.kotlin.resolve.descriptorUtil.module
-import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter
-import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.resolve.scopes.TypeIntersectionScope
-import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.types.*
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-abstract class WrappedDeclarationDescriptor<T : IrDeclaration> : DeclarationDescriptorWithSource {
-    override val annotations: Annotations
-        get() = annotationsFromOwner
-
-    override fun getSource(): SourceElement = SourceElement.NO_SOURCE
-
-    private val annotationsFromOwner by lazy {
-        val ownerAnnotations = (owner as? IrAnnotationContainer)?.annotations ?: return@lazy Annotations.EMPTY
-        Annotations.create(ownerAnnotations.map { it.toAnnotationDescriptor() })
-    }
-
-    private fun IrConstructorCall.toAnnotationDescriptor(): AnnotationDescriptor {
-        assert(symbol.owner.parentAsClass.isAnnotationClass) {
-            "Expected call to constructor of annotation class but was: ${this.dump()}"
-        }
-        return AnnotationDescriptorImpl(
-            symbol.owner.parentAsClass.defaultType.toKotlinType(),
-            symbol.owner.valueParameters.map { it.name to getValueArgument(it.index) }
-                .filter { it.second != null }
-                .associate { it.first to it.second!!.toConstantValue() },
-            /*TODO*/ SourceElement.NO_SOURCE
-        )
-    }
-
-    private fun IrElement.toConstantValue(): ConstantValue<*> {
-        return when {
-            this is IrConst<*> -> when (kind) {
-                IrConstKind.Null -> NullValue()
-                IrConstKind.Boolean -> BooleanValue(value as Boolean)
-                IrConstKind.Char -> CharValue(value as Char)
-                IrConstKind.Byte -> ByteValue(value as Byte)
-                IrConstKind.Short -> ShortValue(value as Short)
-                IrConstKind.Int -> IntValue(value as Int)
-                IrConstKind.Long -> LongValue(value as Long)
-                IrConstKind.String -> StringValue(value as String)
-                IrConstKind.Float -> FloatValue(value as Float)
-                IrConstKind.Double -> DoubleValue(value as Double)
-            }
-
-            this is IrVararg -> {
-                val elements = elements.map { if (it is IrSpreadElement) error("$it is not expected") else it.toConstantValue() }
-                ArrayValue(elements) { moduleDescriptor ->
-                    // TODO: substitute.
-                    moduleDescriptor.builtIns.array.defaultType
-                }
-            }
-
-            this is IrGetEnumValue -> EnumValue(symbol.owner.parentAsClass.descriptor.classId!!, symbol.owner.name)
-
-            this is IrClassReference -> KClassValue(classType.classifierOrFail.descriptor.classId!!, /*TODO*/0)
-
-            this is IrConstructorCall -> AnnotationValue(this.toAnnotationDescriptor())
-
-            else -> error("$this is not expected: ${this.dump()}")
-        }
-    }
-
-    private var _owner: T? = null
-
-    var owner: T
-        get() {
-            return _owner ?: error("$this is not bound")
-        }
-        private set(value) {
-            _owner?.let { error("$this is already bound to ${it.dump()}") }
-            _owner = value
-        }
-
-    fun bind(declaration: T) {
-        owner = declaration
-    }
-
-    fun isBound(): Boolean = _owner != null
-}
-
-abstract class WrappedCallableDescriptor<T : IrDeclaration> : CallableDescriptor, WrappedDeclarationDescriptor<T>() {
-    override fun getOriginal() = this
-
-    override fun substitute(substitutor: TypeSubstitutor): CallableDescriptor =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun getOverriddenDescriptors(): Collection<CallableDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun getSource() = SourceElement.NO_SOURCE
-
-    override fun getExtensionReceiverParameter(): ReceiverParameterDescriptor? = null
-
-    override fun getDispatchReceiverParameter(): ReceiverParameterDescriptor? = null
-
-    override fun getTypeParameters(): List<TypeParameterDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun getReturnType(): KotlinType? {
-        TODO("not implemented")
-    }
-
-    override fun getValueParameters(): List<ValueParameterDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun hasStableParameterNames(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun hasSynthesizedParameterNames() = false
-
-    override fun getVisibility(): DescriptorVisibility {
-        TODO("not implemented")
-    }
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R {
-        TODO("not implemented")
-    }
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        TODO("not implemented")
-    }
-
-    override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
-}
-
-// TODO: (Roman Artemev) do not create this kind of descriptor for dispatch receiver parameters
-// WrappedReceiverParameterDescriptor should be used instead
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedValueParameterDescriptor : ValueParameterDescriptor, WrappedCallableDescriptor<IrValueParameter>() {
-
-    override val index get() = owner.index
-    override val isCrossinline get() = owner.isCrossinline
-    override val isNoinline get() = owner.isNoinline
-    override val varargElementType get() = owner.varargElementType?.toKotlinType()
-    override fun isConst() = false
-    override fun isVar() = false
-
-    override fun getContainingDeclaration() = (owner.parent as IrFunction).descriptor
-    override fun getType() = owner.type.toKotlinType()
-    override fun getName() = owner.name
-    override fun declaresDefaultValue() = owner.defaultValue != null
-    override fun getCompileTimeInitializer(): ConstantValue<*>? = null
-
-    override fun copy(newOwner: CallableDescriptor, newName: Name, newIndex: Int) = object : WrappedValueParameterDescriptor() {
-        override fun getContainingDeclaration() = newOwner as FunctionDescriptor
-        override fun getName() = newName
-        override val index = newIndex
-    }.also { it.bind(owner) }
-
-
-    override fun getOverriddenDescriptors(): Collection<ValueParameterDescriptor> = emptyList()
-    override fun getTypeParameters(): List<TypeParameterDescriptor> = emptyList()
-    override fun getValueParameters(): List<ValueParameterDescriptor> = emptyList()
-
-    override fun getOriginal() = this
-
-    override fun substitute(substitutor: TypeSubstitutor): ValueParameterDescriptor =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun getReturnType(): KotlinType? = owner.type.toKotlinType()
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D) =
-        visitor!!.visitValueParameterDescriptor(this, data)!!
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitValueParameterDescriptor(this, null)
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedReceiverParameterDescriptor : ReceiverParameterDescriptor, WrappedCallableDescriptor<IrValueParameter>() {
-
-    override fun getValue(): ReceiverValue {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getContainingDeclaration(): DeclarationDescriptor =
-        (owner.parent as? IrFunction)?.descriptor ?: (owner.parent as IrClass).descriptor
-
-    override fun getType() = owner.type.toKotlinType()
-    override fun getName() = owner.name
-
-    override fun copy(newOwner: DeclarationDescriptor) = object : WrappedReceiverParameterDescriptor() {
-        override fun getContainingDeclaration() = newOwner
-    }.also { it.bind(owner) }
-
-    override fun getOverriddenDescriptors(): Collection<ValueParameterDescriptor> = emptyList()
-
-    override fun getOriginal() = this
-
-    override fun substitute(substitutor: TypeSubstitutor): ReceiverParameterDescriptor {
-        TODO("")
-    }
-
-    override fun getReturnType(): KotlinType? = owner.type.toKotlinType()
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D) =
-        visitor!!.visitReceiverParameterDescriptor(this, data)!!
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitReceiverParameterDescriptor(this, null)
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedTypeParameterDescriptor : TypeParameterDescriptor, WrappedDeclarationDescriptor<IrTypeParameter>() {
-    override fun getName() = owner.name
-
-    override fun isReified() = owner.isReified
-
-    override fun getVariance() = owner.variance
-
-    override fun getUpperBounds() = owner.superTypes.map { it.toKotlinType() }
-
-    private val _typeConstructor: TypeConstructor by lazy {
-        object : AbstractTypeConstructor(LockBasedStorageManager.NO_LOCKS) {
-            override fun computeSupertypes() = upperBounds
-
-            override val supertypeLoopChecker = SupertypeLoopChecker.EMPTY
-
-            override fun getParameters(): List<TypeParameterDescriptor> = emptyList()
-
-            override fun isFinal() = false
-
-            override fun isDenotable() = true
-
-            override fun getDeclarationDescriptor() = this@WrappedTypeParameterDescriptor
-
-            override fun getBuiltIns() = module.builtIns
-        }
-    }
-
-    override fun getTypeConstructor() = _typeConstructor
-
-    override fun getOriginal() = this
-
-    override fun getSource() = SourceElement.NO_SOURCE
-
-    override fun getIndex() = owner.index
-
-    override fun isCapturedFromOuterDeclaration() = false
-
-    private val _defaultType: SimpleType by lazy {
-        KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-            Annotations.EMPTY, typeConstructor, emptyList(), false,
-            LazyScopeAdapter {
-                TypeIntersectionScope.create(
-                    "Scope for type parameter " + name.asString(),
-                    upperBounds
-                )
-            }
-        )
-    }
-
-    override fun getDefaultType() = _defaultType
-
-    override fun getStorageManager() = LockBasedStorageManager.NO_LOCKS
-
-    override fun getContainingDeclaration() = (owner.parent as IrDeclaration).descriptor
-
-    override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
-        visitor!!.visitTypeParameterDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitTypeParameterDescriptor(this, null)
-    }
-
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedVariableDescriptor : VariableDescriptor, WrappedCallableDescriptor<IrVariable>() {
-
-    override fun getContainingDeclaration() = (owner.parent as IrDeclaration).descriptor
-    override fun getType() = owner.type.toKotlinType()
-    override fun getReturnType() = getType()
-    override fun getName() = owner.name
-    override fun isConst() = owner.isConst
-    override fun isVar() = owner.isVar
-    override fun isLateInit() = owner.isLateinit
-
-    override fun getCompileTimeInitializer(): ConstantValue<*>? {
-        TODO("")
-    }
-
-    override fun getOverriddenDescriptors(): Collection<VariableDescriptor> {
-        TODO("Not Implemented")
-    }
-
-    override fun getOriginal() = this
-
-    override fun substitute(substitutor: TypeSubstitutor): VariableDescriptor {
-        TODO("")
-    }
-
-    override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
-        visitor!!.visitVariableDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitVariableDescriptor(this, null)
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedVariableDescriptorWithAccessor : VariableDescriptorWithAccessors,
-    WrappedCallableDescriptor<IrLocalDelegatedProperty>() {
-    override fun getName(): Name = owner.name
-
-    override fun substitute(substitutor: TypeSubstitutor): VariableDescriptor {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun isVar() = owner.isVar
-
-    override fun getCompileTimeInitializer(): ConstantValue<*>? {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun getType(): KotlinType = owner.type.toKotlinType()
-
-    override fun isConst(): Boolean = false
-
-    override fun getContainingDeclaration() = (owner.parent as IrFunction).descriptor
-
-    override fun isLateInit(): Boolean = false
-
-    override val getter: VariableAccessorDescriptor?
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
-    override val setter: VariableAccessorDescriptor?
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
-    override val isDelegated: Boolean = true
-
-}
-
-// We make all wrapped function descriptors instances of DescriptorWithContainerSource, and use .parentClassId to
-// check whether declaration is deserialized. See IrInlineCodegen.descriptorIsDeserialized
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedSimpleFunctionDescriptor :
-    SimpleFunctionDescriptor, DescriptorWithContainerSource, WrappedCallableDescriptor<IrSimpleFunction>() {
-
-    override fun getOverriddenDescriptors() = owner.overriddenSymbols.map { it.descriptor }
-
-    override fun getContainingDeclaration(): DeclarationDescriptor = getContainingDeclaration(owner)
-
-    override fun getModality() = owner.modality
-    override fun getName() = owner.name
-    override fun getVisibility() = owner.visibility
-    override fun getReturnType() = owner.returnType.toKotlinType()
-
-    override fun getDispatchReceiverParameter() = owner.dispatchReceiverParameter?.run {
-        (containingDeclaration as ClassDescriptor).thisAsReceiverParameter
-    }
-
-    override fun getExtensionReceiverParameter() = owner.extensionReceiverParameter?.let {
-        if (it.isHidden) null else
-        it.descriptor as? ReceiverParameterDescriptor
-    }
-    override fun getTypeParameters() = owner.typeParameters.map { it.descriptor }
-    override fun getValueParameters() = owner.valueParameters
-        .asSequence()
-        .filter { !it.isHidden }
-        .mapNotNull { it.descriptor as? ValueParameterDescriptor }
-        .toMutableList()
-
-    override fun isExternal() = owner.isExternal
-    override fun isSuspend() = owner.isSuspend
-    override fun isTailrec() = owner.isTailrec
-    override fun isInline() = owner.isInline
-
-    override fun isExpect() = false
-    override fun isActual() = false
-    override fun isInfix() = false
-    override fun isOperator() = false
-
-    override val containerSource: DeserializedContainerSource?
-        get() = owner.containerSource
-
-    override fun getOriginal() = this
-    override fun substitute(substitutor: TypeSubstitutor): SimpleFunctionDescriptor {
-        TODO("")
-    }
-
-    override fun setOverriddenDescriptors(overriddenDescriptors: MutableCollection<out CallableMemberDescriptor>) {
-        TODO("not implemented")
-    }
-
-    override fun getKind() =
-        if (owner.origin == IrDeclarationOrigin.FAKE_OVERRIDE) CallableMemberDescriptor.Kind.FAKE_OVERRIDE
-        else CallableMemberDescriptor.Kind.SYNTHESIZED
-
-    override fun copy(
-            newOwner: DeclarationDescriptor?,
-            modality: Modality?,
-            visibility: DescriptorVisibility?,
-            kind: CallableMemberDescriptor.Kind?,
-            copyOverrides: Boolean
-    ): Nothing {
-        TODO("not implemented")
-    }
-
-    override fun isHiddenToOvercomeSignatureClash(): Boolean = false
-    override fun isHiddenForResolutionEverywhereBesideSupercalls(): Boolean = false
-
-    override fun getInitialSignatureDescriptor(): FunctionDescriptor? = null
-
-    override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
-
-    override fun newCopyBuilder(): FunctionDescriptor.CopyBuilder<out SimpleFunctionDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D) =
-        visitor!!.visitFunctionDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitFunctionDescriptor(this, null)
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedClassConstructorDescriptor : ClassConstructorDescriptor, WrappedCallableDescriptor<IrConstructor>() {
-    override fun getContainingDeclaration() = (owner.parent as IrClass).descriptor
-
-    override fun getDispatchReceiverParameter() = owner.dispatchReceiverParameter?.run {
-        (containingDeclaration.containingDeclaration as ClassDescriptor).thisAsReceiverParameter
-    }
-
-    override fun getTypeParameters() =
-        (owner.constructedClass.typeParameters + owner.typeParameters).map { it.descriptor }
-
-    override fun getValueParameters() = owner.valueParameters.asSequence()
-        .mapNotNull { it.descriptor as? ValueParameterDescriptor }
-        .toMutableList()
-
-    override fun getOriginal() = this
-
-    override fun substitute(substitutor: TypeSubstitutor): ClassConstructorDescriptor {
-        TODO("not implemented")
-    }
-
-    override fun copy(
-            newOwner: DeclarationDescriptor,
-            modality: Modality,
-            visibility: DescriptorVisibility,
-            kind: CallableMemberDescriptor.Kind,
-            copyOverrides: Boolean
-    ): ClassConstructorDescriptor {
-        throw UnsupportedOperationException()
-    }
-
-    override fun getModality() = Modality.FINAL
-
-
-    override fun setOverriddenDescriptors(overriddenDescriptors: MutableCollection<out CallableMemberDescriptor>) {
-        TODO("not implemented")
-    }
-
-    override fun getKind() = CallableMemberDescriptor.Kind.SYNTHESIZED
-
-    override fun getConstructedClass() = (owner.parent as IrClass).descriptor
-
-    override fun getName() = owner.name
-
-    override fun getOverriddenDescriptors(): MutableCollection<out FunctionDescriptor> = mutableListOf()
-
-    override fun getInitialSignatureDescriptor(): FunctionDescriptor? = null
-
-    override fun getVisibility() = owner.visibility
-
-    override fun isHiddenToOvercomeSignatureClash(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun isOperator() = false
-
-    override fun isInline() = owner.isInline
-
-    override fun isHiddenForResolutionEverywhereBesideSupercalls(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun getReturnType() = owner.returnType.toKotlinType()
-
-    override fun isPrimary() = owner.isPrimary
-
-    override fun isExpect() = false
-
-    override fun isTailrec() = false
-
-    override fun isActual() = false
-
-    override fun isInfix() = false
-
-    override fun isSuspend() = false
-
-    override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
-
-    override fun isExternal() = owner.isExternal
-
-    override fun newCopyBuilder(): FunctionDescriptor.CopyBuilder<out FunctionDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
-        visitor!!.visitConstructorDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitConstructorDescriptor(this, null)
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedClassDescriptor : ClassDescriptor, WrappedDeclarationDescriptor<IrClass>() {
-    override fun getName() = owner.name
-
-    override fun getMemberScope(typeArguments: MutableList<out TypeProjection>) = MemberScope.Empty
-
-    override fun getMemberScope(typeSubstitution: TypeSubstitution) = MemberScope.Empty
-
-    override fun getUnsubstitutedMemberScope() = MemberScope.Empty
-
-    override fun getUnsubstitutedInnerClassesScope() = MemberScope.Empty
-
-    override fun getStaticScope() = MemberScope.Empty
-
-    override fun getConstructors() =
-        owner.declarations.filterIsInstance<IrConstructor>().filter { !it.origin.isSynthetic }.map { it.descriptor }.toList()
-
-    override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
-
-    private val _defaultType: SimpleType by lazy {
-        TypeUtils.makeUnsubstitutedType(this, unsubstitutedMemberScope, KotlinTypeFactory.EMPTY_REFINED_TYPE_FACTORY)
-    }
-
-    override fun getDefaultType(): SimpleType = _defaultType
-
-    override fun getKind() = owner.kind
-
-    override fun getModality() = owner.modality
-
-    override fun getCompanionObjectDescriptor() = owner.declarations.filterIsInstance<IrClass>().firstOrNull { it.isCompanion }?.descriptor
-
-    override fun getVisibility() = owner.visibility
-
-    override fun isCompanionObject() = owner.isCompanion
-
-    override fun isData() = owner.isData
-
-    override fun isInline() = owner.isInline
-
-    override fun isFun() = owner.isFun
-
-    override fun isValue() = owner.isInline
-
-    override fun getThisAsReceiverParameter() = owner.thisReceiver?.descriptor as ReceiverParameterDescriptor
-
-    override fun getUnsubstitutedPrimaryConstructor() =
-        owner.declarations.filterIsInstance<IrConstructor>().singleOrNull { it.isPrimary }?.descriptor
-
-    override fun getDeclaredTypeParameters() = owner.typeParameters.map { it.descriptor }
-
-    override fun getSealedSubclasses(): Collection<ClassDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun getOriginal() = this
-
-    override fun isExpect() = false
-
-    override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun isActual() = false
-
-    private val _typeConstructor: TypeConstructor by lazy {
-        LazyTypeConstructor(
-            this,
-            ::collectTypeParameters,
-            { owner.superTypes.map { it.toKotlinType() } },
-            LockBasedStorageManager.NO_LOCKS
-        )
-    }
-
-    private fun collectTypeParameters(): List<TypeParameterDescriptor> =
-        owner.typeConstructorParameters
-            .map { it.descriptor }
-            .toList()
-
-    override fun getTypeConstructor(): TypeConstructor = _typeConstructor
-
-    override fun isInner() = owner.isInner
-
-    override fun isExternal() = owner.isExternal
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
-        visitor!!.visitClassDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitClassDescriptor(this, null)
-    }
-
-    override fun getDefaultFunctionTypeForSamInterface(): SimpleType? {
-        TODO("not implemented")
-    }
-
-    override fun isDefinitelyNotSamInterface(): Boolean {
-        return owner.descriptor.isDefinitelyNotSamInterface
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedScriptDescriptor : ScriptDescriptor, WrappedDeclarationDescriptor<IrScript>() {
-    override fun getName() = owner.name
-
-    override fun getMemberScope(typeArguments: MutableList<out TypeProjection>) = MemberScope.Empty
-
-    override fun getMemberScope(typeSubstitution: TypeSubstitution) = MemberScope.Empty
-
-    override fun getUnsubstitutedMemberScope() = MemberScope.Empty
-
-    override fun getUnsubstitutedInnerClassesScope() = MemberScope.Empty
-
-    override fun getStaticScope() = MemberScope.Empty
-
-    override fun getSource(): SourceElement = SourceElement.NO_SOURCE
-
-    override fun getConstructors() =
-        owner.statements.filterIsInstance<IrConstructor>().filter { !it.origin.isSynthetic }.map { it.descriptor }.toList()
-
-    override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
-
-    private val _defaultType: SimpleType by lazy {
-        TypeUtils.makeUnsubstitutedType(this, unsubstitutedMemberScope, KotlinTypeFactory.EMPTY_REFINED_TYPE_FACTORY)
-    }
-
-    override fun getDefaultType(): SimpleType = _defaultType
-
-    override fun getKind() = TODO()
-
-    override fun getModality() = TODO()
-
-    override fun getCompanionObjectDescriptor() = owner.statements.filterIsInstance<IrClass>().firstOrNull { it.isCompanion }?.descriptor
-
-    override fun getVisibility() = TODO()
-
-    override fun isCompanionObject() = false
-
-    override fun isData() = false
-
-    override fun isInline() = false
-
-    override fun isFun() = false
-
-    override fun isValue() = false
-
-    override fun getThisAsReceiverParameter() = owner.thisReceiver.descriptor as ReceiverParameterDescriptor
-
-    override fun getUnsubstitutedPrimaryConstructor() = TODO()
-
-    override fun getDeclaredTypeParameters() = TODO()
-
-    override fun getSealedSubclasses(): Collection<ClassDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun getOriginal() = this
-
-    override fun isExpect() = false
-
-    override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun isInner(): Boolean {
-        TODO("Not yet implemented")
-    }
-
-    override fun isActual() = false
-
-    override fun isExternal(): Boolean {
-        TODO("Not yet implemented")
-    }
-
-    override fun getTypeConstructor(): TypeConstructor = TODO()
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
-        visitor!!.visitClassDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitClassDescriptor(this, null)
-    }
-
-    override fun getDefaultFunctionTypeForSamInterface(): SimpleType? {
-        TODO("not yet implemented")
-    }
-
-    override fun isDefinitelyNotSamInterface(): Boolean {
-        TODO("Not yet implemented")
-    }
-
-    override fun getPriority(): Int {
-        TODO("Not yet implemented")
-    }
-
-    override fun getExplicitConstructorParameters(): MutableList<ValueParameterDescriptor> {
-        TODO("Not yet implemented")
-    }
-
-    override fun getImplicitReceiversParameters(): MutableList<ValueParameterDescriptor> {
-        TODO("Not yet implemented")
-    }
-
-    override fun getScriptProvidedPropertiesParameters(): MutableList<ValueParameterDescriptor> {
-        TODO("Not yet implemented")
-    }
-
-    override fun getImplicitReceivers(): MutableList<ClassDescriptor> {
-        TODO("Not yet implemented")
-    }
-
-    override fun getScriptProvidedProperties(): MutableList<PropertyDescriptor> {
-        TODO("Not yet implemented")
-    }
-
-    override fun getResultValue(): PropertyDescriptor? {
-        TODO("Not yet implemented")
-    }
-}
-
-class LazyTypeConstructor(
-    val classDescriptor: ClassDescriptor,
-    val parametersBuilder: () -> List<TypeParameterDescriptor>,
-    val superTypesBuilder: () -> List<KotlinType>,
-    storageManager: StorageManager
-) : AbstractClassTypeConstructor(storageManager) {
-    val parameters_ by lazy { parametersBuilder() }
-    val superTypes_ by lazy { superTypesBuilder() }
-
-    override fun getParameters() = parameters_
-
-    override fun computeSupertypes() = superTypes_
-
-    override fun isDenotable() = true
-
-    override fun getDeclarationDescriptor() = classDescriptor
-
-    override val supertypeLoopChecker: SupertypeLoopChecker
-        get() = SupertypeLoopChecker.EMPTY
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedEnumEntryDescriptor : ClassDescriptor, WrappedDeclarationDescriptor<IrEnumEntry>() {
-    override fun getName() = owner.name
-
-    override fun getMemberScope(typeArguments: MutableList<out TypeProjection>) = MemberScope.Empty
-
-    override fun getMemberScope(typeSubstitution: TypeSubstitution) = MemberScope.Empty
-
-    override fun getUnsubstitutedMemberScope() = MemberScope.Empty
-
-    override fun getUnsubstitutedInnerClassesScope() = MemberScope.Empty
-
-    override fun getStaticScope() = MemberScope.Empty
-
-    override fun getSource() = SourceElement.NO_SOURCE
-
-    override fun getConstructors() =
-        getCorrespondingClass().declarations.asSequence().filterIsInstance<IrConstructor>().map { it.descriptor }.toList()
-
-    private fun getCorrespondingClass() = owner.correspondingClass ?: (owner.parent as IrClass)
-
-    override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
-
-
-    private val _defaultType: SimpleType by lazy {
-        TypeUtils.makeUnsubstitutedType(this, unsubstitutedMemberScope, KotlinTypeFactory.EMPTY_REFINED_TYPE_FACTORY)
-    }
-
-    override fun getDefaultType(): SimpleType = _defaultType
-
-    override fun getKind() = ClassKind.ENUM_ENTRY
-
-    override fun getModality() = Modality.FINAL
-
-    override fun getCompanionObjectDescriptor() = null
-
-    override fun getVisibility() = DescriptorVisibilities.DEFAULT_VISIBILITY
-
-    override fun isCompanionObject() = false
-
-    override fun isData() = false
-
-    override fun isInline() = false
-
-    override fun isFun() = false
-
-    override fun isValue() = false
-
-    override fun getThisAsReceiverParameter() = (owner.parent as IrClass).descriptor.thisAsReceiverParameter
-
-    override fun getUnsubstitutedPrimaryConstructor(): ClassConstructorDescriptor? {
-        TODO("not implemented")
-    }
-
-    override fun getDeclaredTypeParameters(): List<TypeParameterDescriptor> = emptyList()
-
-    override fun getSealedSubclasses(): Collection<ClassDescriptor> {
-        TODO("not implemented")
-    }
-
-    override fun getOriginal() = this
-
-    override fun isExpect() = false
-
-    override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun isActual() = false
-
-    private val _typeConstructor: TypeConstructor by lazy {
-        ClassTypeConstructorImpl(
-            this,
-            emptyList(),
-            getCorrespondingClass().superTypes.map { it.toKotlinType() },
-            LockBasedStorageManager.NO_LOCKS
-        )
-    }
-
-    override fun getTypeConstructor(): TypeConstructor = _typeConstructor
-
-    override fun isInner() = false
-
-    override fun isExternal() = false
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R =
-        visitor!!.visitClassDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitClassDescriptor(this, null)
-    }
-
-    override fun getDefaultFunctionTypeForSamInterface(): SimpleType? = null
-
-    override fun isDefinitelyNotSamInterface() = true
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedPropertyDescriptor :
-    PropertyDescriptor, DescriptorWithContainerSource, WrappedDeclarationDescriptor<IrProperty>() {
-    override fun getModality() = owner.modality
-
-    override fun setOverriddenDescriptors(overriddenDescriptors: MutableCollection<out CallableMemberDescriptor>) {
-        TODO("not implemented")
-    }
-
-    override fun getKind() = CallableMemberDescriptor.Kind.SYNTHESIZED
-
-    override fun getName() = owner.name
-
-    override fun getSource() = SourceElement.NO_SOURCE
-
-    override fun hasSynthesizedParameterNames(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun getOverriddenDescriptors(): MutableCollection<out PropertyDescriptor> = mutableListOf()
-
-    override fun copy(
-            newOwner: DeclarationDescriptor?,
-            modality: Modality?,
-            visibility: DescriptorVisibility?,
-            kind: CallableMemberDescriptor.Kind?,
-            copyOverrides: Boolean
-    ): CallableMemberDescriptor {
-        TODO("not implemented")
-    }
-
-    override fun getValueParameters(): MutableList<ValueParameterDescriptor> = mutableListOf()
-
-    override fun getCompileTimeInitializer(): ConstantValue<*>? {
-        return null
-    }
-
-    override fun isSetterProjectedOut(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun getAccessors(): List<PropertyAccessorDescriptor> = listOfNotNull(getter, setter)
-
-    override fun getTypeParameters(): List<TypeParameterDescriptor> = getter?.typeParameters.orEmpty()
-
-    override fun getVisibility() = owner.visibility
-
-    override val setter: PropertySetterDescriptor? get() = owner.setter?.descriptor as? PropertySetterDescriptor
-
-    override val containerSource: DeserializedContainerSource?
-        get() = owner.containerSource
-
-    override fun getOriginal() = this
-
-    override fun isExpect() = false
-
-    override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun isActual() = false
-
-    override fun getReturnType() = (owner.getter?.returnType ?: owner.backingField?.type!!).toKotlinType()
-
-    override fun hasStableParameterNames() = false
-
-    override fun getType(): KotlinType = returnType
-
-    override fun isVar() = owner.isVar
-
-    override fun getDispatchReceiverParameter() = owner.getter?.dispatchReceiverParameter?.descriptor as? ReceiverParameterDescriptor
-
-    override fun isConst() = owner.isConst
-
-    override fun getContainingDeclaration(): DeclarationDescriptor = getContainingDeclaration(owner)
-
-    override fun isLateInit() = owner.isLateinit
-
-    override fun getExtensionReceiverParameter() = owner.getter?.extensionReceiverParameter?.descriptor as? ReceiverParameterDescriptor
-
-    override fun isExternal() = owner.isExternal
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D) =
-        visitor!!.visitPropertyDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitPropertyDescriptor(this, null)
-    }
-
-    override val getter: PropertyGetterDescriptor? get() = owner.getter?.descriptor as? PropertyGetterDescriptor
-
-    override fun newCopyBuilder(): CallableMemberDescriptor.CopyBuilder<out PropertyDescriptor> {
-        TODO("not implemented")
-    }
-
-    override val isDelegated get() = owner.isDelegated
-
-    override fun getBackingField(): FieldDescriptor? {
-        TODO("not implemented")
-    }
-
-    override fun getDelegateField(): FieldDescriptor? {
-        TODO("not implemented")
-    }
-
-    override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-abstract class WrappedPropertyAccessorDescriptor : WrappedSimpleFunctionDescriptor(), PropertyAccessorDescriptor {
-    override fun isDefault(): Boolean = false
-
-    override fun getOriginal(): WrappedPropertyAccessorDescriptor = this
-
-    override fun getOverriddenDescriptors() = super.getOverriddenDescriptors().map { it as PropertyAccessorDescriptor }
-
-    override fun getCorrespondingProperty(): PropertyDescriptor = owner.correspondingPropertySymbol!!.descriptor
-
-    override val correspondingVariable: VariableDescriptorWithAccessors get() = correspondingProperty
-}
-
-class WrappedPropertyGetterDescriptor :
-    WrappedPropertyAccessorDescriptor(), PropertyGetterDescriptor {
-    override fun getOverriddenDescriptors() = super.getOverriddenDescriptors().map { it as PropertyGetterDescriptor }
-
-    override fun getOriginal(): WrappedPropertyGetterDescriptor = this
-}
-
-class WrappedPropertySetterDescriptor :
-    WrappedPropertyAccessorDescriptor(), PropertySetterDescriptor {
-    override fun getOverriddenDescriptors() = super.getOverriddenDescriptors().map { it as PropertySetterDescriptor }
-
-    override fun getOriginal(): WrappedPropertySetterDescriptor = this
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedTypeAliasDescriptor : WrappedDeclarationDescriptor<IrTypeAlias>(), TypeAliasDescriptor {
-
-    override val underlyingType: SimpleType
-        get() = throw UnsupportedOperationException("Unexpected use of WrappedTypeAliasDescriptor $this")
-
-    override val constructors: Collection<TypeAliasConstructorDescriptor>
-        get() = throw UnsupportedOperationException("Unexpected use of WrappedTypeAliasDescriptor $this")
-
-    override fun substitute(substitutor: TypeSubstitutor): ClassifierDescriptorWithTypeParameters =
-        throw UnsupportedOperationException("Wrapped descriptors should not be substituted")
-
-    override fun getDefaultType(): SimpleType =
-        throw UnsupportedOperationException("Unexpected use of WrappedTypeAliasDescriptor $this")
-
-    override fun getTypeConstructor(): TypeConstructor =
-        throw UnsupportedOperationException("Unexpected use of WrappedTypeAliasDescriptor $this")
-
-    override val expandedType: SimpleType
-        get() = owner.expandedType.toKotlinType() as SimpleType
-
-    override val classDescriptor: ClassDescriptor?
-        get() = expandedType.constructor.declarationDescriptor as ClassDescriptor?
-
-    override fun getOriginal(): TypeAliasDescriptor = this
-
-    override fun isInner(): Boolean = false
-
-    override fun getDeclaredTypeParameters(): List<TypeParameterDescriptor> = owner.typeParameters.map { it.descriptor }
-
-    override fun getContainingDeclaration(): DeclarationDescriptor = getContainingDeclaration(owner)
-
-    override fun getName(): Name = owner.name
-
-    override fun getModality(): Modality = Modality.FINAL
-
-    override fun getSource(): SourceElement = SourceElement.NO_SOURCE
-
-    override fun getVisibility(): DescriptorVisibility = owner.visibility
-
-    override fun isExpect(): Boolean = false
-
-    override fun isActual(): Boolean = owner.isActual
-
-    override fun isExternal(): Boolean = false
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R =
-        visitor.visitTypeAliasDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>) {
-        visitor.visitTypeAliasDescriptor(this, null)
-    }
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-open class WrappedFieldDescriptor : PropertyDescriptor, WrappedDeclarationDescriptor<IrField>() {
-    override fun getModality() = if (owner.isFinal) Modality.FINAL else Modality.OPEN
-
-    override fun setOverriddenDescriptors(overriddenDescriptors: MutableCollection<out CallableMemberDescriptor>) {
-        TODO("not implemented")
-    }
-
-    override fun getKind() = CallableMemberDescriptor.Kind.SYNTHESIZED
-
-    override fun getName() = owner.name
-
-    override fun getSource() = SourceElement.NO_SOURCE
-
-    override fun hasSynthesizedParameterNames() = false
-
-    override fun getOverriddenDescriptors(): MutableCollection<out PropertyDescriptor> = mutableListOf()
-
-    override fun copy(
-            newOwner: DeclarationDescriptor?,
-            modality: Modality?,
-            visibility: DescriptorVisibility?,
-            kind: CallableMemberDescriptor.Kind?,
-            copyOverrides: Boolean
-    ): CallableMemberDescriptor {
-        TODO("not implemented")
-    }
-
-    override fun getValueParameters(): MutableList<ValueParameterDescriptor> = mutableListOf()
-
-    override fun getCompileTimeInitializer(): ConstantValue<*>? {
-        TODO("not implemented")
-    }
-
-    override fun isSetterProjectedOut(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun getAccessors(): MutableList<PropertyAccessorDescriptor> = mutableListOf()
-
-    override fun getTypeParameters(): List<TypeParameterDescriptor> = emptyList()
-
-    override fun getVisibility() = owner.visibility
-
-    override val setter: PropertySetterDescriptor? get() = null
-
-    override fun getOriginal() = this
-
-    override fun isExpect() = false
-
-    override fun substitute(substitutor: TypeSubstitutor): PropertyDescriptor =
-        throw UnsupportedOperationException("Wrapped descriptors SHOULD NOT be substituted")
-
-    override fun isActual() = false
-
-    override fun getReturnType() = owner.type.toKotlinType()
-
-    override fun hasStableParameterNames(): Boolean {
-        TODO("not implemented")
-    }
-
-    override fun getType(): KotlinType = owner.type.toKotlinType()
-
-    override fun isVar() = !owner.isFinal
-
-    override fun getDispatchReceiverParameter(): ReceiverParameterDescriptor? =
-        if (owner.isStatic) null else (owner.parentAsClass.thisReceiver?.descriptor as ReceiverParameterDescriptor)
-
-    override fun isConst() = false
-
-    override fun getContainingDeclaration() = (owner.parent as IrSymbolOwner).symbol.descriptor
-
-    override fun isLateInit() = owner.correspondingPropertySymbol?.owner?.isLateinit ?: false
-
-    override fun getExtensionReceiverParameter(): ReceiverParameterDescriptor? =
-        owner.correspondingPropertySymbol?.owner?.descriptor?.extensionReceiverParameter
-
-    override fun isExternal() = owner.isExternal
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D) =
-        visitor!!.visitPropertyDescriptor(this, data)
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-        visitor!!.visitPropertyDescriptor(this, null)
-    }
-
-    override val getter: PropertyGetterDescriptor? get() = null
-
-    override fun newCopyBuilder(): CallableMemberDescriptor.CopyBuilder<out PropertyDescriptor> {
-        TODO("not implemented")
-    }
-
-    override val isDelegated get() = false
-
-    // Following functions are used in error reporting when rendering annotations on properties
-    override fun getBackingField(): FieldDescriptor? = null // TODO
-    override fun getDelegateField(): FieldDescriptor? = null // TODO
-
-    override fun <V : Any?> getUserData(key: CallableDescriptor.UserDataKey<V>?): V? = null
-}
-
-class WrappedErrorDescriptor : WrappedDeclarationDescriptor<IrErrorDeclaration>() {
-    override fun getName(): Name = error("WrappedErrorDescriptor.getName: Should not be reached")
-
-    override fun getOriginal(): DeclarationDescriptorWithSource =
-        error("WrappedErrorDescriptor.getOriginal: Should not be reached")
-
-    override fun getContainingDeclaration(): DeclarationDescriptor? =
-        error("WrappedErrorDescriptor.getContainingDeclaration: Should not be reached")
-
-    override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>?, data: D): R {
-        error("WrappedErrorDescriptor.accept: Should not be reached")
-    }
-
-    override fun acceptVoid(visitor: DeclarationDescriptorVisitor<Void, Void>?) {
-    }
-
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-private fun getContainingDeclaration(declaration: IrDeclarationWithName): DeclarationDescriptor {
-    val parent = declaration.parent
-    val parentDescriptor = (parent as IrSymbolOwner).symbol.descriptor
-    return if (parent is IrClass && parent.isFileClass) {
-        // JVM IR adds facade classes for IR of functions/properties loaded both from sources and dependencies. However, these shouldn't
-        // exist in the descriptor hierarchy, since this is what the old backend (dealing with descriptors) expects.
-        parentDescriptor.containingDeclaration!!
-    } else {
-        parentDescriptor
-    }
-}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt
index 900d01cd71c..fbb17c200f8 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/overrides/DeepCopyIrTreeWithSymbolsForFakeOverrides.kt
@@ -5,8 +5,6 @@
 
 package org.jetbrains.kotlin.ir.overrides
 
-import org.jetbrains.kotlin.ir.util.DescriptorsToIrRemapper
-import org.jetbrains.kotlin.ir.util.WrappedDescriptorPatcher
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrTypeParametersContainer
@@ -30,9 +28,6 @@ class DeepCopyIrTreeWithSymbolsForFakeOverrides(typeArguments: Map<IrTypeParamet
         // Copy IR.
         val result = irElement.transform(copier, data = null)
 
-        // Bind newly created IR with wrapped descriptors.
-        result.acceptVoid(WrappedDescriptorPatcher)
-
         result.patchDeclarationParents(parent)
         return result
     }
@@ -92,7 +87,7 @@ class DeepCopyIrTreeWithSymbolsForFakeOverrides(typeArguments: Map<IrTypeParamet
     private val symbolRemapper =
         FakeOverrideSymbolRemapperImpl(
             typeArguments,
-            DescriptorsToIrRemapper
+            NullDescriptorsRemapper
         )
     private val copier = FakeOverrideCopier(
         symbolRemapper,
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrDelegatingSymbol.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrDelegatingSymbol.kt
index a1cb38d2734..99f7ce03764 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrDelegatingSymbol.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrDelegatingSymbol.kt
@@ -17,6 +17,10 @@ abstract class IrDelegatingSymbol<S : IrBindableSymbol<D, B>, B : IrSymbolOwner,
     @ObsoleteDescriptorBasedAPI
     override val descriptor: D get() = delegate.descriptor
 
+    @ObsoleteDescriptorBasedAPI
+    override val hasDescriptor: Boolean
+        get() = delegate.hasDescriptor
+
     override val isBound: Boolean get() = delegate.isBound
 
     override val signature: IdSignature?
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
index d11dfe3230b..39e1f5de9b1 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt
@@ -30,6 +30,9 @@ interface IrSymbol {
     @ObsoleteDescriptorBasedAPI
     val descriptor: DeclarationDescriptor
 
+    @ObsoleteDescriptorBasedAPI
+    val hasDescriptor: Boolean
+
     val isBound: Boolean
 
     val signature: IdSignature?
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/DescriptorlessExternalPackageFragmentSymbol.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/DescriptorlessExternalPackageFragmentSymbol.kt
index 624ab90b7fc..1467239cce1 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/DescriptorlessExternalPackageFragmentSymbol.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/DescriptorlessExternalPackageFragmentSymbol.kt
@@ -16,6 +16,9 @@ class DescriptorlessExternalPackageFragmentSymbol : IrExternalPackageFragmentSym
     override val descriptor: PackageFragmentDescriptor
         get() = error("Operation is unsupported")
 
+    override val hasDescriptor: Boolean
+        get() = error("Operation is unsupported")
+
     private var _owner: IrExternalPackageFragment? = null
     override val owner get() = _owner!!
 
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
index 1edb264ed7e..ad023bbf91d 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPrivateSymbolBase.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.ir.symbols.impl
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.util.IdSignature
@@ -27,23 +27,31 @@ import org.jetbrains.kotlin.ir.util.render
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 abstract class IrSymbolBase<out D : DeclarationDescriptor>(
-    @ObsoleteDescriptorBasedAPI
-    override val descriptor: D
+    private val _descriptor: D?
 ) : IrSymbol {
+    @ObsoleteDescriptorBasedAPI
+    @Suppress("UNCHECKED_CAST")
+    override val descriptor: D
+        get() = _descriptor ?: (owner as IrDeclaration).toIrBasedDescriptor() as D
+
+    @ObsoleteDescriptorBasedAPI
+    override val hasDescriptor: Boolean
+        get() = _descriptor != null
+
     override fun toString(): String {
         if (isBound) return owner.render()
         return "Unbound private symbol ${super.toString()}"
     }
 }
 
-abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolOwner>(descriptor: D) :
+abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolOwner>(descriptor: D?) :
     IrBindableSymbol<D, B>, IrSymbolBase<D>(descriptor) {
 
     init {
-        assert(isOriginalDescriptor(descriptor)) {
-            "Substituted descriptor $descriptor for ${descriptor.original}"
+        assert(descriptor == null || isOriginalDescriptor(descriptor)) {
+            "Substituted descriptor $descriptor for ${descriptor!!.original}"
         }
-        if (descriptor !is WrappedDeclarationDescriptor<*>) {
+        if (descriptor != null) {
             val containingDeclaration = descriptor.containingDeclaration
             assert(containingDeclaration == null || isOriginalDescriptor(containingDeclaration)) {
                 "Substituted containing declaration: $containingDeclaration\nfor descriptor: $descriptor"
@@ -52,9 +60,8 @@ abstract class IrBindableSymbolBase<out D : DeclarationDescriptor, B : IrSymbolO
     }
 
     private fun isOriginalDescriptor(descriptor: DeclarationDescriptor): Boolean =
-        descriptor is WrappedDeclarationDescriptor<*> ||
-                // TODO fix declaring/referencing value parameters: compute proper original descriptor
-                descriptor is ValueParameterDescriptor && isOriginalDescriptor(descriptor.containingDeclaration) ||
+        // TODO fix declaring/referencing value parameters: compute proper original descriptor
+        descriptor is ValueParameterDescriptor && isOriginalDescriptor(descriptor.containingDeclaration) ||
                 descriptor == descriptor.original
 
     private var _owner: B? = null
@@ -85,59 +92,59 @@ class IrExternalPackageFragmentSymbolImpl(descriptor: PackageFragmentDescriptor)
     IrExternalPackageFragmentSymbol
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
-class IrAnonymousInitializerSymbolImpl(descriptor: ClassDescriptor) :
+class IrAnonymousInitializerSymbolImpl(descriptor: ClassDescriptor? = null) :
     IrBindableSymbolBase<ClassDescriptor, IrAnonymousInitializer>(descriptor),
     IrAnonymousInitializerSymbol {
     constructor(irClassSymbol: IrClassSymbol) : this(irClassSymbol.descriptor)
 }
 
-class IrClassSymbolImpl(descriptor: ClassDescriptor) :
+class IrClassSymbolImpl(descriptor: ClassDescriptor? = null) :
     IrBindableSymbolBase<ClassDescriptor, IrClass>(descriptor),
     IrClassSymbol
 
-class IrEnumEntrySymbolImpl(descriptor: ClassDescriptor) :
+class IrEnumEntrySymbolImpl(descriptor: ClassDescriptor? = null) :
     IrBindableSymbolBase<ClassDescriptor, IrEnumEntry>(descriptor),
     IrEnumEntrySymbol
 
-class IrFieldSymbolImpl(descriptor: PropertyDescriptor) :
+class IrFieldSymbolImpl(descriptor: PropertyDescriptor? = null) :
     IrBindableSymbolBase<PropertyDescriptor, IrField>(descriptor),
     IrFieldSymbol
 
-class IrTypeParameterSymbolImpl(descriptor: TypeParameterDescriptor) :
+class IrTypeParameterSymbolImpl(descriptor: TypeParameterDescriptor? = null) :
     IrBindableSymbolBase<TypeParameterDescriptor, IrTypeParameter>(descriptor),
     IrTypeParameterSymbol
 
-class IrValueParameterSymbolImpl(descriptor: ParameterDescriptor) :
+class IrValueParameterSymbolImpl(descriptor: ParameterDescriptor? = null) :
     IrBindableSymbolBase<ParameterDescriptor, IrValueParameter>(descriptor),
     IrValueParameterSymbol
 
-class IrVariableSymbolImpl(descriptor: VariableDescriptor) :
+class IrVariableSymbolImpl(descriptor: VariableDescriptor? = null) :
     IrBindableSymbolBase<VariableDescriptor, IrVariable>(descriptor),
     IrVariableSymbol
 
-class IrSimpleFunctionSymbolImpl(descriptor: FunctionDescriptor) :
+class IrSimpleFunctionSymbolImpl(descriptor: FunctionDescriptor? = null) :
     IrBindableSymbolBase<FunctionDescriptor, IrSimpleFunction>(descriptor),
     IrSimpleFunctionSymbol
 
-class IrConstructorSymbolImpl(descriptor: ClassConstructorDescriptor) :
+class IrConstructorSymbolImpl(descriptor: ClassConstructorDescriptor? = null) :
     IrBindableSymbolBase<ClassConstructorDescriptor, IrConstructor>(descriptor),
     IrConstructorSymbol
 
-class IrReturnableBlockSymbolImpl(descriptor: FunctionDescriptor) :
+class IrReturnableBlockSymbolImpl(descriptor: FunctionDescriptor? = null) :
     IrBindableSymbolBase<FunctionDescriptor, IrReturnableBlock>(descriptor),
     IrReturnableBlockSymbol
 
-class IrPropertySymbolImpl(descriptor: PropertyDescriptor) :
+class IrPropertySymbolImpl(descriptor: PropertyDescriptor? = null) :
     IrBindableSymbolBase<PropertyDescriptor, IrProperty>(descriptor),
     IrPropertySymbol
 
-class IrLocalDelegatedPropertySymbolImpl(descriptor: VariableDescriptorWithAccessors) :
+class IrLocalDelegatedPropertySymbolImpl(descriptor: VariableDescriptorWithAccessors? = null) :
     IrBindableSymbolBase<VariableDescriptorWithAccessors, IrLocalDelegatedProperty>(descriptor),
     IrLocalDelegatedPropertySymbol
 
-class IrTypeAliasSymbolImpl(descriptor: TypeAliasDescriptor) :
+class IrTypeAliasSymbolImpl(descriptor: TypeAliasDescriptor? = null) :
     IrBindableSymbolBase<TypeAliasDescriptor, IrTypeAlias>(descriptor),
     IrTypeAliasSymbol
 
-class IrScriptSymbolImpl(descriptor: ScriptDescriptor) :
+class IrScriptSymbolImpl(descriptor: ScriptDescriptor? = null) :
     IrScriptSymbol, IrBindableSymbolBase<ScriptDescriptor, IrScript>(descriptor)
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
index db54edf7a70..1c842fbf547 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt
@@ -8,36 +8,43 @@ package org.jetbrains.kotlin.ir.symbols.impl
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
+import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.render
 
 abstract class IrPublicSymbolBase<out D : DeclarationDescriptor> @OptIn(ObsoleteDescriptorBasedAPI::class) constructor(
-    @ObsoleteDescriptorBasedAPI
-    override val descriptor: D,
-    override val signature: IdSignature
+    override val signature: IdSignature,
+    private val _descriptor: D?
 ) : IrSymbol {
+    @ObsoleteDescriptorBasedAPI
+    @Suppress("UNCHECKED_CAST")
+    override val descriptor: D
+        get() = _descriptor ?: (owner as IrDeclaration).toIrBasedDescriptor() as D
+
+    @ObsoleteDescriptorBasedAPI
+    override val hasDescriptor: Boolean
+        get() = _descriptor != null
+
     override fun toString(): String {
         if (isBound) return owner.render()
         return "Unbound public symbol for $signature"
     }
 }
 
-abstract class IrBindablePublicSymbolBase<out D : DeclarationDescriptor, B : IrSymbolOwner>(descriptor: D, sig: IdSignature) :
-    IrBindableSymbol<D, B>, IrPublicSymbolBase<D>(descriptor, sig) {
+abstract class IrBindablePublicSymbolBase<out D : DeclarationDescriptor, B : IrSymbolOwner>(sig: IdSignature, descriptor: D?) :
+    IrBindableSymbol<D, B>, IrPublicSymbolBase<D>(sig, descriptor) {
 
     init {
-        assert(isOriginalDescriptor(descriptor)) {
-            "Substituted descriptor $descriptor for ${descriptor.original}"
+        assert(descriptor == null || isOriginalDescriptor(descriptor)) {
+            "Substituted descriptor $descriptor for ${descriptor!!.original}"
         }
         assert(sig.isPublic)
     }
 
     private fun isOriginalDescriptor(descriptor: DeclarationDescriptor): Boolean =
-        descriptor is WrappedDeclarationDescriptor<*> ||
-                // TODO fix declaring/referencing value parameters: compute proper original descriptor
-                descriptor is ValueParameterDescriptor && isOriginalDescriptor(descriptor.containingDeclaration) ||
+        // TODO fix declaring/referencing value parameters: compute proper original descriptor
+        descriptor is ValueParameterDescriptor && isOriginalDescriptor(descriptor.containingDeclaration) ||
                 descriptor == descriptor.original
 
     private var _owner: B? = null
@@ -56,26 +63,26 @@ abstract class IrBindablePublicSymbolBase<out D : DeclarationDescriptor, B : IrS
         get() = _owner != null
 }
 
-class IrClassPublicSymbolImpl(descriptor: ClassDescriptor, sig: IdSignature) :
-    IrBindablePublicSymbolBase<ClassDescriptor, IrClass>(descriptor, sig),
+class IrClassPublicSymbolImpl(sig: IdSignature, descriptor: ClassDescriptor? = null) :
+    IrBindablePublicSymbolBase<ClassDescriptor, IrClass>(sig, descriptor),
     IrClassSymbol
 
-class IrEnumEntryPublicSymbolImpl(descriptor: ClassDescriptor, sig: IdSignature) :
-    IrBindablePublicSymbolBase<ClassDescriptor, IrEnumEntry>(descriptor, sig),
+class IrEnumEntryPublicSymbolImpl(sig: IdSignature, descriptor: ClassDescriptor? = null) :
+    IrBindablePublicSymbolBase<ClassDescriptor, IrEnumEntry>(sig, descriptor),
     IrEnumEntrySymbol
 
-class IrSimpleFunctionPublicSymbolImpl(descriptor: FunctionDescriptor, sig: IdSignature) :
-    IrBindablePublicSymbolBase<FunctionDescriptor, IrSimpleFunction>(descriptor, sig),
+class IrSimpleFunctionPublicSymbolImpl(sig: IdSignature, descriptor: FunctionDescriptor? = null) :
+    IrBindablePublicSymbolBase<FunctionDescriptor, IrSimpleFunction>(sig, descriptor),
     IrSimpleFunctionSymbol
 
-class IrConstructorPublicSymbolImpl(descriptor: ClassConstructorDescriptor, sig: IdSignature) :
-    IrBindablePublicSymbolBase<ClassConstructorDescriptor, IrConstructor>(descriptor, sig),
+class IrConstructorPublicSymbolImpl(sig: IdSignature, descriptor: ClassConstructorDescriptor? = null) :
+    IrBindablePublicSymbolBase<ClassConstructorDescriptor, IrConstructor>(sig, descriptor),
     IrConstructorSymbol
 
-class IrPropertyPublicSymbolImpl(descriptor: PropertyDescriptor, sig: IdSignature) :
-    IrBindablePublicSymbolBase<PropertyDescriptor, IrProperty>(descriptor, sig),
+class IrPropertyPublicSymbolImpl(sig: IdSignature, descriptor: PropertyDescriptor? = null) :
+    IrBindablePublicSymbolBase<PropertyDescriptor, IrProperty>(sig, descriptor),
     IrPropertySymbol
 
-class IrTypeAliasPublicSymbolImpl(descriptor: TypeAliasDescriptor, sig: IdSignature) :
-    IrBindablePublicSymbolBase<TypeAliasDescriptor, IrTypeAlias>(descriptor, sig),
+class IrTypeAliasPublicSymbolImpl(sig: IdSignature, descriptor: TypeAliasDescriptor? = null) :
+    IrBindablePublicSymbolBase<TypeAliasDescriptor, IrTypeAlias>(sig, descriptor),
     IrTypeAliasSymbol
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DataClassMembersGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DataClassMembersGenerator.kt
index dc9b19bfa01..07e0b362587 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DataClassMembersGenerator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DataClassMembersGenerator.kt
@@ -5,30 +5,26 @@
 
 package org.jetbrains.kotlin.ir.util
 
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
 import org.jetbrains.kotlin.ir.expressions.mapTypeParameters
 import org.jetbrains.kotlin.ir.expressions.mapValueParameters
+import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrType
+import org.jetbrains.kotlin.ir.types.classifierOrNull
+import org.jetbrains.kotlin.ir.types.isNullable
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
-import org.jetbrains.kotlin.types.isNullable
-import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound
 
 /**
  * A platform-, frontend-independent logic for generating synthetic members of data class: equals, hashCode, toString, componentN, and copy.
@@ -127,7 +123,7 @@ abstract class DataClassMembersGenerator(
             )
         }
 
-        fun generateEqualsMethodBody(properties: List<PropertyDescriptor>) {
+        fun generateEqualsMethodBody(properties: List<IrProperty>) {
             val irType = irClass.defaultType
 
             if (!irClass.isInline) {
@@ -136,9 +132,8 @@ abstract class DataClassMembersGenerator(
             +irIfThenReturnFalse(irNotIs(irOther(), irType))
             val otherWithCast = irTemporary(irAs(irOther(), irType), "other_with_cast")
             for (property in properties) {
-                val irProperty = getProperty(property)
-                val arg1 = irGetProperty(irThis(), irProperty)
-                val arg2 = irGetProperty(irGet(irType, otherWithCast.symbol), irProperty)
+                val arg1 = irGetProperty(irThis(), property)
+                val arg2 = irGetProperty(irGet(irType, otherWithCast.symbol), property)
                 +irIfThenReturnFalse(irNotEquals(arg1, arg2))
             }
             +irReturnTrue()
@@ -157,7 +152,7 @@ abstract class DataClassMembersGenerator(
                 KotlinTypeChecker.DEFAULT.equalTypes(it.valueParameters[0].type, intType)
             }.let { symbolTable.referenceSimpleFunction(it) }
 
-        fun generateHashCodeMethodBody(properties: List<PropertyDescriptor>) {
+        fun generateHashCodeMethodBody(properties: List<IrProperty>) {
             if (properties.isEmpty()) {
                 +irReturn(irInt(0))
                 return
@@ -168,15 +163,13 @@ abstract class DataClassMembersGenerator(
 
             val irIntType = context.irBuiltIns.intType
 
-            val resultVarDescriptor = WrappedVariableDescriptor()
             val irResultVar = IrVariableImpl(
                 startOffset, endOffset,
                 IrDeclarationOrigin.DEFINED,
-                IrVariableSymbolImpl(resultVarDescriptor),
+                IrVariableSymbolImpl(),
                 Name.identifier("result"), irIntType,
                 isVar = true, isConst = false, isLateinit = false
             ).also {
-                resultVarDescriptor.bind(it)
                 it.parent = irFunction
                 it.initializer = getHashCodeOfProperty(properties[0])
             }
@@ -191,27 +184,23 @@ abstract class DataClassMembersGenerator(
             +irReturn(irGet(irResultVar))
         }
 
-        private fun getHashCodeOfProperty(property: PropertyDescriptor): IrExpression {
-            val irProperty = getProperty(property)
+        private fun getHashCodeOfProperty(property: IrProperty): IrExpression {
             return when {
-                property.type.isNullable() ->
+                property.backingField!!.type.isNullable() ->
                     irIfNull(
                         context.irBuiltIns.intType,
-                        irGetProperty(irThis(), irProperty),
+                        irGetProperty(irThis(), property),
                         irInt(0),
-                        getHashCodeOf(property, irGetProperty(irThis(), irProperty))
+                        getHashCodeOf(property, irGetProperty(irThis(), property))
                     )
                 else ->
-                    getHashCodeOf(property, irGetProperty(irThis(), irProperty))
+                    getHashCodeOf(property, irGetProperty(irThis(), property))
             }
         }
 
-        private fun getHashCodeOf(property: PropertyDescriptor, irValue: IrExpression): IrExpression {
-            var substituted: FunctionDescriptor? = null
-            val hashCodeFunctionSymbol = getHashCodeFunction(property) {
-                substituted = it
-                symbolTable.referenceSimpleFunction(it.original)
-            }
+        private fun getHashCodeOf(property: IrProperty, irValue: IrExpression): IrExpression {
+            val hashCodeFunctionInfo = getHashCodeFunctionInfo(property.backingField!!.type)
+            val hashCodeFunctionSymbol = hashCodeFunctionInfo.symbol
 
             val hasDispatchReceiver = hashCodeFunctionSymbol.descriptor.dispatchReceiverParameter != null
             return irCall(
@@ -225,26 +214,24 @@ abstract class DataClassMembersGenerator(
                 } else {
                     putValueArgument(0, irValue)
                 }
-                commitSubstituted(this, substituted ?: hashCodeFunctionSymbol.descriptor)
+                hashCodeFunctionInfo.commitSubstituted(this)
             }
         }
 
-        fun generateToStringMethodBody(properties: List<PropertyDescriptor>) {
+        fun generateToStringMethodBody(properties: List<IrProperty>) {
             val irConcat = irConcat()
-            irConcat.addArgument(irString(irClass.descriptor.name.asString() + "("))
+            irConcat.addArgument(irString(irClass.name.asString() + "("))
             var first = true
             for (property in properties) {
                 if (!first) irConcat.addArgument(irString(", "))
 
                 irConcat.addArgument(irString(property.name.asString() + "="))
 
-                val irPropertyValue = irGetProperty(irThis(), getProperty(property))
+                val irPropertyValue = irGetProperty(irThis(), property)
 
-                val typeConstructorDescriptor = property.type.constructor.declarationDescriptor
+                val classifier = property.backingField!!.type.classifierOrNull
                 val irPropertyStringValue =
-                    if (typeConstructorDescriptor is ClassDescriptor &&
-                        KotlinBuiltIns.isArrayOrPrimitiveArray(typeConstructorDescriptor)
-                    )
+                    if (classifier.isArrayOrPrimitiveArray)
                         irCall(context.irBuiltIns.dataClassArrayMemberToStringSymbol, context.irBuiltIns.stringType).apply {
                             putValueArgument(0, irPropertyValue)
                         }
@@ -259,10 +246,16 @@ abstract class DataClassMembersGenerator(
         }
     }
 
-    fun getProperty(property: PropertyDescriptor): IrProperty =
+    fun getIrProperty(property: PropertyDescriptor): IrProperty =
         irPropertiesByDescriptor[property]
             ?: throw AssertionError("Class: ${irClass.descriptor}: unexpected property descriptor: $property")
 
+    fun getBackingField(property: PropertyDescriptor): IrField =
+        getIrProperty(property).backingField!!
+
+    val IrClassifierSymbol?.isArrayOrPrimitiveArray: Boolean
+        get() = this == context.irBuiltIns.arrayClass || this in context.irBuiltIns.primitiveArrays
+
     abstract fun declareSimpleFunction(startOffset: Int, endOffset: Int, functionDescriptor: FunctionDescriptor): IrFunction
 
     abstract fun generateSyntheticFunctionParameterDeclarations(irFunction: IrFunction)
@@ -338,60 +331,33 @@ abstract class DataClassMembersGenerator(
     // Entry for psi2ir
     fun generateEqualsMethod(function: FunctionDescriptor, properties: List<PropertyDescriptor>) {
         buildMember(function) {
-            generateEqualsMethodBody(properties)
+            generateEqualsMethodBody(properties.map { getIrProperty(it) })
         }
     }
 
     // Entry for fir2ir
-    fun generateEqualsMethod(irFunction: IrFunction, properties: List<PropertyDescriptor>) {
+    fun generateEqualsMethod(irFunction: IrFunction, properties: List<IrProperty>) {
         buildMember(irFunction) {
             generateEqualsMethodBody(properties)
         }
     }
 
-    private fun MemberScope.findHashCodeFunctionOrNull() =
-        getContributedFunctions(Name.identifier("hashCode"), NoLookupLocation.FROM_BACKEND)
-            .find { it.valueParameters.isEmpty() }
+    interface HashCodeFunctionInfo {
+        val symbol: IrSimpleFunctionSymbol
+        fun commitSubstituted(irMemberAccessExpression: IrMemberAccessExpression<*>)
+    }
 
-    private fun getHashCodeFunction(type: KotlinType): FunctionDescriptor =
-        type.memberScope.findHashCodeFunctionOrNull()
-            ?: context.builtIns.any.unsubstitutedMemberScope.findHashCodeFunctionOrNull()!!
-
-    private fun getHashCodeFunction(
-        type: KotlinType,
-        symbolResolve: (FunctionDescriptor) -> IrSimpleFunctionSymbol
-    ): IrSimpleFunctionSymbol =
-        when (val typeConstructorDescriptor = type.constructor.declarationDescriptor) {
-            is ClassDescriptor ->
-                if (KotlinBuiltIns.isArrayOrPrimitiveArray(typeConstructorDescriptor))
-                    context.irBuiltIns.dataClassArrayMemberHashCodeSymbol
-                else
-                    symbolResolve(getHashCodeFunction(type))
-
-            is TypeParameterDescriptor ->
-                getHashCodeFunction(typeConstructorDescriptor.representativeUpperBound, symbolResolve)
-
-            else ->
-                throw AssertionError("Unexpected type: $type")
-        }
-
-    private fun getHashCodeFunction(
-        property: PropertyDescriptor,
-        symbolResolve: (FunctionDescriptor) -> IrSimpleFunctionSymbol
-    ): IrSimpleFunctionSymbol =
-        getHashCodeFunction(property.type, symbolResolve)
-
-    abstract fun commitSubstituted(irMemberAccessExpression: IrMemberAccessExpression<*>, descriptor: CallableDescriptor)
+    abstract fun getHashCodeFunctionInfo(type: IrType): HashCodeFunctionInfo
 
     // Entry for psi2ir
     fun generateHashCodeMethod(function: FunctionDescriptor, properties: List<PropertyDescriptor>) {
         buildMember(function) {
-            generateHashCodeMethodBody(properties)
+            generateHashCodeMethodBody(properties.map { getIrProperty(it) })
         }
     }
 
     // Entry for fir2ir
-    fun generateHashCodeMethod(irFunction: IrFunction, properties: List<PropertyDescriptor>) {
+    fun generateHashCodeMethod(irFunction: IrFunction, properties: List<IrProperty>) {
         buildMember(irFunction) {
             generateHashCodeMethodBody(properties)
         }
@@ -400,12 +366,12 @@ abstract class DataClassMembersGenerator(
     // Entry for psi2ir
     fun generateToStringMethod(function: FunctionDescriptor, properties: List<PropertyDescriptor>) {
         buildMember(function) {
-            generateToStringMethodBody(properties)
+            generateToStringMethodBody(properties.map { getIrProperty(it) })
         }
     }
 
     // Entry for fir2ir
-    fun generateToStringMethod(irFunction: IrFunction, properties: List<PropertyDescriptor>) {
+    fun generateToStringMethod(irFunction: IrFunction, properties: List<IrProperty>) {
         buildMember(irFunction) {
             generateToStringMethodBody(properties)
         }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
index 7287ed068a8..88ce9378197 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeclarationStubGenerator.kt
@@ -74,10 +74,12 @@ class DeclarationStubGenerator(
 
     override fun getDeclaration(symbol: IrSymbol): IrDeclaration? {
         // Special case: generating field for an already generated property.
-        if (symbol is IrFieldSymbol && (symbol.descriptor as? WrappedPropertyDescriptor)?.isBound() == true) {
-            return generateStubBySymbol(symbol, symbol.descriptor)
-        }
-        val descriptor = if (symbol.descriptor is WrappedDeclarationDescriptor<*>)
+        // -- this used to be done via a trick (ab)using WrappedDescriptors. Not clear if this code should ever be invoked,
+        // and if so, how it can be reproduced without them.
+//        if (symbol is IrFieldSymbol && (symbol.descriptor as? WrappedPropertyDescriptor)?.isBound() == true) {
+//            return generateStubBySymbol(symbol, symbol.descriptor)
+//        }
+        val descriptor = if (!symbol.hasDescriptor)
             findDescriptorBySignature(
                 symbol.signature
                     ?: error("Symbol is not public API. Expected signature for symbol: ${symbol.descriptor}")
@@ -85,9 +87,7 @@ class DeclarationStubGenerator(
         else
             symbol.descriptor
         if (descriptor == null) return null
-        return generateStubBySymbol(symbol, descriptor).also {
-            symbol.descriptor.bind(it)
-        }
+        return generateStubBySymbol(symbol, descriptor)
     }
 
     fun generateOrGetEmptyExternalPackageFragmentStub(descriptor: PackageFragmentDescriptor): IrExternalPackageFragment {
@@ -377,22 +377,4 @@ class DeclarationStubGenerator(
         }
         return candidates.firstOrNull { symbolTable.signaturer.composeSignature(it) == signature }
     }
-
-    private fun DeclarationDescriptor.bind(declaration: IrDeclaration) {
-        when (this) {
-            is WrappedValueParameterDescriptor -> bind(declaration as IrValueParameter)
-            is WrappedReceiverParameterDescriptor -> bind(declaration as IrValueParameter)
-            is WrappedTypeParameterDescriptor -> bind(declaration as IrTypeParameter)
-            is WrappedVariableDescriptor -> bind(declaration as IrVariable)
-            is WrappedVariableDescriptorWithAccessor -> bind(declaration as IrLocalDelegatedProperty)
-            is WrappedSimpleFunctionDescriptor -> bind(declaration as IrSimpleFunction)
-            is WrappedClassConstructorDescriptor -> bind(declaration as IrConstructor)
-            is WrappedClassDescriptor -> bind(declaration as IrClass)
-            is WrappedEnumEntryDescriptor -> bind(declaration as IrEnumEntry)
-            is WrappedPropertyDescriptor -> (declaration as? IrProperty)?.let { bind(it) }
-            is WrappedTypeAliasDescriptor -> bind(declaration as IrTypeAlias)
-            is WrappedFieldDescriptor -> bind(declaration as IrField)
-            else -> {}
-        }
-    }
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt
index 9fb87ab940b..671a132170b 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopyIrTreeWithSymbols.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.ir.util
 
-import org.jetbrains.kotlin.descriptors.ScriptDescriptor
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
@@ -15,7 +14,6 @@ import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl
-import org.jetbrains.kotlin.ir.symbols.impl.IrScriptSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.ir.visitors.acceptVoid
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt
index f37a0ad690a..2bca5a2e8fa 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DeepCopySymbolRemapper.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 open class DeepCopySymbolRemapper(
-    private val descriptorsRemapper: DescriptorsRemapper = DescriptorsRemapper.Default
+    private val descriptorsRemapper: DescriptorsRemapper = NullDescriptorsRemapper
 ) : IrElementVisitorVoid, SymbolRemapper {
 
     private val classes = hashMapOf<IrClassSymbol, IrClassSymbol>()
@@ -159,7 +159,7 @@ open class DeepCopySymbolRemapper(
     override fun visitBlock(expression: IrBlock) {
         if (expression is IrReturnableBlock) {
             remapSymbol(returnableBlocks, expression) {
-                IrReturnableBlockSymbolImpl(expression.descriptor)
+                IrReturnableBlockSymbolImpl()
             }
         }
         expression.acceptChildrenVoid(this)
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt
index 68c121e3e86..0596b215636 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsRemapper.kt
@@ -19,20 +19,20 @@ package org.jetbrains.kotlin.ir.util
 import org.jetbrains.kotlin.descriptors.*
 
 interface DescriptorsRemapper {
-    fun remapDeclaredClass(descriptor: ClassDescriptor): ClassDescriptor = descriptor
-    fun remapDeclaredScript(descriptor: ScriptDescriptor): ScriptDescriptor = descriptor
-    fun remapDeclaredConstructor(descriptor: ClassConstructorDescriptor): ClassConstructorDescriptor = descriptor
-    fun remapDeclaredEnumEntry(descriptor: ClassDescriptor): ClassDescriptor = descriptor
+    fun remapDeclaredClass(descriptor: ClassDescriptor): ClassDescriptor? = descriptor
+    fun remapDeclaredScript(descriptor: ScriptDescriptor): ScriptDescriptor? = descriptor
+    fun remapDeclaredConstructor(descriptor: ClassConstructorDescriptor): ClassConstructorDescriptor? = descriptor
+    fun remapDeclaredEnumEntry(descriptor: ClassDescriptor): ClassDescriptor? = descriptor
     fun remapDeclaredExternalPackageFragment(descriptor: PackageFragmentDescriptor): PackageFragmentDescriptor = descriptor
-    fun remapDeclaredField(descriptor: PropertyDescriptor): PropertyDescriptor = descriptor
+    fun remapDeclaredField(descriptor: PropertyDescriptor): PropertyDescriptor? = descriptor
     fun remapDeclaredFilePackageFragment(descriptor: PackageFragmentDescriptor): PackageFragmentDescriptor = descriptor
-    fun remapDeclaredProperty(descriptor: PropertyDescriptor): PropertyDescriptor = descriptor
-    fun remapDeclaredSimpleFunction(descriptor: FunctionDescriptor): FunctionDescriptor = descriptor
-    fun remapDeclaredTypeParameter(descriptor: TypeParameterDescriptor): TypeParameterDescriptor = descriptor
-    fun remapDeclaredValueParameter(descriptor: ParameterDescriptor): ParameterDescriptor = descriptor
-    fun remapDeclaredVariable(descriptor: VariableDescriptor): VariableDescriptor = descriptor
-    fun remapDeclaredLocalDelegatedProperty(descriptor: VariableDescriptorWithAccessors): VariableDescriptorWithAccessors = descriptor
-    fun remapDeclaredTypeAlias(descriptor: TypeAliasDescriptor): TypeAliasDescriptor = descriptor
+    fun remapDeclaredProperty(descriptor: PropertyDescriptor): PropertyDescriptor? = descriptor
+    fun remapDeclaredSimpleFunction(descriptor: FunctionDescriptor): FunctionDescriptor? = descriptor
+    fun remapDeclaredTypeParameter(descriptor: TypeParameterDescriptor): TypeParameterDescriptor? = descriptor
+    fun remapDeclaredValueParameter(descriptor: ParameterDescriptor): ParameterDescriptor? = descriptor
+    fun remapDeclaredVariable(descriptor: VariableDescriptor): VariableDescriptor? = descriptor
+    fun remapDeclaredLocalDelegatedProperty(descriptor: VariableDescriptorWithAccessors): VariableDescriptorWithAccessors? = descriptor
+    fun remapDeclaredTypeAlias(descriptor: TypeAliasDescriptor): TypeAliasDescriptor? = descriptor
 
     object Default : DescriptorsRemapper
 }
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsToIrRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsToIrRemapper.kt
deleted file mode 100644
index 8a2299dbbf5..00000000000
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DescriptorsToIrRemapper.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2010-2018 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.ir.util
-
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
-import org.jetbrains.kotlin.ir.IrElement
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.ir.descriptors.*
-import org.jetbrains.kotlin.ir.util.DescriptorsRemapper
-import org.jetbrains.kotlin.ir.util.parentAsClass
-import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
-import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
-
-object DescriptorsToIrRemapper : DescriptorsRemapper {
-    override fun remapDeclaredClass(descriptor: ClassDescriptor) =
-        WrappedClassDescriptor()
-
-    override fun remapDeclaredConstructor(descriptor: ClassConstructorDescriptor) =
-        WrappedClassConstructorDescriptor()
-
-    override fun remapDeclaredEnumEntry(descriptor: ClassDescriptor) =
-        WrappedClassDescriptor()
-
-    override fun remapDeclaredField(descriptor: PropertyDescriptor) =
-        WrappedFieldDescriptor()
-
-    override fun remapDeclaredSimpleFunction(descriptor: FunctionDescriptor) =
-        when (descriptor) {
-            is PropertyGetterDescriptor -> WrappedPropertyGetterDescriptor()
-            is PropertySetterDescriptor -> WrappedPropertySetterDescriptor()
-            else -> WrappedSimpleFunctionDescriptor()
-        }
-
-    override fun remapDeclaredProperty(descriptor: PropertyDescriptor) =
-        WrappedPropertyDescriptor()
-
-    override fun remapDeclaredTypeParameter(descriptor: TypeParameterDescriptor) =
-        WrappedTypeParameterDescriptor()
-
-    override fun remapDeclaredVariable(descriptor: VariableDescriptor) =
-        WrappedVariableDescriptor()
-
-    override fun remapDeclaredValueParameter(descriptor: ParameterDescriptor): ParameterDescriptor =
-        if (descriptor is ReceiverParameterDescriptor)
-            WrappedReceiverParameterDescriptor()
-        else
-            WrappedValueParameterDescriptor()
-}
-
-@OptIn(ObsoleteDescriptorBasedAPI::class)
-object WrappedDescriptorPatcher : IrElementVisitorVoid {
-    override fun visitElement(element: IrElement) {
-        element.acceptChildrenVoid(this)
-    }
-
-    override fun visitClass(declaration: IrClass) {
-        (declaration.descriptor as WrappedClassDescriptor).bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitConstructor(declaration: IrConstructor) {
-        (declaration.descriptor as WrappedClassConstructorDescriptor).bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitEnumEntry(declaration: IrEnumEntry) {
-        (declaration.descriptor as WrappedClassDescriptor).bind(
-            declaration.correspondingClass ?: declaration.parentAsClass
-        )
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitField(declaration: IrField) {
-        (declaration.descriptor as WrappedFieldDescriptor).bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitProperty(declaration: IrProperty) {
-        (declaration.descriptor as WrappedPropertyDescriptor).bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitFunction(declaration: IrFunction) {
-        (declaration.descriptor as WrappedSimpleFunctionDescriptor).bind(declaration as IrSimpleFunction)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitValueParameter(declaration: IrValueParameter) {
-        (declaration.descriptor as? WrappedValueParameterDescriptor)?.bind(declaration)
-        (declaration.descriptor as? WrappedReceiverParameterDescriptor)?.bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitTypeParameter(declaration: IrTypeParameter) {
-        (declaration.descriptor as WrappedTypeParameterDescriptor).bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-
-    override fun visitVariable(declaration: IrVariable) {
-        (declaration.descriptor as WrappedVariableDescriptor).bind(declaration)
-        declaration.acceptChildrenVoid(this)
-    }
-}
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/NullDescriptorsRemapper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/NullDescriptorsRemapper.kt
new file mode 100644
index 00000000000..013e8334090
--- /dev/null
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/NullDescriptorsRemapper.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2020 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.ir.util
+
+import org.jetbrains.kotlin.descriptors.*
+
+object NullDescriptorsRemapper : DescriptorsRemapper {
+    override fun remapDeclaredClass(descriptor: ClassDescriptor): ClassDescriptor? = null
+    override fun remapDeclaredConstructor(descriptor: ClassConstructorDescriptor): ClassConstructorDescriptor? = null
+    override fun remapDeclaredEnumEntry(descriptor: ClassDescriptor): ClassDescriptor? = null
+    override fun remapDeclaredField(descriptor: PropertyDescriptor): PropertyDescriptor? = null
+    override fun remapDeclaredSimpleFunction(descriptor: FunctionDescriptor): FunctionDescriptor? = null
+    override fun remapDeclaredProperty(descriptor: PropertyDescriptor): PropertyDescriptor? = null
+    override fun remapDeclaredTypeParameter(descriptor: TypeParameterDescriptor): TypeParameterDescriptor? = null
+    override fun remapDeclaredVariable(descriptor: VariableDescriptor): VariableDescriptor? = null
+    override fun remapDeclaredValueParameter(descriptor: ParameterDescriptor): ParameterDescriptor? = null
+}
\ No newline at end of file
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
index 7628d548567..f7186dd703c 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/SymbolTable.kt
@@ -12,9 +12,6 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrScriptImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazySymbolTable
-import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.symbols.*
@@ -22,7 +19,6 @@ import org.jetbrains.kotlin.ir.symbols.impl.*
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
 
 interface ReferenceSymbolTable {
     fun referenceClass(descriptor: ClassDescriptor): IrClassSymbol
@@ -46,23 +42,19 @@ interface ReferenceSymbolTable {
 
     fun referenceTypeAlias(descriptor: TypeAliasDescriptor): IrTypeAliasSymbol
 
-    fun referenceClassFromLinker(descriptor: ClassDescriptor, sig: IdSignature): IrClassSymbol
-    fun referenceConstructorFromLinker(descriptor: ClassConstructorDescriptor, sig: IdSignature): IrConstructorSymbol
-    fun referenceEnumEntryFromLinker(descriptor: ClassDescriptor, sig: IdSignature): IrEnumEntrySymbol
-    fun referenceFieldFromLinker(descriptor: PropertyDescriptor, sig: IdSignature): IrFieldSymbol
-    fun referencePropertyFromLinker(descriptor: PropertyDescriptor, sig: IdSignature): IrPropertySymbol
-    fun referenceSimpleFunctionFromLinker(descriptor: FunctionDescriptor, sig: IdSignature): IrSimpleFunctionSymbol
-    fun referenceTypeParameterFromLinker(classifier: TypeParameterDescriptor, sig: IdSignature): IrTypeParameterSymbol
-    fun referenceTypeAliasFromLinker(descriptor: TypeAliasDescriptor, sig: IdSignature): IrTypeAliasSymbol
-
-    @ObsoleteDescriptorBasedAPI
-    fun enterScope(owner: DeclarationDescriptor)
+    fun referenceClassFromLinker(sig: IdSignature): IrClassSymbol
+    fun referenceConstructorFromLinker(sig: IdSignature): IrConstructorSymbol
+    fun referenceEnumEntryFromLinker(sig: IdSignature): IrEnumEntrySymbol
+    fun referenceFieldFromLinker(sig: IdSignature): IrFieldSymbol
+    fun referencePropertyFromLinker(sig: IdSignature): IrPropertySymbol
+    fun referenceSimpleFunctionFromLinker(sig: IdSignature): IrSimpleFunctionSymbol
+    fun referenceTypeParameterFromLinker(sig: IdSignature): IrTypeParameterSymbol
+    fun referenceTypeAliasFromLinker(sig: IdSignature): IrTypeAliasSymbol
 
+    fun enterScope(owner: IrSymbol)
     fun enterScope(owner: IrDeclaration)
 
-    @ObsoleteDescriptorBasedAPI
-    fun leaveScope(owner: DeclarationDescriptor)
-
+    fun leaveScope(owner: IrSymbol)
     fun leaveScope(owner: IrDeclaration)
 }
 
@@ -79,7 +71,7 @@ class SymbolTable(
         val unboundSymbols = linkedSetOf<S>()
 
         abstract fun get(d: D): S?
-        abstract fun set(d: D, s: S)
+        abstract fun set(s: S)
         abstract fun get(sig: IdSignature): S?
 
         inline fun declare(d: D, createSymbol: () -> S, createOwner: (S) -> B): B {
@@ -91,7 +83,7 @@ class SymbolTable(
             val existing = get(d0)
             val symbol = if (existing == null) {
                 val new = createSymbol()
-                set(d0, new)
+                set(new)
                 new
             } else {
                 unboundSymbols.remove(existing)
@@ -106,11 +98,12 @@ class SymbolTable(
             val symbol = if (existing == null) {
                 createSymbol()
             } else {
-                throw AssertionError("Symbol for $sig already exists")
+                unboundSymbols.remove(existing)
+                existing
             }
             val result = createOwner(symbol)
             // TODO: try to get rid of this
-            set(symbol.descriptor, symbol)
+            set(symbol)
             return result
         }
 
@@ -123,7 +116,7 @@ class SymbolTable(
             val existing = get(d0)
             val symbol = if (existing == null) {
                 val new = createSymbol()
-                set(d0, new)
+                set(new)
                 new
             } else {
                 if (!existing.isBound) unboundSymbols.remove(existing)
@@ -132,16 +125,16 @@ class SymbolTable(
             return if (symbol.isBound) symbol.owner else createOwner(symbol)
         }
 
-        inline fun declare(sig: IdSignature, d: D, createSymbol: () -> S, createOwner: (S) -> B): B {
+        inline fun declare(sig: IdSignature, d: D?, createSymbol: () -> S, createOwner: (S) -> B): B {
             @Suppress("UNCHECKED_CAST")
-            val d0 = d.original as D
+            val d0 = d?.original as D
             assert(d0 === d) {
                 "Non-original descriptor in declaration: $d\n\tExpected: $d0"
             }
             val existing = get(sig)
             val symbol = if (existing == null) {
                 val new = createSymbol()
-                set(d0, new)
+                set(new)
                 new
             } else {
                 unboundSymbols.remove(existing)
@@ -162,7 +155,7 @@ class SymbolTable(
                 assert(unboundSymbols.add(new)) {
                     "Symbol for $new was already referenced"
                 }
-                set(d0, new)
+                set(new)
                 return new
             }
             return s
@@ -175,7 +168,7 @@ class SymbolTable(
                 assert(unboundSymbols.add(new)) {
                     "Symbol for ${new.signature} was already referenced"
                 }
-                set(new.descriptor, new)
+                set(new)
                 new
             }
         }
@@ -189,29 +182,20 @@ class SymbolTable(
         protected open fun signature(descriptor: D): IdSignature? = signaturer.composeSignature(descriptor)
 
         override fun get(d: D): S? {
-            return if (d !is WrappedDeclarationDescriptor<*>) {
-                val sig = signature(d)
-                if (sig != null) {
-                    idSigToSymbol[sig]
-                } else {
-                    descriptorToSymbol[d]
-                }
+            val sig = signature(d)
+            return if (sig != null) {
+                idSigToSymbol[sig]
             } else {
-                if (d.isBound()) {
-                    val result = (d.owner as? IrSymbolDeclaration<*>)?.symbol ?: descriptorToSymbol[d]
-                    @Suppress("UNCHECKED_CAST")
-                    result as S?
-                } else {
-                    descriptorToSymbol[d]
-                }
+                descriptorToSymbol[d]
             }
         }
 
-        override fun set(d: D, s: S) {
+        @OptIn(ObsoleteDescriptorBasedAPI::class)
+        override fun set(s: S) {
             s.signature?.let {
                 idSigToSymbol[it] = s
-            } ?: run {
-                descriptorToSymbol[d] = s
+            } ?: if (s.hasDescriptor) {
+                descriptorToSymbol[s.descriptor] = s
             }
         }
 
@@ -228,7 +212,7 @@ class SymbolTable(
 
     private inner class ScopedSymbolTable<D : DeclarationDescriptor, B : IrSymbolOwner, S : IrBindableSymbol<D, B>>
         : SymbolTableBase<D, B, S>() {
-        inner class Scope(val owner: DeclarationDescriptor, val parent: Scope?) {
+        inner class Scope(val owner: IrSymbol, val parent: Scope?) {
             private val descriptorToSymbol = linkedMapOf<D, S>()
             private val idSigToSymbol = linkedMapOf<IdSignature, S>()
 
@@ -241,13 +225,9 @@ class SymbolTable(
             }
 
             operator fun get(d: D): S? {
-                return if (d !is WrappedDeclarationDescriptor<*>) {
-                    val sig = signaturer.composeSignature(d)
-                    if (sig != null) {
-                        getByIdSignature(sig)
-                    } else {
-                        getByDescriptor(d)
-                    }
+                val sig = signaturer.composeSignature(d)
+                return if (sig != null) {
+                    getByIdSignature(sig)
                 } else {
                     getByDescriptor(d)
                 }
@@ -255,12 +235,14 @@ class SymbolTable(
 
             fun getLocal(d: D) = descriptorToSymbol[d]
 
+            @OptIn(ObsoleteDescriptorBasedAPI::class)
             operator fun set(d: D, s: S) {
                 s.signature?.let {
                     require(d is TypeParameterDescriptor)
                     idSigToSymbol[it] = s
                 } ?: run {
-                    descriptorToSymbol[d] = s
+                    assert(s.hasDescriptor)
+                    descriptorToSymbol[s.descriptor] = s
                 }
             }
 
@@ -286,9 +268,10 @@ class SymbolTable(
             return scope[d]
         }
 
-        override fun set(d: D, s: S) {
+        @OptIn(ObsoleteDescriptorBasedAPI::class)
+        override fun set(s: S) {
             val scope = currentScope ?: throw AssertionError("No active scope")
-            scope[d] = s
+            scope[s.descriptor] = s
         }
 
         override fun get(sig: IdSignature): S? {
@@ -310,13 +293,11 @@ class SymbolTable(
             scope[descriptor] = symbol
         }
 
-        @ObsoleteDescriptorBasedAPI
-        fun enterScope(owner: DeclarationDescriptor) {
+        fun enterScope(owner: IrSymbol) {
             currentScope = Scope(owner, currentScope)
         }
 
-        @ObsoleteDescriptorBasedAPI
-        fun leaveScope(owner: DeclarationDescriptor) {
+        fun leaveScope(owner: IrSymbol) {
             currentScope?.owner.let {
                 assert(it == owner) { "Unexpected leaveScope: owner=$owner, currentScope.owner=$it" }
             }
@@ -324,6 +305,7 @@ class SymbolTable(
             currentScope = currentScope?.parent
 
             if (currentScope != null && unboundSymbols.isNotEmpty()) {
+                @OptIn(ObsoleteDescriptorBasedAPI::class)
                 throw AssertionError("Local scope contains unbound symbols: ${unboundSymbols.joinToString { it.descriptor.toString() }}")
             }
         }
@@ -406,7 +388,7 @@ class SymbolTable(
     }
 
     private fun createClassSymbol(descriptor: ClassDescriptor): IrClassSymbol {
-        return signaturer.composeSignature(descriptor)?.let { IrClassPublicSymbolImpl(descriptor, it) } ?: IrClassSymbolImpl(descriptor)
+        return signaturer.composeSignature(descriptor)?.let { IrClassPublicSymbolImpl(it, descriptor) } ?: IrClassSymbolImpl(descriptor)
     }
 
     fun declareClass(
@@ -439,7 +421,7 @@ class SymbolTable(
     fun declareClassFromLinker(descriptor: ClassDescriptor, sig: IdSignature, factory: (IrClassSymbol) -> IrClass): IrClass {
         return classSymbolTable.run {
             if (sig.isPublic) {
-                declare(sig, descriptor, { IrClassPublicSymbolImpl(descriptor, sig) }, factory)
+                declare(sig, descriptor, { IrClassPublicSymbolImpl(sig, descriptor) }, factory)
             } else {
                 declare(descriptor, { IrClassSymbolImpl(descriptor) }, factory)
             }
@@ -452,16 +434,16 @@ class SymbolTable(
     fun referenceClassIfAny(sig: IdSignature): IrClassSymbol? =
         classSymbolTable.get(sig)
 
-    override fun referenceClassFromLinker(descriptor: ClassDescriptor, sig: IdSignature): IrClassSymbol =
+    override fun referenceClassFromLinker(sig: IdSignature): IrClassSymbol =
         classSymbolTable.run {
-            if (sig.isPublic) referenced(sig) { IrClassPublicSymbolImpl(descriptor, sig) }
-            else referenced(descriptor) { IrClassSymbolImpl(descriptor) }
+            if (sig.isPublic) referenced(sig) { IrClassPublicSymbolImpl(sig) }
+            else IrClassSymbolImpl()
         }
 
     val unboundClasses: Set<IrClassSymbol> get() = classSymbolTable.unboundSymbols
 
     private fun createConstructorSymbol(descriptor: ClassConstructorDescriptor): IrConstructorSymbol {
-        return signaturer.composeSignature(descriptor)?.let { IrConstructorPublicSymbolImpl(descriptor, it) } ?: IrConstructorSymbolImpl(
+        return signaturer.composeSignature(descriptor)?.let { IrConstructorPublicSymbolImpl(it, descriptor) } ?: IrConstructorSymbolImpl(
             descriptor
         )
     }
@@ -508,23 +490,23 @@ class SymbolTable(
     ): IrConstructor {
         return constructorSymbolTable.run {
             if (sig.isPublic) {
-                declare(sig, descriptor, { IrConstructorPublicSymbolImpl(descriptor, sig) }, constructorFactory)
+                declare(sig, descriptor, { IrConstructorPublicSymbolImpl(sig, descriptor) }, constructorFactory)
             } else {
                 declare(descriptor, { IrConstructorSymbolImpl(descriptor) }, constructorFactory)
             }
         }
     }
 
-    override fun referenceConstructorFromLinker(descriptor: ClassConstructorDescriptor, sig: IdSignature): IrConstructorSymbol =
+    override fun referenceConstructorFromLinker(sig: IdSignature): IrConstructorSymbol =
         constructorSymbolTable.run {
-            if (sig.isPublic) referenced(sig) { IrConstructorPublicSymbolImpl(descriptor, sig) }
-            else referenced(descriptor) { IrConstructorSymbolImpl(descriptor) }
+            if (sig.isPublic) referenced(sig) { IrConstructorPublicSymbolImpl(sig) }
+            else IrConstructorSymbolImpl()
         }
 
     val unboundConstructors: Set<IrConstructorSymbol> get() = constructorSymbolTable.unboundSymbols
 
     private fun createEnumEntrySymbol(descriptor: ClassDescriptor): IrEnumEntrySymbol {
-        return signaturer.composeEnumEntrySignature(descriptor)?.let { IrEnumEntryPublicSymbolImpl(descriptor, it) }
+        return signaturer.composeEnumEntrySignature(descriptor)?.let { IrEnumEntryPublicSymbolImpl(it, descriptor) }
             ?: IrEnumEntrySymbolImpl(descriptor)
     }
 
@@ -557,7 +539,7 @@ class SymbolTable(
     ): IrEnumEntry {
         return enumEntrySymbolTable.run {
             if (sig.isPublic) {
-                declare(sig, descriptor, { IrEnumEntryPublicSymbolImpl(descriptor, sig) }, factory)
+                declare(sig, descriptor, { IrEnumEntryPublicSymbolImpl(sig, descriptor) }, factory)
             } else {
                 declare(descriptor, { IrEnumEntrySymbolImpl(descriptor) }, factory)
             }
@@ -567,10 +549,10 @@ class SymbolTable(
     override fun referenceEnumEntry(descriptor: ClassDescriptor) =
         enumEntrySymbolTable.referenced(descriptor) { createEnumEntrySymbol(descriptor) }
 
-    override fun referenceEnumEntryFromLinker(descriptor: ClassDescriptor, sig: IdSignature) =
+    override fun referenceEnumEntryFromLinker(sig: IdSignature) =
         enumEntrySymbolTable.run {
-            if (sig.isPublic) referenced(sig) { IrEnumEntryPublicSymbolImpl(descriptor, sig) } else
-                referenced(descriptor) { IrEnumEntrySymbolImpl(descriptor) }
+            if (sig.isPublic) referenced(sig) { IrEnumEntryPublicSymbolImpl(sig) }
+            else IrEnumEntrySymbolImpl()
         }
 
     val unboundEnumEntries: Set<IrEnumEntrySymbol> get() = enumEntrySymbolTable.unboundSymbols
@@ -615,6 +597,18 @@ class SymbolTable(
             initializer = irInitializer
         }
 
+    fun declareField(
+        sig: IdSignature,
+        symbolFactory: () -> IrFieldSymbol,
+        propertyFactory: (IrFieldSymbol) -> IrField
+    ): IrField {
+        return fieldSymbolTable.declare(
+            sig,
+            symbolFactory,
+            propertyFactory
+        )
+    }
+
     fun declareFieldFromLinker(descriptor: PropertyDescriptor, sig: IdSignature, factory: (IrFieldSymbol) -> IrField): IrField {
         return fieldSymbolTable.run {
             require(sig.isLocal)
@@ -625,10 +619,10 @@ class SymbolTable(
     override fun referenceField(descriptor: PropertyDescriptor) =
         fieldSymbolTable.referenced(descriptor) { createFieldSymbol(descriptor) }
 
-    override fun referenceFieldFromLinker(descriptor: PropertyDescriptor, sig: IdSignature) =
+    override fun referenceFieldFromLinker(sig: IdSignature) =
         fieldSymbolTable.run {
             require(sig.isLocal)
-            referenced(descriptor) { IrFieldSymbolImpl(descriptor) }
+            IrFieldSymbolImpl()
         }
 
     val unboundFields: Set<IrFieldSymbol> get() = fieldSymbolTable.unboundSymbols
@@ -641,7 +635,7 @@ class SymbolTable(
         propertyTable.getOrPut(descriptor, generate)
 
     private fun createPropertySymbol(descriptor: PropertyDescriptor): IrPropertySymbol {
-        return signaturer.composeSignature(descriptor)?.let { IrPropertyPublicSymbolImpl(descriptor, it) } ?: IrPropertySymbolImpl(
+        return signaturer.composeSignature(descriptor)?.let { IrPropertyPublicSymbolImpl(it, descriptor) } ?: IrPropertySymbolImpl(
             descriptor
         )
 
@@ -694,7 +688,7 @@ class SymbolTable(
     fun declarePropertyFromLinker(descriptor: PropertyDescriptor, sig: IdSignature, factory: (IrPropertySymbol) -> IrProperty): IrProperty {
         return propertySymbolTable.run {
             if (sig.isPublic) {
-                declare(sig, descriptor, { IrPropertyPublicSymbolImpl(descriptor, sig) }, factory)
+                declare(sig, descriptor, { IrPropertyPublicSymbolImpl(sig, descriptor) }, factory)
             } else {
                 declare(descriptor, { IrPropertySymbolImpl(descriptor) }, factory)
             }
@@ -707,16 +701,16 @@ class SymbolTable(
     fun referencePropertyIfAny(sig: IdSignature): IrPropertySymbol? =
         propertySymbolTable.get(sig)
 
-    override fun referencePropertyFromLinker(descriptor: PropertyDescriptor, sig: IdSignature): IrPropertySymbol =
+    override fun referencePropertyFromLinker(sig: IdSignature): IrPropertySymbol =
         propertySymbolTable.run {
-            if (sig.isPublic) referenced(sig) { IrPropertyPublicSymbolImpl(descriptor, sig) }
-            else referenced(descriptor) { IrPropertySymbolImpl(descriptor) }
+            if (sig.isPublic) referenced(sig) { IrPropertyPublicSymbolImpl(sig) }
+            else IrPropertySymbolImpl()
         }
 
     val unboundProperties: Set<IrPropertySymbol> get() = propertySymbolTable.unboundSymbols
 
     private fun createTypeAliasSymbol(descriptor: TypeAliasDescriptor): IrTypeAliasSymbol {
-        return signaturer.composeSignature(descriptor)?.let { IrTypeAliasPublicSymbolImpl(descriptor, it) } ?: IrTypeAliasSymbolImpl(
+        return signaturer.composeSignature(descriptor)?.let { IrTypeAliasPublicSymbolImpl(it, descriptor) } ?: IrTypeAliasSymbolImpl(
             descriptor
         )
     }
@@ -731,17 +725,17 @@ class SymbolTable(
     ): IrTypeAlias {
         return typeAliasSymbolTable.run {
             if (sig.isPublic) {
-                declare(sig, descriptor, { IrTypeAliasPublicSymbolImpl(descriptor, sig) }, factory)
+                declare(sig, descriptor, { IrTypeAliasPublicSymbolImpl(sig, descriptor) }, factory)
             } else {
                 declare(descriptor, { IrTypeAliasSymbolImpl(descriptor) }, factory)
             }
         }
     }
 
-    override fun referenceTypeAliasFromLinker(descriptor: TypeAliasDescriptor, sig: IdSignature) =
+    override fun referenceTypeAliasFromLinker(sig: IdSignature) =
         typeAliasSymbolTable.run {
-            if (sig.isPublic) referenced(sig) { IrTypeAliasPublicSymbolImpl(descriptor, sig) } else
-                referenced(descriptor) { IrTypeAliasSymbolImpl(descriptor) }
+            if (sig.isPublic) referenced(sig) { IrTypeAliasPublicSymbolImpl(sig) }
+            else IrTypeAliasSymbolImpl()
         }
 
     fun declareTypeAlias(descriptor: TypeAliasDescriptor, factory: (IrTypeAliasSymbol) -> IrTypeAlias): IrTypeAlias =
@@ -761,7 +755,7 @@ class SymbolTable(
     val unboundTypeAliases: Set<IrTypeAliasSymbol> get() = typeAliasSymbolTable.unboundSymbols
 
     private fun createSimpleFunctionSymbol(descriptor: FunctionDescriptor): IrSimpleFunctionSymbol {
-        return signaturer.composeSignature(descriptor)?.let { IrSimpleFunctionPublicSymbolImpl(descriptor, it) }
+        return signaturer.composeSignature(descriptor)?.let { IrSimpleFunctionPublicSymbolImpl(it, descriptor) }
             ?: IrSimpleFunctionSymbolImpl(descriptor)
     }
 
@@ -796,15 +790,15 @@ class SymbolTable(
     }
 
     fun declareSimpleFunctionFromLinker(
-        descriptor: FunctionDescriptor,
+        descriptor: FunctionDescriptor?,
         sig: IdSignature,
         functionFactory: (IrSimpleFunctionSymbol) -> IrSimpleFunction
     ): IrSimpleFunction {
         return simpleFunctionSymbolTable.run {
             if (sig.isPublic) {
-                declare(sig, descriptor, { IrSimpleFunctionPublicSymbolImpl(descriptor, sig) }, functionFactory)
+                declare(sig, descriptor, { IrSimpleFunctionPublicSymbolImpl(sig, descriptor) }, functionFactory)
             } else {
-                declare(descriptor, { IrSimpleFunctionSymbolImpl(descriptor) }, functionFactory)
+                declare(descriptor!!, { IrSimpleFunctionSymbolImpl(descriptor) }, functionFactory)
             }
         }
     }
@@ -815,10 +809,10 @@ class SymbolTable(
     fun referenceSimpleFunctionIfAny(sig: IdSignature): IrSimpleFunctionSymbol? =
         simpleFunctionSymbolTable.get(sig)
 
-    override fun referenceSimpleFunctionFromLinker(descriptor: FunctionDescriptor, sig: IdSignature): IrSimpleFunctionSymbol {
+    override fun referenceSimpleFunctionFromLinker(sig: IdSignature): IrSimpleFunctionSymbol {
         return simpleFunctionSymbolTable.run {
-            if (sig.isPublic) referenced(sig) { IrSimpleFunctionPublicSymbolImpl(descriptor, sig) } else
-                referenced(descriptor) { IrSimpleFunctionSymbolImpl(descriptor) }
+            if (sig.isPublic) referenced(sig) { IrSimpleFunctionPublicSymbolImpl(sig) }
+            else IrSimpleFunctionSymbolImpl()
         }
     }
 
@@ -850,6 +844,15 @@ class SymbolTable(
             typeParameterFactory
         )
 
+    fun declareGlobalTypeParameter(
+        sig: IdSignature,
+        symbolFactory: () -> IrTypeParameterSymbol,
+        typeParameterFactory: (IrTypeParameterSymbol) -> IrTypeParameter
+    ): IrTypeParameter {
+        require(sig.isLocal)
+        return globalTypeParameterSymbolTable.declare(sig, symbolFactory, typeParameterFactory)
+    }
+
     fun declareGlobalTypeParameterFromLinker(
         descriptor: TypeParameterDescriptor,
         sig: IdSignature,
@@ -878,6 +881,15 @@ class SymbolTable(
             typeParameterFactory
         )
 
+    fun declareScopedTypeParameter(
+        sig: IdSignature,
+        symbolFactory: () -> IrTypeParameterSymbol,
+        typeParameterFactory: (IrTypeParameterSymbol) -> IrTypeParameter
+    ): IrTypeParameter {
+        require(sig.isLocal)
+        return typeParameterFactory(symbolFactory())
+    }
+
     fun declareScopedTypeParameterFromLinker(
         descriptor: TypeParameterDescriptor,
         sig: IdSignature,
@@ -927,10 +939,9 @@ class SymbolTable(
             createTypeParameterSymbol(classifier)
         }
 
-    override fun referenceTypeParameterFromLinker(classifier: TypeParameterDescriptor, sig: IdSignature): IrTypeParameterSymbol {
+    override fun referenceTypeParameterFromLinker(sig: IdSignature): IrTypeParameterSymbol {
         require(sig.isLocal)
-        return scopedTypeParameterSymbolTable.get(classifier)
-            ?: globalTypeParameterSymbolTable.referenced(classifier) { IrTypeParameterSymbolImpl(classifier) }
+        return IrTypeParameterSymbolImpl()
     }
 
     fun declareVariable(
@@ -992,24 +1003,20 @@ class SymbolTable(
             throw AssertionError("Undefined local delegated property referenced: $descriptor")
         }
 
-    @ObsoleteDescriptorBasedAPI
-    override fun enterScope(owner: DeclarationDescriptor) {
+    override fun enterScope(owner: IrSymbol) {
         scopedSymbolTables.forEach { it.enterScope(owner) }
     }
 
-    @OptIn(ObsoleteDescriptorBasedAPI::class)
     override fun enterScope(owner: IrDeclaration) {
-        enterScope(owner.descriptor)
+        enterScope(owner.symbol)
     }
 
-    @ObsoleteDescriptorBasedAPI
-    override fun leaveScope(owner: DeclarationDescriptor) {
+    override fun leaveScope(owner: IrSymbol) {
         scopedSymbolTables.forEach { it.leaveScope(owner) }
     }
 
-    @OptIn(ObsoleteDescriptorBasedAPI::class)
     override fun leaveScope(owner: IrDeclaration) {
-        leaveScope(owner.descriptor)
+        leaveScope(owner.symbol)
     }
 
     fun referenceValue(value: ValueDescriptor): IrValueSymbol =
@@ -1022,34 +1029,6 @@ class SymbolTable(
                 throw IllegalArgumentException("Unexpected value descriptor: $value")
         }
 
-    @OptIn(ObsoleteDescriptorBasedAPI::class)
-    fun wrappedTopLevelCallableDescriptors(): Set<DescriptorWithContainerSource> {
-        val result = mutableSetOf<DescriptorWithContainerSource>()
-        for (descriptor in simpleFunctionSymbolTable.descriptorToSymbol.keys) {
-            if (descriptor is WrappedSimpleFunctionDescriptor && descriptor.owner.parent is IrPackageFragment) {
-                result.add(descriptor)
-            }
-        }
-        for (symbol in simpleFunctionSymbolTable.idSigToSymbol.values) {
-            val descriptor = symbol.descriptor
-            if (descriptor is WrappedSimpleFunctionDescriptor && symbol.owner.parent is IrPackageFragment) {
-                result.add(descriptor)
-            }
-        }
-        for (descriptor in propertySymbolTable.descriptorToSymbol.keys) {
-            if (descriptor is WrappedPropertyDescriptor && descriptor.owner.parent is IrPackageFragment) {
-                result.add(descriptor)
-            }
-        }
-        for (symbol in propertySymbolTable.idSigToSymbol.values) {
-            val descriptor = symbol.descriptor
-            if (descriptor is WrappedPropertyDescriptor && symbol.owner.parent is IrPackageFragment) {
-                result.add(descriptor)
-            }
-        }
-        return result
-    }
-
     private inline fun <D : DeclarationDescriptor, IR : IrSymbolOwner, S : IrBindableSymbol<D, IR>> FlatSymbolTable<D, IR, S>.forEachPublicSymbolImpl(
         block: (IrSymbol) -> Unit
     ) {
@@ -1070,32 +1049,31 @@ class SymbolTable(
     }
 }
 
-@ObsoleteDescriptorBasedAPI
-inline fun <T, D : DeclarationDescriptor> SymbolTable.withScope(owner: D, block: SymbolTable.(D) -> T): T {
+inline fun <T> SymbolTable.withScope(owner: IrSymbol, block: SymbolTable.() -> T): T {
     enterScope(owner)
-    val result = block(owner)
+    val result = block()
     leaveScope(owner)
     return result
 }
 
-inline fun <T, D : IrDeclaration> SymbolTable.withScope(owner: D, block: SymbolTable.(D) -> T): T {
+inline fun <T> SymbolTable.withScope(owner: IrDeclaration, block: SymbolTable.() -> T): T {
     enterScope(owner)
-    val result = block(owner)
+    val result = block()
     leaveScope(owner)
     return result
 }
 
 @ObsoleteDescriptorBasedAPI
-inline fun <T, D : DeclarationDescriptor> ReferenceSymbolTable.withReferenceScope(owner: D, block: ReferenceSymbolTable.(D) -> T): T {
+inline fun <T> ReferenceSymbolTable.withReferenceScope(owner: IrSymbol, block: ReferenceSymbolTable.() -> T): T {
     enterScope(owner)
-    val result = block(owner)
+    val result = block()
     leaveScope(owner)
     return result
 }
 
-inline fun <T, D : IrDeclaration> ReferenceSymbolTable.withReferenceScope(owner: D, block: ReferenceSymbolTable.(D) -> T): T {
+inline fun <T> ReferenceSymbolTable.withReferenceScope(owner: IrDeclaration, block: ReferenceSymbolTable.() -> T): T {
     enterScope(owner)
-    val result = block(owner)
+    val result = block()
     leaveScope(owner)
     return result
 }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
index 4a7e673a1fc..89b31166083 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt
index 496aa6f74bb..fbf847d5202 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/dumpKotlinLike.kt
@@ -110,6 +110,7 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption
     }
 
     override fun visitModuleFragment(declaration: IrModuleFragment, data: IrDeclaration?) {
+        p.println("// MODULE: ${declaration.name.asString()}")
         declaration.acceptChildren(this, null)
     }
 
@@ -176,11 +177,18 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption
         p.printWithNoIndent(declaration.name.asString())
 
         declaration.printTypeParametersWithNoIndent()
+        // TODO no test
         if (declaration.superTypes.isNotEmpty()) {
-            for ((i, type) in declaration.superTypes.withIndex()) {
+            var first = true
+            for (type in declaration.superTypes) {
                 if (type.isAny()) continue
 
-                p.printWithNoIndent(if (i > 0) ", " else " : ")
+                if (!first) {
+                    p.printWithNoIndent(", ")
+                } else {
+                    p.printWithNoIndent(" : ")
+                    first = false
+                }
 
                 type.printTypeWithNoIndent()
             }
@@ -991,8 +999,7 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption
     ) {
         // TODO flag to omit comment block?
         val delegatingClass = symbol.owner.parentAsClass
-        // TODO don't crash when parent isn't class
-        val currentClass = data?.parentAsClass
+        val currentClass = data?.parent as? IrClass
         val delegatingClassName = delegatingClass.name.asString()
 
         val name = if (data is IrConstructor) {
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/originalDescriptors.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/originalDescriptors.kt
index e780a8e418c..69c954d2d74 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/originalDescriptors.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/originalDescriptors.kt
@@ -8,11 +8,11 @@ package org.jetbrains.kotlin.ir.util
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedTypeParameterDescriptor
+import org.jetbrains.kotlin.ir.descriptors.IrBasedTypeParameterDescriptor
 
 val TypeParameterDescriptor.originalTypeParameter: TypeParameterDescriptor
     get() =
-        if (this is WrappedTypeParameterDescriptor) {
+        if (this is IrBasedTypeParameterDescriptor) {
             original
         } else {
             when (val container = containingDeclaration.original) {
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
index 2446e31bb2f..ef52d167751 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/overrides/FakeOverrides.kt
@@ -21,8 +21,6 @@ import org.jetbrains.kotlin.backend.common.serialization.GlobalDeclarationTable
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureSerializer
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.overrides.FakeOverrideBuilderStrategy
 import org.jetbrains.kotlin.ir.overrides.IrOverridingUtil
 import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol
@@ -113,7 +111,7 @@ class FakeOverrideBuilder(
         // But to create and link that symbol we should already have the signature computed.
         // To break this loop we use temp symbol in correspondingProperty.
 
-        val tempSymbol = IrPropertySymbolImpl(WrappedPropertyDescriptor()).also {
+        val tempSymbol = IrPropertySymbolImpl().also {
             it.bind(declaration as IrProperty)
         }
         declaration.getter?.let {
@@ -142,9 +140,9 @@ class FakeOverrideBuilder(
     private fun declareFunctionFakeOverride(declaration: IrFakeOverrideFunction, signature: IdSignature) {
         val parent = declaration.parentAsClass
         val symbol = linker.tryReferencingSimpleFunctionByLocalSignature(parent, signature)
-        val descriptor = symbol?.descriptor ?: WrappedSimpleFunctionDescriptor()
-        symbolTable.declareSimpleFunctionFromLinker(descriptor, signature) {
-            assert(it === symbol || symbol == null)
+            ?: symbolTable.referenceSimpleFunctionFromLinker(signature)
+        symbolTable.declareSimpleFunction(signature, { symbol }) {
+            assert(it === symbol)
             declaration.acquireSymbol(it)
         }
     }
@@ -152,9 +150,9 @@ class FakeOverrideBuilder(
     private fun declarePropertyFakeOverride(declaration: IrFakeOverrideProperty, signature: IdSignature) {
         val parent = declaration.parentAsClass
         val symbol = linker.tryReferencingPropertyByLocalSignature(parent, signature)
-        val descriptor = symbol?.descriptor ?: WrappedPropertyDescriptor()
-        symbolTable.declarePropertyFromLinker(descriptor, signature) {
-            assert(it === symbol || symbol == null)
+            ?: symbolTable.referencePropertyFromLinker(signature)
+        symbolTable.declareProperty(signature, { symbol }) {
+            assert(it === symbol)
             declaration.acquireSymbol(it)
         }
     }
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/ExpectActualTable.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/ExpectActualTable.kt
index 7b9fd41d089..ace9bbdd34c 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/ExpectActualTable.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/ExpectActualTable.kt
@@ -90,7 +90,6 @@ class ExpectActualTable(val expectDescriptorToSymbol: MutableMap<DeclarationDesc
 
     fun findExpectsForActuals(declaration: IrDeclaration) {
         if (declaration.descriptor !is MemberDescriptor) return
-        if (declaration !is IrSymbolDeclaration<*>) return
 
         val descriptor = declaration.symbol.descriptor
 
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
index edd7f0a7b5d..dccd507249f 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.symbols.impl.IrPublicSymbolBase
+import org.jetbrains.kotlin.ir.symbols.impl.IrTypeParameterSymbolImpl
 import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.types.impl.*
 import org.jetbrains.kotlin.ir.util.*
@@ -1009,21 +1010,17 @@ abstract class IrFileDeserializer(
         val result = symbolTable.run {
             if (isGlobal) {
                 val p = deserializeIrSymbolToDeclare(proto.base.symbol)
-                val symbol = p.first
+                val symbol = p.first as IrTypeParameterSymbol
                 sig = p.second
-                val descriptor = (symbol as IrTypeParameterSymbol).descriptor
-                declareGlobalTypeParameterFromLinker(descriptor, sig, factory)
+                declareGlobalTypeParameter(sig, { symbol }, factory)
             } else {
                 val symbolData = BinarySymbolData
                     .decode(proto.base.symbol)
                 sig = deserializeIdSignature(symbolData.signatureId)
-                val descriptor = WrappedTypeParameterDescriptor()
-                declareScopedTypeParameterFromLinker(descriptor, sig, factory)
+                declareScopedTypeParameter(sig, { IrTypeParameterSymbolImpl() }, factory)
             }
         }
 
-        (result.descriptor as? WrappedTypeParameterDescriptor)?.bind(result)
-
         // make sure this symbol is known to linker
         referenceIrSymbol(result.symbol, sig)
         result.annotations += deserializeAnnotations(proto.base.annotationList)
@@ -1049,9 +1046,6 @@ abstract class IrFileDeserializer(
             ).apply {
                 if (proto.hasDefaultValue())
                     defaultValue = irFactory.createExpressionBody(deserializeExpressionBody(proto.defaultValue))
-
-                (descriptor as? WrappedValueParameterDescriptor)?.bind(this)
-                (descriptor as? WrappedReceiverParameterDescriptor)?.bind(this)
             }
         }
 
@@ -1059,7 +1053,7 @@ abstract class IrFileDeserializer(
         withDeserializedIrDeclarationBase(proto.base) { symbol, signature, startOffset, endOffset, origin, fcode ->
             val flags = ClassFlags.decode(fcode)
 
-            symbolTable.declareClassFromLinker((symbol as IrClassSymbol).descriptor, signature) {
+            symbolTable.declareClass(signature, { symbol as IrClassSymbol }) {
                 irFactory.createClass(
                     startOffset, endOffset, origin,
                     it,
@@ -1086,15 +1080,14 @@ abstract class IrFileDeserializer(
 
                 thisReceiver = deserializeIrValueParameter(proto.thisReceiver, -1)
 
-                (descriptor as? WrappedClassDescriptor)?.bind(this)
-
                 fakeOverrideBuilder.enqueueClass(this, signature)
             }
         }
 
     private fun deserializeIrTypeAlias(proto: ProtoTypeAlias): IrTypeAlias =
         withDeserializedIrDeclarationBase(proto.base) { symbol, uniqId, startOffset, endOffset, origin, fcode ->
-            symbolTable.declareTypeAliasFromLinker((symbol as IrTypeAliasSymbol).descriptor, uniqId) {
+            require(symbol is IrTypeAliasSymbol)
+            symbolTable.declareTypeAlias(uniqId, { symbol }) {
                 val flags = TypeAliasFlags.decode(fcode)
                 val nameType = BinaryNameAndType.decode(proto.nameType)
                 irFactory.createTypeAlias(
@@ -1108,17 +1101,13 @@ abstract class IrFileDeserializer(
                 )
             }.usingParent {
                 typeParameters = deserializeTypeParameters(proto.typeParameterList, true)
-
-                (descriptor as? WrappedTypeAliasDescriptor)?.bind(this)
             }
         }
 
     private fun deserializeErrorDeclaration(proto: ProtoErrorDeclaration): IrErrorDeclaration {
         require(allowErrorNodes) { "IrErrorDeclaration found but error code is not allowed" }
         val coordinates = BinaryCoordinates.decode(proto.coordinates)
-        val descriptor = WrappedErrorDescriptor()
-        return irFactory.createErrorDeclaration(coordinates.startOffset, coordinates.endOffset, descriptor).also {
-            descriptor.bind(it)
+        return irFactory.createErrorDeclaration(coordinates.startOffset, coordinates.endOffset).also {
             it.parent = parentsStack.peek()!!
         }
     }
@@ -1204,7 +1193,7 @@ abstract class IrFileDeserializer(
         proto: ProtoFunctionBase,
         block: (IrFunctionSymbol, IdSignature, Int, Int, IrDeclarationOrigin, Long) -> T
     ): T = withDeserializedIrDeclarationBase(proto.base) { symbol, idSig, startOffset, endOffset, origin, fcode ->
-        symbolTable.withScope(symbol.descriptor) {
+        symbolTable.withScope(symbol) {
             block(symbol as IrFunctionSymbol, idSig, startOffset, endOffset, origin, fcode).usingParent {
                 typeParameters = deserializeTypeParameters(proto.typeParameterList, false)
                 val nameType = BinaryNameAndType.decode(proto.nameType)
@@ -1227,7 +1216,7 @@ abstract class IrFileDeserializer(
     private fun deserializeIrFunction(proto: ProtoFunction): IrSimpleFunction {
         return withDeserializedIrFunctionBase(proto.base) { symbol, idSig, startOffset, endOffset, origin, fcode ->
             val flags = FunctionFlags.decode(fcode)
-            symbolTable.declareSimpleFunctionFromLinker(symbol.descriptor, idSig) {
+            symbolTable.declareSimpleFunction(idSig, { symbol as IrSimpleFunctionSymbol }) {
                 val nameType = BinaryNameAndType.decode(proto.base.nameType)
                 irFactory.createFunction(
                     startOffset, endOffset, origin,
@@ -1247,8 +1236,6 @@ abstract class IrFileDeserializer(
                 )
             }.apply {
                 overriddenSymbols = proto.overriddenList.map { deserializeIrSymbolAndRemap(it) as IrSimpleFunctionSymbol }
-
-                (descriptor as? WrappedSimpleFunctionDescriptor)?.bind(this)
             }
         }
     }
@@ -1268,22 +1255,18 @@ abstract class IrFileDeserializer(
             ).apply {
                 if (proto.hasInitializer())
                     initializer = deserializeExpression(proto.initializer)
-
-                (descriptor as? WrappedVariableDescriptor)?.bind(this)
             }
         }
 
     private fun deserializeIrEnumEntry(proto: ProtoEnumEntry): IrEnumEntry =
         withDeserializedIrDeclarationBase(proto.base) { symbol, uniqId, startOffset, endOffset, origin, _ ->
-            symbolTable.declareEnumEntryFromLinker((symbol as IrEnumEntrySymbol).descriptor, uniqId) {
+            symbolTable.declareEnumEntry(uniqId, { symbol as IrEnumEntrySymbol }) {
                 irFactory.createEnumEntry(startOffset, endOffset, origin, it, deserializeName(proto.name))
             }.apply {
                 if (proto.hasCorrespondingClass())
                     correspondingClass = deserializeIrClass(proto.correspondingClass)
                 if (proto.hasInitializer())
                     initializerExpression = irFactory.createExpressionBody(deserializeExpressionBody(proto.initializer))
-
-                (descriptor as? WrappedEnumEntryDescriptor)?.bind(this)
             }
         }
 
@@ -1292,16 +1275,15 @@ abstract class IrFileDeserializer(
             irFactory.createAnonymousInitializer(startOffset, endOffset, origin, symbol as IrAnonymousInitializerSymbol).apply {
 //                body = deserializeBlockBody(proto.body.blockBody, startOffset, endOffset)
                 body = deserializeStatementBody(proto.body) as IrBlockBody
-
-                (descriptor as? WrappedClassDescriptor)?.bind(parentsStack.peek() as IrClass)
             }
         }
 
     private fun deserializeIrConstructor(proto: ProtoConstructor): IrConstructor =
         withDeserializedIrFunctionBase(proto.base) { symbol, idSig, startOffset, endOffset, origin, fcode ->
+            require(symbol is IrConstructorSymbol)
             val flags = FunctionFlags.decode(fcode)
             val nameType = BinaryNameAndType.decode(proto.base.nameType)
-            symbolTable.declareConstructorFromLinker((symbol as IrConstructorSymbol).descriptor, idSig) {
+            symbolTable.declareConstructor(idSig, { symbol }) {
                 irFactory.createConstructor(
                     startOffset, endOffset, origin,
                     it,
@@ -1313,8 +1295,6 @@ abstract class IrFileDeserializer(
                     flags.isPrimary,
                     flags.isExpect
                 )
-            }.apply {
-                (descriptor as? WrappedClassConstructorDescriptor)?.bind(this)
             }
         }
 
@@ -1322,10 +1302,11 @@ abstract class IrFileDeserializer(
 
     private fun deserializeIrField(proto: ProtoField): IrField =
         withDeserializedIrDeclarationBase(proto.base) { symbol, uniqId, startOffset, endOffset, origin, fcode ->
+            require(symbol is IrFieldSymbol)
             val nameType = BinaryNameAndType.decode(proto.nameType)
             val type = deserializeIrType(nameType.typeIndex)
             val flags = FieldFlags.decode(fcode)
-            symbolTable.declareFieldFromLinker((symbol as IrFieldSymbol).descriptor, uniqId) {
+            symbolTable.declareField(uniqId, { symbol }) {
                 irFactory.createField(
                     startOffset, endOffset, origin,
                     it,
@@ -1342,8 +1323,6 @@ abstract class IrFileDeserializer(
                         initializer = irFactory.createExpressionBody(deserializeExpressionBody(proto.initializer))
                     }
                 }
-
-                (descriptor as? WrappedFieldDescriptor)?.bind(this)
             }
         }
 
@@ -1362,15 +1341,14 @@ abstract class IrFileDeserializer(
                 getter = deserializeIrFunction(proto.getter)
                 if (proto.hasSetter())
                     setter = deserializeIrFunction(proto.setter)
-
-                (descriptor as? WrappedVariableDescriptorWithAccessor)?.bind(this)
             }
         }
 
     private fun deserializeIrProperty(proto: ProtoProperty): IrProperty =
         withDeserializedIrDeclarationBase(proto.base) { symbol, uniqId, startOffset, endOffset, origin, fcode ->
+            require(symbol is IrPropertySymbol)
             val flags = PropertyFlags.decode(fcode)
-            symbolTable.declarePropertyFromLinker((symbol as IrPropertySymbol).descriptor, uniqId) {
+            symbolTable.declareProperty(uniqId, { symbol }) {
                 irFactory.createProperty(
                     startOffset, endOffset, origin,
                     it,
@@ -1398,17 +1376,9 @@ abstract class IrFileDeserializer(
                 }
                 if (proto.hasBackingField()) {
                     backingField = deserializeIrField(proto.backingField).also {
-                        // A property symbol and its field symbol share the same descriptor.
-                        // Unfortunately symbol deserialization doesn't know anything about that.
-                        // So we can end up with two wrapped property descriptors for property and its field.
-                        // In that case we need to bind the field's one here.
-                        if (descriptor != it.descriptor)
-                            (it.descriptor as? WrappedPropertyDescriptor)?.bind(this)
                         it.correspondingPropertySymbol = symbol
                     }
                 }
-
-                (descriptor as? WrappedPropertyDescriptor)?.bind(this)
             }
         }
 
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
index 44d3fe1f054..434cae774d3 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.IrAbstractFunctionFactory
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.library.IrLibrary
@@ -42,7 +41,7 @@ abstract class IrModuleDeserializer(val moduleDescriptor: ModuleDescriptor) {
     open fun declareIrSymbol(symbol: IrSymbol) {
         val signature = symbol.signature
         require(signature != null) { "Symbol is not public API: ${symbol.descriptor}" }
-        assert(symbol.descriptor !is WrappedDeclarationDescriptor<*>)
+        assert(symbol.hasDescriptor)
         deserializeIrSymbol(signature, symbol.kind())
     }
 
@@ -69,7 +68,7 @@ abstract class IrModuleDeserializer(val moduleDescriptor: ModuleDescriptor) {
 
 // Used to resolve built in symbols like `kotlin.ir.internal.*` or `kotlin.FunctionN`
 class IrModuleDeserializerWithBuiltIns(
-    private val builtIns: IrBuiltIns,
+    builtIns: IrBuiltIns,
     private val functionFactory: IrAbstractFunctionFactory,
     private val delegate: IrModuleDeserializer
 ) : IrModuleDeserializer(delegate.moduleDescriptor) {
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
index b717736fe8f..62574d45b92 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
@@ -502,21 +502,21 @@ abstract class KotlinIrLinker(
 
     private fun referenceDeserializedSymbol(symbolKind: BinarySymbolData.SymbolKind, idSig: IdSignature): IrSymbol = symbolTable.run {
         when (symbolKind) {
-            BinarySymbolData.SymbolKind.ANONYMOUS_INIT_SYMBOL -> IrAnonymousInitializerSymbolImpl(WrappedClassDescriptor())
-            BinarySymbolData.SymbolKind.CLASS_SYMBOL -> referenceClassFromLinker(WrappedClassDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.CONSTRUCTOR_SYMBOL -> referenceConstructorFromLinker(WrappedClassConstructorDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.TYPE_PARAMETER_SYMBOL -> referenceTypeParameterFromLinker(WrappedTypeParameterDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.ENUM_ENTRY_SYMBOL -> referenceEnumEntryFromLinker(WrappedEnumEntryDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.STANDALONE_FIELD_SYMBOL -> referenceFieldFromLinker(WrappedFieldDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.FIELD_SYMBOL -> referenceFieldFromLinker(WrappedPropertyDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.FUNCTION_SYMBOL -> referenceSimpleFunctionFromLinker(WrappedSimpleFunctionDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.TYPEALIAS_SYMBOL -> referenceTypeAliasFromLinker(WrappedTypeAliasDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.PROPERTY_SYMBOL -> referencePropertyFromLinker(WrappedPropertyDescriptor(), idSig)
-            BinarySymbolData.SymbolKind.VARIABLE_SYMBOL -> IrVariableSymbolImpl(WrappedVariableDescriptor())
-            BinarySymbolData.SymbolKind.VALUE_PARAMETER_SYMBOL -> IrValueParameterSymbolImpl(WrappedValueParameterDescriptor())
-            BinarySymbolData.SymbolKind.RECEIVER_PARAMETER_SYMBOL -> IrValueParameterSymbolImpl(WrappedReceiverParameterDescriptor())
+            BinarySymbolData.SymbolKind.ANONYMOUS_INIT_SYMBOL -> IrAnonymousInitializerSymbolImpl()
+            BinarySymbolData.SymbolKind.CLASS_SYMBOL -> referenceClassFromLinker(idSig)
+            BinarySymbolData.SymbolKind.CONSTRUCTOR_SYMBOL -> referenceConstructorFromLinker(idSig)
+            BinarySymbolData.SymbolKind.TYPE_PARAMETER_SYMBOL -> referenceTypeParameterFromLinker(idSig)
+            BinarySymbolData.SymbolKind.ENUM_ENTRY_SYMBOL -> referenceEnumEntryFromLinker(idSig)
+            BinarySymbolData.SymbolKind.STANDALONE_FIELD_SYMBOL -> referenceFieldFromLinker(idSig)
+            BinarySymbolData.SymbolKind.FIELD_SYMBOL -> referenceFieldFromLinker(idSig)
+            BinarySymbolData.SymbolKind.FUNCTION_SYMBOL -> referenceSimpleFunctionFromLinker(idSig)
+            BinarySymbolData.SymbolKind.TYPEALIAS_SYMBOL -> referenceTypeAliasFromLinker(idSig)
+            BinarySymbolData.SymbolKind.PROPERTY_SYMBOL -> referencePropertyFromLinker(idSig)
+            BinarySymbolData.SymbolKind.VARIABLE_SYMBOL -> IrVariableSymbolImpl()
+            BinarySymbolData.SymbolKind.VALUE_PARAMETER_SYMBOL -> IrValueParameterSymbolImpl()
+            BinarySymbolData.SymbolKind.RECEIVER_PARAMETER_SYMBOL -> IrValueParameterSymbolImpl()
             BinarySymbolData.SymbolKind.LOCAL_DELEGATED_PROPERTY_SYMBOL ->
-                IrLocalDelegatedPropertySymbolImpl(WrappedVariableDescriptorWithAccessor())
+                IrLocalDelegatedPropertySymbolImpl()
             else -> error("Unexpected classifier symbol kind: $symbolKind for signature $idSig")
         }
     }
@@ -553,9 +553,9 @@ abstract class KotlinIrLinker(
     protected open fun platformSpecificSymbol(symbol: IrSymbol): Boolean = false
 
     private fun tryResolveCustomDeclaration(symbol: IrSymbol): IrDeclaration? {
-        val descriptor = symbol.descriptor
+        if (!symbol.hasDescriptor) return null
 
-        if (descriptor is WrappedDeclarationDescriptor<*>) return null
+        val descriptor = symbol.descriptor
         if (descriptor is CallableMemberDescriptor) {
             if (descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
                 // skip fake overrides
@@ -576,7 +576,6 @@ abstract class KotlinIrLinker(
 
         if (!symbol.isPublicApi) {
             val descriptor = symbol.descriptor
-            if (descriptor is WrappedDeclarationDescriptor<*>) return null
             if (!platformSpecificSymbol(symbol)) {
                 if (descriptor.module !== currentModule) return null
             }
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
index c97fcfef86a..059f80b18bf 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/signature/IdSignatureDescriptor.kt
@@ -6,7 +6,6 @@
 package org.jetbrains.kotlin.backend.common.serialization.signature
 
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.ir.descriptors.WrappedDeclarationDescriptor
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.ir.util.IdSignatureComposer
 import org.jetbrains.kotlin.ir.util.KotlinMangler
@@ -109,14 +108,12 @@ open class IdSignatureDescriptor(private val mangler: KotlinMangler.DescriptorMa
     private val composer by lazy { createSignatureBuilder() }
 
     override fun composeSignature(descriptor: DeclarationDescriptor): IdSignature? {
-        if (descriptor is WrappedDeclarationDescriptor<*>) return null
         return if (mangler.run { descriptor.isExported() }) {
             composer.buildSignature(descriptor)
         } else null
     }
 
     override fun composeEnumEntrySignature(descriptor: ClassDescriptor): IdSignature? {
-        if (descriptor is WrappedDeclarationDescriptor<*>) return null
         return if (mangler.run { descriptor.isExportEnumEntry() }) {
             composer.buildSignature(descriptor)
         } else null
diff --git a/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java b/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
index cc87ec933f7..0cfccd158c5 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
@@ -459,17 +459,13 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
                 if (!firstExpressionParsed) {
                     expression.drop();
                     expression = mark();
+                    firstExpressionParsed = parseAtomicExpression();
+                    continue;
                 }
 
                 parseSelectorCallExpression();
 
-                if (firstExpressionParsed) {
-                    expression.done(expressionType);
-                }
-                else {
-                    firstExpressionParsed = true;
-                    continue;
-                }
+                expression.done(expressionType);
             }
             else if (atSet(Precedence.POSTFIX.getOperations())) {
                 parseOperationReference();
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtQualifiedExpression.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtQualifiedExpression.kt
index 3f152ac8646..a0641c0ebb8 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtQualifiedExpression.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtQualifiedExpression.kt
@@ -39,7 +39,7 @@ interface KtQualifiedExpression : KtExpression {
     val operationSign: KtSingleValueToken
         get() = operationTokenNode.elementType as KtSingleValueToken
 
-    private fun KtQualifiedExpression.getExpression(afterOperation: Boolean): KtExpression? {
+    private fun getExpression(afterOperation: Boolean): KtExpression? {
         return operationTokenNode.psi?.siblings(afterOperation, false)?.firstIsInstanceOrNull<KtExpression>()
     }
 }
diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt
index 618b29e8d6d..91bb087104c 100644
--- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt
+++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/VariableFixationFinder.kt
@@ -141,8 +141,12 @@ class VariableFixationFinder(
         return false
     }
 
-    private fun Context.variableHasProperArgumentConstraints(variable: TypeConstructorMarker): Boolean =
-        notFixedTypeVariables[variable]?.constraints?.any { isProperArgumentConstraint(it) } ?: false
+    private fun Context.variableHasProperArgumentConstraints(variable: TypeConstructorMarker): Boolean {
+        val constraints = notFixedTypeVariables[variable]?.constraints ?: return false
+        // temporary hack to fail calls which contain callable references resolved though OI with uninferred type parameters
+        val areThereConstraintsWithUninferredTypeParameter = constraints.any { c -> c.type.contains { it.isUninferredParameter() } }
+        return constraints.any { isProperArgumentConstraint(it) } && !areThereConstraintsWithUninferredTypeParameter
+    }
 
     private fun Context.isProperArgumentConstraint(c: Constraint) =
         isProperType(c.type)
diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/Assertions.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/Assertions.kt
index c503da26b99..28b58934b85 100644
--- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/Assertions.kt
+++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/Assertions.kt
@@ -3,40 +3,9 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmName("KtAssert")
-
 package org.jetbrains.kotlin.test
 
 import java.io.File
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.contract
-
-/*
- * Those functions are needed only in this module because it has no testing framework
- *   with assertions in it's dependencies
- */
-
-internal fun fail(message: String) {
-    throw AssertionError(message)
-}
-
-@OptIn(ExperimentalContracts::class)
-internal fun assertNotNull(message: String, value: Any?) {
-    contract {
-        returns() implies (value != null)
-    }
-    if (value == null) {
-        fail(message)
-    }
-}
-
-internal fun assertTrue(message: String, value: Boolean) {
-    if (!value) {
-        fail(message)
-    }
-}
 
 abstract class Assertions {
     fun assertEqualsToFile(expectedFile: File, actual: String, sanitizer: (String) -> String = { it }) {
diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/KtAssert.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/KtAssert.kt
new file mode 100644
index 00000000000..d79c90c2144
--- /dev/null
+++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/KtAssert.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2020 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.test
+
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+
+
+/*
+ * Those functions are needed only in modules which are not depend on any testing framework
+ */
+object KtAssert {
+    @JvmStatic
+    fun fail(message: String) {
+        throw AssertionError(message)
+    }
+
+    @JvmStatic
+    @OptIn(ExperimentalContracts::class)
+    fun assertNotNull(message: String, value: Any?) {
+        contract {
+            returns() implies (value != null)
+        }
+        if (value == null) {
+            fail(message)
+        }
+    }
+
+    @JvmStatic
+    fun assertTrue(message: String, value: Boolean) {
+        if (!value) {
+            fail(message)
+        }
+    }
+
+    @JvmStatic
+    fun <T> assertEquals(message: String, expected: T, actual: T) {
+        if (expected != actual) {
+            fail(message)
+        }
+    }
+}
diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt
index 873a284b96a..17c2da42026 100644
--- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt
+++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/builders/LanguageVersionSettingsBuilder.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
 import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
 import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
 import org.jetbrains.kotlin.test.services.DefaultsDsl
+import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
 import org.jetbrains.kotlin.test.util.LANGUAGE_FEATURE_PATTERN
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 
@@ -48,7 +49,7 @@ class LanguageVersionSettingsBuilder {
         analysisFlags[flag] = value
     }
 
-    fun configureUsingDirectives(directives: RegisteredDirectives) {
+    fun configureUsingDirectives(directives: RegisteredDirectives, environmentConfigurators: List<EnvironmentConfigurator>) {
         val apiVersion = directives.singleOrZeroValue(LanguageSettingsDirectives.API_VERSION)
         if (apiVersion != null) {
             this.apiVersion = apiVersion
@@ -67,12 +68,19 @@ class LanguageVersionSettingsBuilder {
             analysisFlag(JvmAnalysisFlags.jvmDefaultMode, directives.singleOrZeroValue(LanguageSettingsDirectives.JVM_DEFAULT_MODE)),
             analysisFlag(JvmAnalysisFlags.inheritMultifileParts, trueOrNull(LanguageSettingsDirectives.INHERIT_MULTIFILE_PARTS in directives)),
             analysisFlag(JvmAnalysisFlags.sanitizeParentheses, trueOrNull(LanguageSettingsDirectives.SANITIZE_PARENTHESES in directives)),
+            analysisFlag(JvmAnalysisFlags.enableJvmPreview, trueOrNull(LanguageSettingsDirectives.ENABLE_JVM_PREVIEW in directives)),
 
             analysisFlag(AnalysisFlags.explicitApiVersion, trueOrNull(apiVersion != null)),
         )
 
         analysisFlags.forEach { withFlag(it.first, it.second) }
 
+        environmentConfigurators.forEach {
+            it.provideAdditionalAnalysisFlags(directives).entries.forEach { (flag, value) ->
+                withFlag(flag, value)
+            }
+        }
+
         directives[LanguageSettingsDirectives.LANGUAGE].forEach { parseLanguageFeature(it) }
     }
 
diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt
index 2abf2bb179d..36e21b29d5d 100644
--- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt
+++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt
@@ -67,6 +67,8 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() {
         description = "Enables corresponding analysis flag (JvmAnalysisFlags.sanitizeParentheses)"
     )
 
+    val ENABLE_JVM_PREVIEW by directive("Enable JVM preview features")
+
     // --------------------- Utils ---------------------
 
     fun parseApiVersion(versionString: String): ApiVersion = when (versionString) {
diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
index ec4c8b7c5e0..6060c451844 100644
--- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
+++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.test.services
 
 import com.intellij.mock.MockProject
+import org.jetbrains.kotlin.config.AnalysisFlag
 import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.test.directives.model.ComposedRegisteredDirectives
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
 import org.jetbrains.kotlin.test.model.TestModule
@@ -22,8 +22,9 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
     protected val moduleStructure: TestModuleStructure
         get() = testServices.moduleStructure
 
-    protected val TestModule.allRegisteredDirectives: RegisteredDirectives
-        get() = ComposedRegisteredDirectives(directives, testServices.defaultDirectives)
-
     open fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {}
+
+    open fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map<AnalysisFlag<*>, Any?> {
+        return emptyMap()
+    }
 }
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
index df3c1c1a2d3..cbdd11d53a6 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt
@@ -1,5 +1,4 @@
 // Validation
-// ALLOW_FRONTEND_EXCEPTION
 // See KT-24323
 // FIR_COMPARISON
 
diff --git a/compiler/testData/checkLocalVariablesTable/parametersInSuspendLambda/parameters.kt b/compiler/testData/checkLocalVariablesTable/parametersInSuspendLambda/parameters.kt
index 964126eeb98..d72e004d206 100644
--- a/compiler/testData/checkLocalVariablesTable/parametersInSuspendLambda/parameters.kt
+++ b/compiler/testData/checkLocalVariablesTable/parametersInSuspendLambda/parameters.kt
@@ -28,8 +28,8 @@ suspend fun foo(data: Data, body: suspend Long.(String, Data, Int) -> Unit) {
 // JVM_IR_TEMPLATES
 // VARIABLE : NAME=$dstr$x$_u24__u24$z TYPE=LData; INDEX=*
 // VARIABLE : NAME=$result TYPE=Ljava/lang/Object; INDEX=*
+// VARIABLE : NAME=$this$foo TYPE=J INDEX=*
 // VARIABLE : NAME=i TYPE=I INDEX=*
-// VARIABLE : NAME=p$ TYPE=J INDEX=*
 // VARIABLE : NAME=str TYPE=Ljava/lang/String; INDEX=*
 // VARIABLE : NAME=this TYPE=LParametersKt$test$2; INDEX=*
 // VARIABLE : NAME=x TYPE=Ljava/lang/String; INDEX=*
diff --git a/compiler/testData/cli/jvm/abiStabilityIncorrectValue.args b/compiler/testData/cli/jvm/abiStabilityIncorrectValue.args
new file mode 100644
index 00000000000..3bdd5af2b60
--- /dev/null
+++ b/compiler/testData/cli/jvm/abiStabilityIncorrectValue.args
@@ -0,0 +1,5 @@
+$TESTDATA_DIR$/simple.kt
+-d
+$TEMP_DIR$
+-Xuse-ir
+-Xabi-stability=unknown
diff --git a/compiler/testData/cli/jvm/abiStabilityIncorrectValue.out b/compiler/testData/cli/jvm/abiStabilityIncorrectValue.out
new file mode 100644
index 00000000000..c132471a0c1
--- /dev/null
+++ b/compiler/testData/cli/jvm/abiStabilityIncorrectValue.out
@@ -0,0 +1,2 @@
+error: unknown ABI stability mode: unknown, supported modes: [stable, unstable]
+COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args
new file mode 100644
index 00000000000..3d0218fd1c3
--- /dev/null
+++ b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args
@@ -0,0 +1,4 @@
+$TESTDATA_DIR$/simple.kt
+-d
+$TEMP_DIR$
+-Xabi-stability=unstable
diff --git a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out
new file mode 100644
index 00000000000..4383a3f6de4
--- /dev/null
+++ b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out
@@ -0,0 +1,2 @@
+error: -Xabi-stability=unstable is not supported in the old JVM backend
+COMPILATION_ERROR
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 7d8bc2eaba4..111025d9443 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -1,9 +1,14 @@
 Usage: kotlinc-jvm <options> <source files>
 where advanced options include:
+  -Xabi-stability={stable|unstable}
+                             When using unstable compiler features such as FIR, use 'stable' to mark generated class files as stable
+                             to prevent diagnostics from stable compilers at the call site.
+                             When using the JVM IR backend, conversely, use 'unstable' to mark generated class files as unstable
+                             to force diagnostics to be reported.
   -Xadd-modules=<module[,]>  Root modules to resolve in addition to the initial modules,
                              or all modules on the module path if <module> is ALL-MODULE-PATH
-  -Xallow-jvm-ir-dependencies When not using the IR backend, do not report errors on those classes in dependencies, which were compiled by the IR backend
   -Xallow-no-source-files    Allow no source files
+  -Xallow-unstable-dependencies Do not report errors on classes in dependencies, which were compiled by an unstable version of the Kotlin compiler
   -Xassertions={always-enable|always-disable|jvm|legacy}
                              Assert calls behaviour
                              -Xassertions=always-enable:  enable, ignore jvm assertion settings;
@@ -27,8 +32,6 @@ where advanced options include:
   -Xfriend-paths=<path>      Paths to output directories for friend modules (whose internals should be visible)
   -Xmultifile-parts-inherit  Compile multifile classes as a hierarchy of parts and facade
   -Xir-check-local-names     Check that names of local classes and anonymous objects are the same in the IR backend as in the old backend
-  -Xir-binary-with-stable-abi When using the IR backend, produce binaries which can be read by non-IR backend.
-                             The author is responsible for verifying that the resulting binaries do indeed have the correct ABI
   -Xmodule-path=<path>       Paths where to find Java 9+ modules
   -Xjava-package-prefix      Package prefix for Java files
   -Xjava-source-roots=<path> Paths to directories with Java source files
diff --git a/compiler/testData/codegen/box/annotations/kt25489.kt b/compiler/testData/codegen/box/annotations/kt25489.kt
new file mode 100644
index 00000000000..179ea9ab0c2
--- /dev/null
+++ b/compiler/testData/codegen/box/annotations/kt25489.kt
@@ -0,0 +1,36 @@
+// FILE: JavaImpl.java
+
+public class JavaImpl implements KotlinInterface {
+    private final String id;
+
+    JavaImpl(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String id() {
+        return id;
+    }
+}
+
+// FILE: JavaAnnotation.java
+
+public @interface JavaAnnotation {
+    public Class<?> as() default Void.class;
+}
+
+// FILE: kt25489.kt
+// TARGET_BACKEND: JVM
+// Note: if you wish to reproduce KT-25489, turn UL classes OFF
+
+@JavaAnnotation(`as` = JavaImpl::class)
+interface KotlinInterface : Identity
+
+interface Identity {
+    fun id(): String
+}
+
+fun box(): String {
+    val impl = JavaImpl("OK")
+    return impl.id()
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/bridges/kt24193.kt b/compiler/testData/codegen/box/bridges/kt24193.kt
new file mode 100644
index 00000000000..6bf7742329f
--- /dev/null
+++ b/compiler/testData/codegen/box/bridges/kt24193.kt
@@ -0,0 +1,13 @@
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: JVM
+
+interface Foo : Cloneable
+
+class Bar(val test: String) : Foo {
+    fun createClone(): Bar {
+        return this.clone() as Bar
+    }
+}
+
+fun box() =
+    Bar("OK").createClone().test
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/callableReference/kt16752.kt b/compiler/testData/codegen/box/callableReference/kt16752.kt
new file mode 100644
index 00000000000..b1b491aeed3
--- /dev/null
+++ b/compiler/testData/codegen/box/callableReference/kt16752.kt
@@ -0,0 +1,13 @@
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: JVM
+
+class Incrementer : (Int) -> Int by Int::inc
+
+fun box(): String {
+    val incr = Incrementer()
+
+    val test = incr(5)
+    if (test != 6) throw Exception("incr(5): $test")
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/callableReference/kt21014.kt b/compiler/testData/codegen/box/callableReference/kt21014.kt
new file mode 100644
index 00000000000..f866e9a2c14
--- /dev/null
+++ b/compiler/testData/codegen/box/callableReference/kt21014.kt
@@ -0,0 +1,21 @@
+// WITH_RUNTIME
+// IGNORE_BACKEND: JVM
+// IGNORE_LIGHT_ANALYSIS
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
+
+// JVM_TARGET: 1.8
+// ^ This test causes SIGSEGV on JDK 1.6 with old back-end.
+//   Running it on JDK 1.6 (even with IGNORE_BACKEND: JVM) would still crash corresponding JVM process.
+
+fun box(): String {
+    val ints = intArrayOf(1, 2, 3)
+
+    val test1 = IntArray::size.get(ints)
+    if (test1 != 3) throw Exception("IntArray::size.get(ints) != 3: $test1")
+
+    val test2 = with(ints, IntArray::size)
+    if (test2 != 3) throw Exception("with(ints, IntArray::size) != 3: $test2")
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/callableReference/kt21092a.kt b/compiler/testData/codegen/box/callableReference/kt21092a.kt
new file mode 100644
index 00000000000..579de21cd37
--- /dev/null
+++ b/compiler/testData/codegen/box/callableReference/kt21092a.kt
@@ -0,0 +1,26 @@
+// IGNORE_BACKEND: JVM
+// WITH_RUNTIME
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: PROPERTY_REFERENCES
+
+val <T> T.foo get() = 42
+
+class A
+
+inline class Z(val x: Int)
+
+fun box(): String {
+    val test1 = A::foo.get(A())
+    if (test1 != 42) throw Exception("test1: $test1")
+
+    val test2 = String::foo.get("")
+    if (test2 != 42) throw Exception("test2: $test2")
+
+    val test3 = Int::foo.get(1)
+    if (test3 != 42) throw Exception("test3: $test3")
+
+    val test4 = Z::foo.get(Z(1))
+    if (test4 != 42) throw Exception("test4: $test4")
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/callableReference/kt21092b.kt b/compiler/testData/codegen/box/callableReference/kt21092b.kt
new file mode 100644
index 00000000000..96593e9621c
--- /dev/null
+++ b/compiler/testData/codegen/box/callableReference/kt21092b.kt
@@ -0,0 +1,12 @@
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: JVM
+// WITH_RUNTIME
+
+class A<T>(val b: T)
+
+fun box(): String {
+    val test = A(1).b::javaClass.get().simpleName
+    if (test != "Integer") throw Exception("test: $test")
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
index 227e622dfa9..15e55a96663 100644
--- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithLongReceiver_ir.txt
@@ -3,8 +3,8 @@
 final class LambdaWithLongReceiverKt$box$1$1 {
     // source: 'lambdaWithLongReceiver.kt'
     enclosing method LambdaWithLongReceiverKt$box$1.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
+    private synthetic field J$0: long
     field label: int
-    private synthetic field p$: long
     inner (anonymous) class LambdaWithLongReceiverKt$box$1
     inner (anonymous) class LambdaWithLongReceiverKt$box$1$1
     method <init>(p0: kotlin.coroutines.Continuation): void
diff --git a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt
index f76c0eba8a5..4d64ec4f837 100644
--- a/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt
+++ b/compiler/testData/codegen/box/coroutines/bridges/lambdaWithMultipleParameters_ir.txt
@@ -3,12 +3,12 @@
 final class LambdaWithMultipleParametersKt$box$1$1 {
     // source: 'lambdaWithMultipleParameters.kt'
     enclosing method LambdaWithMultipleParametersKt$box$1.invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-    synthetic field a: java.lang.String
-    synthetic field b: long
-    synthetic field c: long
-    synthetic field d: long
-    synthetic field e: long
-    synthetic field f: long
+    synthetic field J$0: long
+    synthetic field J$1: long
+    synthetic field J$2: long
+    synthetic field J$3: long
+    synthetic field J$4: long
+    synthetic field L$0: java.lang.Object
     field label: int
     inner (anonymous) class LambdaWithMultipleParametersKt$box$1
     inner (anonymous) class LambdaWithMultipleParametersKt$box$1$1
diff --git a/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt b/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt
index 4d517beeff1..559237c5ce5 100644
--- a/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt
+++ b/compiler/testData/codegen/box/funInterface/intersectionTypeToFunInterfaceConversion.kt
@@ -1,6 +1,5 @@
 // DONT_TARGET_EXACT_BACKEND: WASM
 // WASM_MUTE_REASON: SAM_CONVERSIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
diff --git a/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt b/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt
index ab655dd96a2..514727ebe19 100644
--- a/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt
+++ b/compiler/testData/codegen/box/funInterface/subtypeOfFunctionalTypeToFunInterfaceConversion.kt
@@ -1,6 +1,5 @@
 // DONT_TARGET_EXACT_BACKEND: WASM
 // WASM_MUTE_REASON: SAM_CONVERSIONS
-// IGNORE_BACKEND_FIR: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 
diff --git a/compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt b/compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt
similarity index 100%
rename from compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt
rename to compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt
diff --git a/compiler/testData/codegen/box/builderInference/kt41164.kt b/compiler/testData/codegen/box/inference/builderInference/kt41164.kt
similarity index 100%
rename from compiler/testData/codegen/box/builderInference/kt41164.kt
rename to compiler/testData/codegen/box/inference/builderInference/kt41164.kt
diff --git a/compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt b/compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt
similarity index 100%
rename from compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt
rename to compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt
new file mode 100644
index 00000000000..d507d499d1a
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt
@@ -0,0 +1,114 @@
+// WITH_RUNTIME
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+fun <T> materialize() = null as T
+
+interface FlowCollector<in T> {}
+
+@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select(::bar2, ::foo2)
+        inv()
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll31(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll61(): Flow<String> {
+    return flow {
+        val inv = ::bar2
+        inv
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2!!
+        inv()
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 in setOf(::foo2)
+        inv
+    }
+}
+
+fun poll91(): Flow<String> {
+    return flow {
+        val inv = ::foo2 in setOf(::foo2)
+        inv
+    }
+}
+
+fun box(): String {
+    poll01()
+    poll1(true)
+    poll11(true)
+    poll21(true)
+    poll31(true)
+    poll41()
+    poll51()
+    poll61()
+    poll71()
+    poll81()
+    poll91()
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt
new file mode 100644
index 00000000000..db17e668315
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt
@@ -0,0 +1,55 @@
+// WITH_RUNTIME
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+fun <T> materialize() = null as T
+
+interface FlowCollector<in T> {}
+
+@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun box(): String {
+    poll1(true)
+    poll11(true)
+    poll41()
+    poll51()
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
new file mode 100644
index 00000000000..d507d499d1a
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
@@ -0,0 +1,114 @@
+// WITH_RUNTIME
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+fun <T> materialize() = null as T
+
+interface FlowCollector<in T> {}
+
+@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select(::bar2, ::foo2)
+        inv()
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll31(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll61(): Flow<String> {
+    return flow {
+        val inv = ::bar2
+        inv
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2!!
+        inv()
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 in setOf(::foo2)
+        inv
+    }
+}
+
+fun poll91(): Flow<String> {
+    return flow {
+        val inv = ::foo2 in setOf(::foo2)
+        inv
+    }
+}
+
+fun box(): String {
+    poll01()
+    poll1(true)
+    poll11(true)
+    poll21(true)
+    poll31(true)
+    poll41()
+    poll51()
+    poll61()
+    poll71()
+    poll81()
+    poll91()
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
new file mode 100644
index 00000000000..17acd4c16a4
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
@@ -0,0 +1,46 @@
+// WITH_RUNTIME
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+fun <T> materialize() = null as T
+
+interface FlowCollector<in T> {}
+
+@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 in setOf(::foo2)
+        inv
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 in setOf(::foo4)
+        inv
+    }
+}
+
+fun box(): String {
+    poll81()
+    poll83()
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt
new file mode 100644
index 00000000000..5b4ac730f0a
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt
@@ -0,0 +1,210 @@
+// WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+interface FlowCollector<in T> {}
+
+@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll0(): Flow<String> {
+    return flow {
+        val inv = select({}, {})
+        inv()
+    }
+}
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select({ 1 }, { 1f })
+        inv()
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { {} } else { {} }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { { 1 } } else { { 1f } }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) ({ }) else ({ })
+        inv()
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) ({ 1 }) else ({ 1f })
+        inv()
+    }
+}
+
+fun poll2(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> {{}} else -> {{}} }
+        inv()
+    }
+}
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> {{1}} else -> {{1f}} }
+        inv()
+    }
+}
+
+fun poll22(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ({}) else -> ({}) }
+        inv()
+    }
+}
+
+fun poll23(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ({1}) else -> ({1f}) }
+        inv()
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { {} } finally { {} }
+        inv()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { {1} } finally { {1f} }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { ({1}) } finally { ({1f}) }
+        inv()
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ({}) } finally { ({}) }
+        inv()
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { {1} } catch (e: Exception) { {1f} } finally { {} }
+        inv()
+    }
+}
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = {}!!
+        inv()
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = {1f}!!
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = {{}}!!
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ({})!!
+        inv
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = {} in setOf({})
+        inv
+    }
+}
+
+fun poll82(): Flow<String> {
+    return flow {
+        val inv = {{}} in setOf({{}})
+        inv
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = {({})} in setOf({({})})
+        inv
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = {({"1"})} in setOf({({"1f"})})
+        inv
+    }
+}
+
+fun poll86(): Flow<String> {
+    return flow {
+        val inv = {({"1"})}!! in setOf({({"1f"})})!!
+        inv
+    }
+}
+
+fun box(): String {
+    poll0()
+    poll01()
+    poll1(true)
+    poll11(true)
+    poll12(true)
+    poll13(true)
+    poll2(true)
+    poll21(true)
+    poll22(true)
+    poll23(true)
+    poll4()
+    poll41()
+    poll42()
+    poll43()
+    poll5()
+    poll7()
+    poll71()
+    poll72()
+    poll73()
+    poll81()
+    poll82()
+    poll83()
+    poll85()
+    poll86()
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt b/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt
similarity index 100%
rename from compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt
rename to compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt
diff --git a/compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt b/compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt
similarity index 100%
rename from compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt
rename to compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt
diff --git a/compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt b/compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt
similarity index 100%
rename from compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt
rename to compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt
diff --git a/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt b/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt
new file mode 100644
index 00000000000..6f05546a53b
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt
@@ -0,0 +1,22 @@
+// WITH_RUNTIME
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+operator fun <T> SequenceScope<String>.plusAssign(x: SequenceScope<T>) {}
+
+@OptIn(ExperimentalTypeInference::class)
+
+fun <T> mySequence(@BuilderInference block: suspend SequenceScope<T>.() -> Unit): Sequence<T> = Sequence { iterator(block) }
+
+fun main() {
+    val y: Sequence<String> = mySequence {
+        yield("result")
+        this += this
+    }
+}
+
+fun box(): String {
+    main()
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt b/compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt
new file mode 100644
index 00000000000..6f23813e1da
--- /dev/null
+++ b/compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt
@@ -0,0 +1,126 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// DONT_TARGET_EXACT_BACKEND: WASM
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+fun <K> bar4(): K = null as K
+fun <K> foo4(): K = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+fun poll1(flag: Boolean): Any? {
+    val inv = if (flag) { ::bar2 } else { ::foo2 }
+    return inv()
+}
+
+fun poll11(flag: Boolean): Any? {
+    val inv = if (flag) { ::bar2 } else { ::foo2 }
+    return inv()
+}
+
+fun poll16(flag: Boolean): Any? {
+    val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+    return inv()
+}
+
+fun poll21(flag: Boolean): Any? {
+    val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+    return inv()
+}
+
+fun poll25(flag: Boolean): Any? {
+    val inv = when (flag) { true -> ::Foo6 else -> ::Foo6 }
+    return inv
+}
+
+fun poll31(flag: Boolean): Any? {
+    val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+    return inv()
+}
+
+fun poll35(flag: Boolean): Any? {
+    val inv = when (flag) { true -> ::Foo6 false -> ::Foo6 }
+    return inv
+}
+
+fun poll41(): Any? {
+    val inv = try { ::bar2 } finally { ::foo2 }
+    return inv()
+}
+
+fun poll45(): Any? {
+    val inv = try { ::Foo6 } finally { ::Foo6 }
+    return inv()
+}
+
+fun poll51(): Any? {
+    val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+    return inv()
+}
+
+fun poll55(): Any? {
+    val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+    return inv()
+}
+
+fun poll61(): Any? {
+    val inv = ::bar2
+    return inv
+}
+
+fun poll65(): Any? {
+    val inv = ::Foo6
+    return inv
+}
+
+fun poll71(): Any? {
+    val inv = ::bar2!!
+    return inv()
+}
+
+fun poll75(): Any? {
+    val inv = ::Foo6!!
+    return inv
+}
+
+fun poll81(): Any? {
+    val inv = ::bar2 in setOf(::foo2)
+    return inv
+}
+
+fun poll85(): Any? {
+    val inv = ::Foo6 in setOf(::Foo6)
+    return inv
+}
+
+fun box(): String {
+    poll1(true)
+    poll11(true)
+    poll16(true)
+    poll21(true)
+    poll25(true)
+    poll31(true)
+    poll35(true)
+    poll41()
+    poll45()
+    poll51()
+    poll55()
+    poll61()
+    poll65()
+    poll71()
+    poll75()
+    poll81()
+    poll85()
+    return "OK"
+}
+
diff --git a/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt b/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt
index 2889cdc5a44..f225a5e7f76 100644
--- a/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt
+++ b/compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt
@@ -1,6 +1,3 @@
-// DONT_TARGET_EXACT_BACKEND: WASM
-// WASM_MUTE_REASON: IGNORED_IN_JS
-// IGNORE_BACKEND: JS_IR
 
 inline class IC(val i: Int) {
     init {
diff --git a/compiler/testData/codegen/box/inlineClasses/initBlock.kt b/compiler/testData/codegen/box/inlineClasses/initBlock.kt
index cda7406d835..30fbf49077d 100644
--- a/compiler/testData/codegen/box/inlineClasses/initBlock.kt
+++ b/compiler/testData/codegen/box/inlineClasses/initBlock.kt
@@ -1,6 +1,3 @@
-// DONT_TARGET_EXACT_BACKEND: WASM
-// WASM_MUTE_REASON: IGNORED_IN_JS
-// IGNORE_BACKEND: JS_IR
 
 inline class SingleInitBlock(val s: String) {
     init {
diff --git a/compiler/testData/codegen/box/inlineClasses/multifileClass.kt b/compiler/testData/codegen/box/inlineClasses/multifileClass.kt
index d3174796a36..81188f59cab 100644
--- a/compiler/testData/codegen/box/inlineClasses/multifileClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/multifileClass.kt
@@ -1,5 +1,4 @@
 // WITH_RUNTIME
-// IGNORE_BACKEND: JVM
 // DONT_TARGET_EXACT_BACKEND: WASM
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt
new file mode 100644
index 00000000000..014c03df113
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt
@@ -0,0 +1,35 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+// FILE: kt18911.kt
+fun testNullString() {
+    try {
+        val t1 = J.nullString()::capitalize
+        throw Exception("'J.nullString()::capitalize' should throw")
+    } catch (e: NullPointerException) {}
+}
+
+fun testNotNullString() {
+    try {
+        val t1 = J.notNullString()::capitalize
+        throw Exception("'J.notNullString()::capitalize' should throw")
+    } catch (e: NullPointerException) {}
+}
+
+fun box(): String {
+    testNullString()
+    testNotNullString()
+    return "OK"
+}
+
+// FILE: J.java
+import org.jetbrains.annotations.NotNull;
+
+public class J {
+    public static String nullString() {
+        return null;
+    }
+
+    public static @NotNull String notNullString() {
+        return null;
+    }
+}
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt
new file mode 100644
index 00000000000..989964b04be
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt
@@ -0,0 +1,28 @@
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: JVM
+// WITH_RUNTIME
+// FILE: kt24258.kt
+
+val lazyNullString: String by lazy { J.nullString() }
+
+
+fun testLazyNullString() {
+    try {
+        val s: String = lazyNullString
+        throw Exception("'val s: String = lazyNullString' should throw NullPointerException")
+    } catch (e: NullPointerException) {
+    }
+}
+
+fun box(): String {
+    testLazyNullString()
+
+    return "OK"
+}
+
+// FILE: J.java
+public class J {
+    public static String nullString() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt b/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt
new file mode 100644
index 00000000000..cff3b9d8d14
--- /dev/null
+++ b/compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt
@@ -0,0 +1,30 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+// FILE: kt24258nn.kt
+
+val lazyNotNullString: String by lazy { J.nullNotNullString() }
+
+
+fun testLazyNullNotNullString() {
+    try {
+        val s: String = lazyNotNullString
+        throw Exception("'val s: String = lazyNotNullString' should throw NullPointerException")
+    } catch (e: NullPointerException) {
+    }
+}
+
+fun box(): String {
+    testLazyNullNotNullString()
+
+    return "OK"
+}
+
+// FILE: J.java
+import org.jetbrains.annotations.NotNull;
+
+public class J {
+    @NotNull
+    public static String nullNotNullString() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvmName/kt23974.kt b/compiler/testData/codegen/box/jvmName/kt23974.kt
new file mode 100644
index 00000000000..fd15ca094a9
--- /dev/null
+++ b/compiler/testData/codegen/box/jvmName/kt23974.kt
@@ -0,0 +1,12 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+
+@Suppress("x")
+@get:JvmName("foo")
+val vo get() = "O"
+
+@Suppress("x")
+@get:JvmName("bar")
+val vk = "K"
+
+fun box() = vo + vk
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt b/compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt
new file mode 100644
index 00000000000..6def37ebafa
--- /dev/null
+++ b/compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt
@@ -0,0 +1,11 @@
+// IGNORE_BACKEND: JVM
+open class Base(val fn: () -> String)
+
+class Test(x: String) :
+    Base({
+             class Local(val t: String = x)
+             Local().t
+         })
+
+fun box() =
+    Test("OK").fn()
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/localClasses/kt10835.kt b/compiler/testData/codegen/box/localClasses/kt10835.kt
new file mode 100644
index 00000000000..f538069e73e
--- /dev/null
+++ b/compiler/testData/codegen/box/localClasses/kt10835.kt
@@ -0,0 +1,16 @@
+// IGNORE_BACKEND: JVM
+class X(val x: String) {
+    open inner class Y {
+        fun foo() = x
+    }
+
+    fun foo(s: String): String {
+        with(X(s+x)) {
+            val obj = object : Y() {}
+            return obj.foo()
+        }
+    }
+}
+
+fun box() =
+    X("K").foo("O")
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/localClasses/kt10835a.kt b/compiler/testData/codegen/box/localClasses/kt10835a.kt
new file mode 100644
index 00000000000..0ee201b54e9
--- /dev/null
+++ b/compiler/testData/codegen/box/localClasses/kt10835a.kt
@@ -0,0 +1,22 @@
+// IGNORE_BACKEND: JVM
+fun <T, R> with2(receiver: T, block: T.() -> R): R {
+    return receiver.block()
+}
+
+class X(val x: String) {
+    open inner class Y {
+        fun foo() = x
+    }
+
+    fun foo(s: String): String {
+        var t = ""
+        with2(X(s+x)) {
+            val obj = object : Y() {}
+            t = obj.foo()
+        }
+        return t
+    }
+}
+
+fun box() =
+    X("K").foo("O")
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt b/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt
new file mode 100644
index 00000000000..ff7785b0e0c
--- /dev/null
+++ b/compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt
@@ -0,0 +1,28 @@
+// KT-44054
+
+enum class Enum {
+    Entry1,
+    Entry2
+}
+
+class Outer {
+    fun fooCaller(): Enum = obj.foo()
+
+    private abstract inner class Inner<T>(val default: T) {
+        fun foo(): T {
+            return default
+        }
+    }
+
+    private val obj = object : Inner<Enum>(Enum.Entry1) {
+        fun bar(): Enum {
+            return default
+        }
+    }
+}
+
+fun box(): String {
+    val o = Outer()
+    if (o.fooCaller() != Enum.Entry1) return "Fail"
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt b/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt
new file mode 100644
index 00000000000..2a4a870eed2
--- /dev/null
+++ b/compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt
@@ -0,0 +1,46 @@
+// KT-44050
+
+enum class Enum {
+    Entry1() {
+        fun bogus() = 42
+    },
+    Entry2() {
+        fun bogus() = 42
+    }
+}
+
+class Outer {
+    fun barCaller(): Enum = obj1.bar()
+    fun bazCaller(): Enum = obj2.baz()
+
+    private abstract inner class Inner<T>(val default: T) {
+        abstract fun foo()
+    }
+
+    private val obj1 = object : Inner<Enum>(Enum.Entry1) {
+        override fun foo() {
+            TODO("not related")
+        }
+
+        fun bar(): Enum {
+            return default
+        }
+    }
+
+    private val obj2 = object : Inner<Enum>(Enum.Entry2) {
+        override fun foo() {
+            TODO("not related")
+        }
+
+        fun baz(): Enum {
+            return default
+        }
+    }
+}
+
+fun box(): String {
+    val o = Outer()
+    if (o.barCaller() != Enum.Entry1) return "Fail1"
+    if (o.bazCaller() != Enum.Entry2) return "Fail2"
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/properties/lateinit/kt30548.kt b/compiler/testData/codegen/box/properties/lateinit/kt30548.kt
new file mode 100644
index 00000000000..994f2a7a1d1
--- /dev/null
+++ b/compiler/testData/codegen/box/properties/lateinit/kt30548.kt
@@ -0,0 +1,21 @@
+// DONT_TARGET_EXACT_BACKEND: WASM
+// WASM_MUTE_REASON: EXCEPTIONS_NOT_IMPLEMENTED
+// IGNORE_BACKEND: JVM
+
+class Test {
+    companion object {
+        private lateinit var INSTANCE: String
+        fun foo() {
+            INSTANCE
+        }
+    }
+}
+
+fun box(): String {
+    try {
+        Test.foo()
+        return "'Test.foo()' should throw"
+    } catch (e: Exception) {
+        return "OK"
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/sam/passSubtypeOfFunctionSamConversion.kt b/compiler/testData/codegen/box/sam/passSubtypeOfFunctionSamConversion.kt
index d2b87472604..11948e9ce26 100644
--- a/compiler/testData/codegen/box/sam/passSubtypeOfFunctionSamConversion.kt
+++ b/compiler/testData/codegen/box/sam/passSubtypeOfFunctionSamConversion.kt
@@ -1,5 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND_FIR: JVM_IR
 
 // FILE: a.kt
 
diff --git a/compiler/testData/codegen/boxError/semantic/reifiedWithWrongArguments.kt b/compiler/testData/codegen/boxError/semantic/reifiedWithWrongArguments.kt
new file mode 100644
index 00000000000..abd2ad617d6
--- /dev/null
+++ b/compiler/testData/codegen/boxError/semantic/reifiedWithWrongArguments.kt
@@ -0,0 +1,91 @@
+// ERROR_POLICY: SEMANTIC
+
+// MODULE: lib
+// FILE: t.kt
+import kotlin.reflect.KClass
+
+var l = ""
+fun log(s: String, r: Any? = null): Any? {
+    l += s + ";"
+    return r
+}
+
+inline fun assertFails(block: () -> Unit) {
+    try {
+        block()
+    } catch (e: Throwable) {
+        return
+    }
+
+    fail("Expected an exception to be thrown, but was completed successfully.")
+}
+
+fun <reified R> getKClassFromRaifed(b: Boolean): KClass<R>? {
+    log("getKClassFromRaifed($b)")
+    if (b) return R::class
+    log("getKClassFromRaifed: null")
+    return null
+}
+
+fun <T> getKClassFromT(b: Boolean): KClass<T>? {
+    log("getKClassFromT($b)")
+    if (b) return T::class
+    log("getKClassFromT: null")
+    return null
+}
+
+fun getKClassFromErrorType(b: Boolean): KClass<*>? {
+    log("getKClassFromErrorType($b)")
+    if (b) return ErrT::class
+    log("getKClassFromErrorType: null")
+    return null
+}
+
+inline fun <reified R, T> test1() {
+    assertFails { getKClassFromRaifed<R>(true) }
+    assertFails { getKClassFromRaifed<T>(true) }
+    assertFails { getKClassFromRaifed<String>(true) }
+    assertFails { getKClassFromT<R>(true) }
+    assertFails { getKClassFromT<T>(true) }
+    assertFails { getKClassFromT<String>(true) }
+    assertFails { getKClassFromErrorType(true) }
+    getKClassFromRaifed<R>(false)
+    getKClassFromRaifed<T>(false)
+    getKClassFromRaifed<String>(false)
+    getKClassFromT<R>(false)
+    getKClassFromT<T>(false)
+    getKClassFromT<String>(false)
+    getKClassFromErrorType(false)
+}
+
+inline fun <reified R> foo(a: Any, b: Any, c: Any): KClass<*>? {
+    log("foo")
+    return R::class
+}
+
+fun <T> testSideEffects() {
+    assertFails { foo<T>(log("1", 1), log("2", 2), log("3", 3)) }
+    foo<String>(log("a", 1), log("b", 2), log("c", 3))
+}
+
+// MODULE: main(lib)
+// FILE: b.kt
+
+fun box(): String {
+    test1<Int, Short>()
+    testSideEffects()
+
+
+    val expected = "getKClassFromRaifed(true);getKClassFromRaifed(true);getKClassFromRaifed(true);" +
+            "getKClassFromT(true);getKClassFromT(true);getKClassFromT(true);" +
+            "getKClassFromErrorType(true);" +
+            "getKClassFromRaifed(false);getKClassFromRaifed: null;getKClassFromRaifed(false);getKClassFromRaifed: null;getKClassFromRaifed(false);getKClassFromRaifed: null;" +
+            "getKClassFromT(false);getKClassFromT: null;getKClassFromT(false);getKClassFromT: null;getKClassFromT(false);getKClassFromT: null;" +
+            "getKClassFromErrorType(false);getKClassFromErrorType: null;" +
+            "1;2;3;foo;a;b;c;foo;"
+
+    if (l != expected)
+        return "l = $l"
+
+    return "OK"
+}
diff --git a/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.kt b/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.kt
index b7284b04c99..4cb9cfd9244 100644
--- a/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.kt
+++ b/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.kt
@@ -16,3 +16,23 @@ fun <T> test() {
 
     x.foo<Any>()
 }
+
+
+class Test {
+    fun <T> test() {
+        val x = object {
+            fun <S1> foo() {}
+
+            fun <S2> S2.ext() {}
+
+            val <S3> S3.extVal
+                get() = 1
+
+            var <S4> S4.extVar
+                get() = 1
+                set(value) {}
+        }
+
+        x.foo<Any>()
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.txt b/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.txt
index d5bfd636f73..dc44239bbfd 100644
--- a/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.txt
+++ b/compiler/testData/codegen/bytecodeListing/anonymousObjectInGenericFun.txt
@@ -17,3 +17,24 @@ public final class<null>  AnonymousObjectInGenericFunKt {
     public final static <<T:Ljava/lang/Object;>()V> method test(): void
     inner (anonymous) class AnonymousObjectInGenericFunKt$test$x$1
 }
+
+@kotlin.Metadata
+public final class<null>  Test$test$x$1 {
+    // source: 'anonymousObjectInGenericFun.kt'
+    public final <<S1:Ljava/lang/Object;>()V> method foo(): void
+    public final <<S2:Ljava/lang/Object;>(TS2;)V> method ext(p0: java.lang.Object): void
+    public final <<S3:Ljava/lang/Object;>(TS3;)I> method getExtVal(p0: java.lang.Object): int
+    public final <<S4:Ljava/lang/Object;>(TS4;)I> method getExtVar(p0: java.lang.Object): int
+    public final <<S4:Ljava/lang/Object;>(TS4;I)V> method setExtVar(p0: java.lang.Object, p1: int): void
+    <null> method <init>(): void
+    enclosing method Test.test()V
+    inner (anonymous) class Test$test$x$1
+}
+
+@kotlin.Metadata
+public final class<null>  Test {
+    // source: 'anonymousObjectInGenericFun.kt'
+    public final <<T:Ljava/lang/Object;>()V> method test(): void
+    public <null> method <init>(): void
+    inner (anonymous) class Test$test$x$1
+}
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt
index ccdab5c96ac..e6c1debac5e 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/coroutineFields_ir.txt
@@ -44,10 +44,9 @@ final class CoroutineFieldsKt$box$1 {
     enclosing method CoroutineFieldsKt.box()Ljava/lang/String;
     synthetic final field $result: kotlin.jvm.internal.Ref$ObjectRef
     field J$0: long
-    field L$0: java.lang.Object
+    private synthetic field L$0: java.lang.Object
     field L$1: java.lang.Object
     field label: int
-    private synthetic field p$: Controller
     inner (anonymous) class CoroutineFieldsKt$box$1
     method <init>(p0: kotlin.jvm.internal.Ref$ObjectRef, p1: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt
index f2782e96fed..f51bbbbc24f 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/booleanParameter_ir.txt
@@ -20,7 +20,7 @@ final class BooleanParameterKt$box$1 {
 final class BooleanParameterKt$box$lambda$1 {
     // source: 'booleanParameter.kt'
     enclosing method BooleanParameterKt.box()Ljava/lang/String;
-    synthetic field it: boolean
+    synthetic field Z$0: boolean
     field label: int
     inner (anonymous) class BooleanParameterKt$box$lambda$1
     method <init>(p0: kotlin.coroutines.Continuation): void
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt
index c9795b136d8..3f643f55fc7 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/component1_ir.txt
@@ -3,8 +3,8 @@
 final class Component1Kt$test$1 {
     // source: 'component1.kt'
     enclosing method Component1Kt.test()V
+    private synthetic field L$0: java.lang.Object
     field label: int
-    private synthetic field p$: Foo
     inner (anonymous) class Component1Kt$test$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
diff --git a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt
index b3850efd1d4..8d7f6c0f016 100644
--- a/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/coroutines/spilling/field_ir.txt
@@ -3,8 +3,8 @@
 final class FieldKt$test$1 {
     // source: 'field.kt'
     enclosing method FieldKt.test()V
+    private synthetic field L$0: java.lang.Object
     field label: int
-    private synthetic field p$: Foo
     inner (anonymous) class FieldKt$test$1
     method <init>(p0: kotlin.coroutines.Continuation): void
     public final @org.jetbrains.annotations.NotNull method create(@org.jetbrains.annotations.Nullable p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.coroutines.Continuation): kotlin.coroutines.Continuation
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.kt
new file mode 100644
index 00000000000..e5b656a7f47
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.kt
@@ -0,0 +1,8 @@
+inline class X(val x: Any?)
+
+interface IFoo<out T : X?> {
+    fun foo(): T
+}
+
+fun <T : X> foo(x: T) {}
+
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.txt
new file mode 100644
index 00000000000..3a3d6d0a10e
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.txt
@@ -0,0 +1,30 @@
+@kotlin.Metadata
+public final class GenericChildKt {
+    // source: 'genericChild.kt'
+    public final static method foo-p_PkZps(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void
+}
+
+@kotlin.Metadata
+public interface IFoo {
+    // source: 'genericChild.kt'
+    public abstract method foo-HezMcGQ(): X
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class X {
+    // source: 'genericChild.kt'
+    private final @org.jetbrains.annotations.Nullable field x: java.lang.Object
+    private synthetic method <init>(p0: java.lang.Object): void
+    public synthetic final static method box-impl(p0: java.lang.Object): X
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.Nullable p0: java.lang.Object): java.lang.Object
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object): boolean
+    public final @org.jetbrains.annotations.Nullable method getX(): java.lang.Object
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.Object): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.Object): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.Object
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt
index 1206f0318fa..43b745b330f 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericFunInterface.txt
@@ -23,7 +23,9 @@ final class<null>  TKt$sam$Sam$0 {
     public synthetic final <null> method get(): java.lang.Object
     public <null> method getFunctionDelegate(): kotlin.Function
     public <null> method hashCode(): int
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -33,4 +35,5 @@ public final class<null>  TKt {
     public final static <<T:Ljava/lang/Object;>()TT;> method genericSam(): java.lang.Object
     public final static <<T:Ljava/lang/Object;>(LSam<TT;>;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object
     inner (anonymous) class TKt$genericSam$1
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt
index 84937e9c843..03ec0d56cf6 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefGenericSamInterface.txt
@@ -14,7 +14,9 @@ final class<null>  TKt$sam$Sam$0 {
     // source: 't.kt'
     <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method get(): java.lang.Object
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -23,4 +25,5 @@ public final class<null>  TKt {
     public final static <<T:Ljava/lang/Object;>()TT;> method foo(): java.lang.Object
     public final static <<T:Ljava/lang/Object;>()TT;> method genericSam(): java.lang.Object
     inner (anonymous) class TKt$genericSam$1
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt
index 9a609621556..ba3956bdcc3 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedFunInterface.txt
@@ -12,7 +12,9 @@ final class<null>  TKt$sam$Sam$0 {
     public synthetic final <null> method get(): java.lang.Object
     public <null> method getFunctionDelegate(): kotlin.Function
     public <null> method hashCode(): int
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -33,5 +35,6 @@ public final class<null>  TKt {
     public final static <<T:Ljava/lang/Object;>(LSam<TT;>;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object
     public final static @org.jetbrains.annotations.NotNull <null> method foo(): java.lang.String
     public final static @org.jetbrains.annotations.NotNull <null> method specializedSam(): java.lang.String
+    inner (anonymous) class TKt$sam$Sam$0
     inner (anonymous) class TKt$specializedSam$1
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt
index 9bd3589ccdd..2102c82f6e1 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/callableRefSpecializedSamInterface.txt
@@ -3,7 +3,9 @@ final class<null>  TKt$sam$Sam$0 {
     // source: 't.kt'
     <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method get(): java.lang.Object
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -23,5 +25,6 @@ public final class<null>  TKt {
     // source: 't.kt'
     public final static @org.jetbrains.annotations.NotNull <null> method foo(): java.lang.String
     public final static @org.jetbrains.annotations.NotNull <null> method specializedSam(): java.lang.String
+    inner (anonymous) class TKt$sam$Sam$0
     inner (anonymous) class TKt$specializedSam$1
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt
index af2dd62d6a2..ddf6ef8d381 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface.txt
@@ -12,7 +12,9 @@ final class<null>  TKt$sam$Sam$0 {
     public synthetic final <null> method get(): java.lang.Object
     public <null> method getFunctionDelegate(): kotlin.Function
     public <null> method hashCode(): int
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -20,4 +22,5 @@ public final class<null>  TKt {
     // source: 't.kt'
     public final static <<T:Ljava/lang/Object;>(LSam<TT;>;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object
     public final static <<T:Ljava/lang/Object;>(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface_ir.txt
index 82459ca38ac..dd96882e1a7 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/genericFunInterface_ir.txt
@@ -8,12 +8,13 @@ public interface<<T:Ljava/lang/Object;>Ljava/lang/Object;>  Sam {
 final class<null>  TKt$sam$Sam$0 {
     // source: 't.kt'
     public final @org.jetbrains.annotations.NotNull <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function
-    <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
+    <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public final <null> method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public synthetic final <null> method get(): java.lang.Object
     public final <null> method hashCode(): int
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
-    final inner class TKt$sam$Sam$0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -21,5 +22,5 @@ public final class<null>  TKt {
     // source: 't.kt'
     public final static <<T:Ljava/lang/Object;>(LSam<TT;>;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object
     public final static <<T:Ljava/lang/Object;>(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object
-    final inner class TKt$sam$Sam$0
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt
index febf11f0f65..efb77081001 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.txt
@@ -3,11 +3,14 @@ final class<null>  TKt$sam$Sam$0 {
     // source: 't.kt'
     <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method get(): java.lang.Object
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
 public final class<null>  TKt {
     // source: 't.kt'
     public final static <<T:Ljava/lang/Object;>(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface_ir.txt
deleted file mode 100644
index 8d415343607..00000000000
--- a/compiler/testData/codegen/bytecodeListing/sam/genericSamInterface_ir.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@kotlin.Metadata
-final class<null>  TKt$sam$Sam$0 {
-    // source: 't.kt'
-    <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
-    public synthetic final <null> method get(): java.lang.Object
-    private synthetic final field <null> function: kotlin.jvm.functions.Function0
-    final inner class TKt$sam$Sam$0
-}
-
-@kotlin.Metadata
-public final class<null>  TKt {
-    // source: 't.kt'
-    public final static <<T:Ljava/lang/Object;>(Lkotlin/jvm/functions/Function0<+TT;>;)TT;> method genericSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Object
-    final inner class TKt$sam$Sam$0
-}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/kt16650.kt b/compiler/testData/codegen/bytecodeListing/sam/kt16650.kt
new file mode 100644
index 00000000000..3ae957c0fa2
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/kt16650.kt
@@ -0,0 +1,16 @@
+// WITH_SIGNATURES
+// FILE: t.kt
+fun main(x: DataStream<Int>) {
+    x.keyBy({ it.toLong() })
+    x.keyBy(KeySelector<Int, Long>{ it.toLong() })
+}
+
+// FILE: KeySelector.java
+public interface KeySelector<IN, KEY> {
+    KEY getKey(IN value);
+}
+
+// FILE: DataStream.java
+public class DataStream<T> {
+    public <K> void keyBy(KeySelector<T,K> key) {}
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt b/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt
new file mode 100644
index 00000000000..9a38d4261c5
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/kt16650.txt
@@ -0,0 +1,31 @@
+@kotlin.Metadata
+final class<<IN:Ljava/lang/Object;KEY:Ljava/lang/Object;>Ljava/lang/Object;LKeySelector<Ljava/lang/Integer;Ljava/lang/Long;>;>  TKt$main$1 {
+    // source: 't.kt'
+    static <null> method <clinit>(): void
+    <null> method <init>(): void
+    public final <null> method getKey(p0: java.lang.Integer): java.lang.Long
+    public synthetic bridge <null> method getKey(p0: java.lang.Object): java.lang.Object
+    enclosing method TKt.main(LDataStream;)V
+    public final static field <null> INSTANCE: TKt$main$1
+    inner (anonymous) class TKt$main$1
+}
+
+@kotlin.Metadata
+final class<<IN:Ljava/lang/Object;KEY:Ljava/lang/Object;>Ljava/lang/Object;LKeySelector<Ljava/lang/Integer;Ljava/lang/Long;>;>  TKt$main$2 {
+    // source: 't.kt'
+    static <null> method <clinit>(): void
+    <null> method <init>(): void
+    public final <null> method getKey(p0: java.lang.Integer): java.lang.Long
+    public synthetic bridge <null> method getKey(p0: java.lang.Object): java.lang.Object
+    enclosing method TKt.main(LDataStream;)V
+    public final static field <null> INSTANCE: TKt$main$2
+    inner (anonymous) class TKt$main$2
+}
+
+@kotlin.Metadata
+public final class<null>  TKt {
+    // source: 't.kt'
+    public final static <(LDataStream<Ljava/lang/Integer;>;)V> method main(@org.jetbrains.annotations.NotNull p0: DataStream): void
+    inner (anonymous) class TKt$main$1
+    inner (anonymous) class TKt$main$2
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/kt16650_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/kt16650_ir.txt
new file mode 100644
index 00000000000..50b30869177
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/kt16650_ir.txt
@@ -0,0 +1,31 @@
+@kotlin.Metadata
+final class<<IN:Ljava/lang/Object;KEY:Ljava/lang/Object;>Ljava/lang/Object;LKeySelector<Ljava/lang/Integer;Ljava/lang/Long;>;>  TKt$main$1 {
+    // source: 't.kt'
+    static <null> method <clinit>(): void
+    <null> method <init>(): void
+    public final <null> method getKey(p0: java.lang.Integer): java.lang.Long
+    public synthetic bridge <null> method getKey(p0: java.lang.Object): java.lang.Object
+    enclosing method TKt.main(LDataStream;)V
+    public final static field <LTKt$main$1<TIN;TKEY;>;> INSTANCE: TKt$main$1
+    inner (anonymous) class TKt$main$1
+}
+
+@kotlin.Metadata
+final class<<IN:Ljava/lang/Object;KEY:Ljava/lang/Object;>Ljava/lang/Object;LKeySelector<Ljava/lang/Integer;Ljava/lang/Long;>;>  TKt$main$2 {
+    // source: 't.kt'
+    static <null> method <clinit>(): void
+    <null> method <init>(): void
+    public final <null> method getKey(p0: java.lang.Integer): java.lang.Long
+    public synthetic bridge <null> method getKey(p0: java.lang.Object): java.lang.Object
+    enclosing method TKt.main(LDataStream;)V
+    public final static field <LTKt$main$2<TIN;TKEY;>;> INSTANCE: TKt$main$2
+    inner (anonymous) class TKt$main$2
+}
+
+@kotlin.Metadata
+public final class<null>  TKt {
+    // source: 't.kt'
+    public final static <(LDataStream<Ljava/lang/Integer;>;)V> method main(@org.jetbrains.annotations.NotNull p0: DataStream): void
+    inner (anonymous) class TKt$main$1
+    inner (anonymous) class TKt$main$2
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.kt b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.kt
new file mode 100644
index 00000000000..9db99e321b9
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.kt
@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+
+class A {
+    fun test1() {
+        val f = { }
+        val t1 = Runnable(f)
+        val t2 = Runnable(f)
+    }
+}
+
+class B {
+    fun test2() {
+        val f = { }
+        val t1 = Runnable(f)
+        val t2 = Runnable(f)
+    }
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt
new file mode 100644
index 00000000000..17ce13004a7
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.txt
@@ -0,0 +1,50 @@
+@kotlin.Metadata
+final class A$sam$java_lang_Runnable$0 {
+    // source: 'reusedSamWrapperClasses.kt'
+    enclosing class A
+    private synthetic final field function: kotlin.jvm.functions.Function0
+    inner (anonymous) class A$sam$java_lang_Runnable$0
+    method <init>(p0: kotlin.jvm.functions.Function0): void
+    public synthetic final method run(): void
+}
+
+@kotlin.Metadata
+final class A$test1$f$1 {
+    // source: 'reusedSamWrapperClasses.kt'
+    enclosing method A.test1()V
+    public final static field INSTANCE: A$test1$f$1
+    inner (anonymous) class A$test1$f$1
+    static method <clinit>(): void
+    method <init>(): void
+    public synthetic bridge method invoke(): java.lang.Object
+    public final method invoke(): void
+}
+
+@kotlin.Metadata
+public final class A {
+    // source: 'reusedSamWrapperClasses.kt'
+    inner (anonymous) class A$sam$java_lang_Runnable$0
+    inner (anonymous) class A$test1$f$1
+    public method <init>(): void
+    public final method test1(): void
+}
+
+@kotlin.Metadata
+final class B$test2$f$1 {
+    // source: 'reusedSamWrapperClasses.kt'
+    enclosing method B.test2()V
+    public final static field INSTANCE: B$test2$f$1
+    inner (anonymous) class B$test2$f$1
+    static method <clinit>(): void
+    method <init>(): void
+    public synthetic bridge method invoke(): java.lang.Object
+    public final method invoke(): void
+}
+
+@kotlin.Metadata
+public final class B {
+    // source: 'reusedSamWrapperClasses.kt'
+    inner (anonymous) class B$test2$f$1
+    public method <init>(): void
+    public final method test2(): void
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt
index 81039b208ed..70908a67f5f 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.txt
@@ -3,7 +3,9 @@ public final class<null>  test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnabl
     // source: 'samAdapterAndInlinedOne.kt'
     public <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method run(): void
+    enclosing class test/SamAdapterAndInlinedOneKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
 }
 
 @kotlin.Metadata
@@ -11,7 +13,9 @@ final class<null>  test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 {
     // source: 'samAdapterAndInlinedOne.kt'
     <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method run(): void
+    enclosing class test/SamAdapterAndInlinedOneKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
 }
 
 @kotlin.Metadata
@@ -21,4 +25,6 @@ public final class<null>  test/SamAdapterAndInlinedOneKt {
     public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
     public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
     public synthetic final static <<T:Ljava/lang/Object;>(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method makeRunnable(p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne_ir.txt
index 21760d85a83..fd4941ff5d0 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne_ir.txt
@@ -1,19 +1,21 @@
 @kotlin.Metadata
 public final class<null>  test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0 {
     // source: 'samAdapterAndInlinedOne.kt'
-    public <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
+    public <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method run(): void
+    enclosing class test/SamAdapterAndInlinedOneKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
-    public final inner class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
 }
 
 @kotlin.Metadata
 final class<null>  test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0 {
     // source: 'samAdapterAndInlinedOne.kt'
-    <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
+    <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method run(): void
+    enclosing class test/SamAdapterAndInlinedOneKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
-    final inner class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
 }
 
 @kotlin.Metadata
@@ -23,6 +25,6 @@ public final class<null>  test/SamAdapterAndInlinedOneKt {
     public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
     public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Lkotlin/Unit;>;)Ljava/lang/Runnable;> method noInline2(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
     public synthetic final static <null> method makeRunnable(p0: kotlin.jvm.functions.Function0): java.lang.Runnable
-    final inner class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
-    public final inner class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$i$java_lang_Runnable$0
+    inner (anonymous) class test/SamAdapterAndInlinedOneKt$sam$java_lang_Runnable$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt
index 6edd416e201..310988b9a98 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface.txt
@@ -12,7 +12,9 @@ final class<null>  TKt$sam$Sam$0 {
     public synthetic final <null> method get(): java.lang.Object
     public <null> method getFunctionDelegate(): kotlin.Function
     public <null> method hashCode(): int
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -20,4 +22,5 @@ public final class<null>  TKt {
     // source: 't.kt'
     public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Ljava/lang/String;>;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String
     public final static <<T:Ljava/lang/Object;>(LSam<TT;>;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface_ir.txt
index e08ff5f90d4..ba9f90c64b8 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface_ir.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/specializedFunInterface_ir.txt
@@ -8,12 +8,13 @@ public interface<<T:Ljava/lang/Object;>Ljava/lang/Object;>  Sam {
 final class<null>  TKt$sam$Sam$0 {
     // source: 't.kt'
     public final @org.jetbrains.annotations.NotNull <()Lkotlin/Function<*>;> method getFunctionDelegate(): kotlin.Function
-    <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
+    <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public final <null> method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public synthetic final <null> method get(): java.lang.Object
     public final <null> method hashCode(): int
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
-    final inner class TKt$sam$Sam$0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
@@ -21,5 +22,5 @@ public final class<null>  TKt {
     // source: 't.kt'
     public final static @org.jetbrains.annotations.NotNull <(Lkotlin/jvm/functions/Function0<Ljava/lang/String;>;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String
     public final static <<T:Ljava/lang/Object;>(LSam<TT;>;)TT;> method expectsSam(@org.jetbrains.annotations.NotNull p0: Sam): java.lang.Object
-    final inner class TKt$sam$Sam$0
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt
index c52afa8868a..3bb5239d280 100644
--- a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt
+++ b/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.txt
@@ -3,11 +3,14 @@ final class<null>  TKt$sam$Sam$0 {
     // source: 't.kt'
     <null> method <init>(p0: kotlin.jvm.functions.Function0): void
     public synthetic final <null> method get(): java.lang.Object
+    enclosing class TKt
     private synthetic final field <null> function: kotlin.jvm.functions.Function0
+    inner (anonymous) class TKt$sam$Sam$0
 }
 
 @kotlin.Metadata
 public final class<null>  TKt {
     // source: 't.kt'
     public final static <(Lkotlin/jvm/functions/Function0<Ljava/lang/String;>;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String
+    inner (anonymous) class TKt$sam$Sam$0
 }
diff --git a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface_ir.txt
deleted file mode 100644
index 2224df22c30..00000000000
--- a/compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface_ir.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@kotlin.Metadata
-final class<null>  TKt$sam$Sam$0 {
-    // source: 't.kt'
-    <null> method <init>(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): void
-    public synthetic final <null> method get(): java.lang.Object
-    private synthetic final field <null> function: kotlin.jvm.functions.Function0
-    final inner class TKt$sam$Sam$0
-}
-
-@kotlin.Metadata
-public final class<null>  TKt {
-    // source: 't.kt'
-    public final static <(Lkotlin/jvm/functions/Function0<Ljava/lang/String;>;)Ljava/lang/String;> method specializedSam(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.String
-    final inner class TKt$sam$Sam$0
-}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.kt b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.kt
new file mode 100644
index 00000000000..dadc316c73e
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.kt
@@ -0,0 +1,16 @@
+class A {
+    fun test1a() = B().runnable1()
+    fun test1b() = B().runnable1()
+    fun test2a() = B().runnable2()
+    fun test2b() = B().runnable2()
+
+    fun testRunnableSamCtor1() = B().runnableSamCtor {}
+    fun testRunnableSamCtor2() = B().runnableSamCtor {}
+}
+
+class B {
+    inline fun runnable1() = Runnable {}
+    inline fun runnable2() = Runnable {}
+
+    inline fun runnableSamCtor(noinline s: () -> Unit ) = Runnable (s)
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt
new file mode 100644
index 00000000000..902a3dba8a5
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.txt
@@ -0,0 +1,80 @@
+@kotlin.Metadata
+final class A$testRunnableSamCtor1$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method A.testRunnableSamCtor1()Ljava/lang/Runnable;
+    public final static field INSTANCE: A$testRunnableSamCtor1$1
+    inner (anonymous) class A$testRunnableSamCtor1$1
+    static method <clinit>(): void
+    method <init>(): void
+    public synthetic bridge method invoke(): java.lang.Object
+    public final method invoke(): void
+}
+
+@kotlin.Metadata
+final class A$testRunnableSamCtor2$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method A.testRunnableSamCtor2()Ljava/lang/Runnable;
+    public final static field INSTANCE: A$testRunnableSamCtor2$1
+    inner (anonymous) class A$testRunnableSamCtor2$1
+    static method <clinit>(): void
+    method <init>(): void
+    public synthetic bridge method invoke(): java.lang.Object
+    public final method invoke(): void
+}
+
+@kotlin.Metadata
+public final class A {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    inner (anonymous) class A$testRunnableSamCtor1$1
+    inner (anonymous) class A$testRunnableSamCtor2$1
+    public method <init>(): void
+    public final @org.jetbrains.annotations.NotNull method test1a(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method test1b(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method test2a(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method test2b(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method testRunnableSamCtor1(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method testRunnableSamCtor2(): java.lang.Runnable
+}
+
+@kotlin.Metadata
+public final class B$runnable1$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method B.runnable1()Ljava/lang/Runnable;
+    public final static field INSTANCE: B$runnable1$1
+    inner (anonymous) class B$runnable1$1
+    static method <clinit>(): void
+    public method <init>(): void
+    public final method run(): void
+}
+
+@kotlin.Metadata
+public final class B$runnable2$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method B.runnable2()Ljava/lang/Runnable;
+    public final static field INSTANCE: B$runnable2$1
+    inner (anonymous) class B$runnable2$1
+    static method <clinit>(): void
+    public method <init>(): void
+    public final method run(): void
+}
+
+@kotlin.Metadata
+public final class B$sam$i$java_lang_Runnable$0 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing class B
+    private synthetic final field function: kotlin.jvm.functions.Function0
+    inner (anonymous) class B$sam$i$java_lang_Runnable$0
+    public method <init>(p0: kotlin.jvm.functions.Function0): void
+    public synthetic final method run(): void
+}
+
+@kotlin.Metadata
+public final class B {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    inner (anonymous) class B$runnable1$1
+    inner (anonymous) class B$runnable2$1
+    public method <init>(): void
+    public final @org.jetbrains.annotations.NotNull method runnable1(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method runnable2(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method runnableSamCtor(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+}
diff --git a/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass_ir.txt b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass_ir.txt
new file mode 100644
index 00000000000..a244633ffd7
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass_ir.txt
@@ -0,0 +1,81 @@
+@kotlin.Metadata
+final class A$testRunnableSamCtor1$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method A.testRunnableSamCtor1()Ljava/lang/Runnable;
+    public final static field INSTANCE: A$testRunnableSamCtor1$1
+    inner (anonymous) class A$testRunnableSamCtor1$1
+    static method <clinit>(): void
+    method <init>(): void
+    public synthetic bridge method invoke(): java.lang.Object
+    public final method invoke(): void
+}
+
+@kotlin.Metadata
+final class A$testRunnableSamCtor2$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method A.testRunnableSamCtor2()Ljava/lang/Runnable;
+    public final static field INSTANCE: A$testRunnableSamCtor2$1
+    inner (anonymous) class A$testRunnableSamCtor2$1
+    static method <clinit>(): void
+    method <init>(): void
+    public synthetic bridge method invoke(): java.lang.Object
+    public final method invoke(): void
+}
+
+@kotlin.Metadata
+public final class A {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    inner (anonymous) class A$testRunnableSamCtor1$1
+    inner (anonymous) class A$testRunnableSamCtor2$1
+    public method <init>(): void
+    public final @org.jetbrains.annotations.NotNull method test1a(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method test1b(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method test2a(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method test2b(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method testRunnableSamCtor1(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method testRunnableSamCtor2(): java.lang.Runnable
+}
+
+@kotlin.Metadata
+public final class B$runnable1$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method B.runnable1()Ljava/lang/Runnable;
+    public final static field INSTANCE: B$runnable1$1
+    inner (anonymous) class B$runnable1$1
+    static method <clinit>(): void
+    public method <init>(): void
+    public final method run(): void
+}
+
+@kotlin.Metadata
+public final class B$runnable2$1 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing method B.runnable2()Ljava/lang/Runnable;
+    public final static field INSTANCE: B$runnable2$1
+    inner (anonymous) class B$runnable2$1
+    static method <clinit>(): void
+    public method <init>(): void
+    public final method run(): void
+}
+
+@kotlin.Metadata
+public final class B$sam$i$java_lang_Runnable$0 {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    enclosing class B
+    private synthetic final field function: kotlin.jvm.functions.Function0
+    inner (anonymous) class B$sam$i$java_lang_Runnable$0
+    public method <init>(p0: kotlin.jvm.functions.Function0): void
+    public synthetic final method run(): void
+}
+
+@kotlin.Metadata
+public final class B {
+    // source: 'wrapperInlinedFromAnotherClass.kt'
+    inner (anonymous) class B$runnable1$1
+    inner (anonymous) class B$runnable2$1
+    inner (anonymous) class B$sam$i$java_lang_Runnable$0
+    public method <init>(): void
+    public final @org.jetbrains.annotations.NotNull method runnable1(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method runnable2(): java.lang.Runnable
+    public final @org.jetbrains.annotations.NotNull method runnableSamCtor(@org.jetbrains.annotations.NotNull p0: kotlin.jvm.functions.Function0): java.lang.Runnable
+}
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/cleanup/twoRefs.kt b/compiler/testData/codegen/bytecodeText/coroutines/cleanup/twoRefs.kt
new file mode 100644
index 00000000000..fd3423fe0c4
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/coroutines/cleanup/twoRefs.kt
@@ -0,0 +1,9 @@
+suspend fun blackhole(a: Any?) {}
+
+suspend fun cleanUpExample(a: String, b: String) {
+    blackhole(a) // 1
+    blackhole(b) // 2
+}
+
+// 3 ACONST_NULL
+// 2 PUTFIELD .*L\$0 : .*;
diff --git a/compiler/testData/codegen/bytecodeText/coroutines/cleanup/unusedParamNotSpill.kt b/compiler/testData/codegen/bytecodeText/coroutines/cleanup/unusedParamNotSpill.kt
new file mode 100644
index 00000000000..16eef815b9f
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/coroutines/cleanup/unusedParamNotSpill.kt
@@ -0,0 +1,5 @@
+val f: suspend (Int) -> Unit = { unused ->
+}
+
+// 0 GETFIELD .*I\$0
+// 0 PUTFIELD .*I\$0
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/inlineClassInGeneratedToString.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/inlineClassInGeneratedToString.kt
index 28c6fa70476..e1a7fab3496 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/inlineClassInGeneratedToString.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/inlineClassInGeneratedToString.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +InlineClasses
-// IGNORE_BACKEND_FIR: JVM_IR
 
 // FILE: Z.kt
 inline class Z(val value: Int)
diff --git a/compiler/testData/codegen/java9/box/kt36984.kt b/compiler/testData/codegen/java9/box/kt36984.kt
new file mode 100644
index 00000000000..2d7b725c713
--- /dev/null
+++ b/compiler/testData/codegen/java9/box/kt36984.kt
@@ -0,0 +1,16 @@
+// TARGET_BACKEND: JVM
+// WITH_RUNTIME
+
+fun box(): String {
+    val f = {}
+    val sam = Runnable(f)
+    val samJavaClass = sam::class.java
+
+    if (samJavaClass.simpleName != "")
+        throw Exception("samJavaClass.simpleName='${samJavaClass.simpleName}'")
+
+    if (!samJavaClass.isAnonymousClass())
+        throw Exception("!samJavaClass.isAnonymousClass(): '${samJavaClass.name}'")
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/compiler/testData/codegen/java9/box/varHandle.kt b/compiler/testData/codegen/java9/box/varHandle.kt
index bdbf3eab67e..c19d54067d7 100644
--- a/compiler/testData/codegen/java9/box/varHandle.kt
+++ b/compiler/testData/codegen/java9/box/varHandle.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +PolymorphicSignature
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM_IR
 // FULL_JDK
 // SKIP_JDK6
 // WITH_RUNTIME
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstJvmIr/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstFir/library/a.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstJvmIr/library/a.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstFir/library/a.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstJvmIr/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstFir/output.txt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstJvmIr/output.txt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstFir/output.txt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstJvmIr/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstFir/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstJvmIr/source.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstFir/source.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstOld/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstOldJvm/library/a.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstOld/library/a.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstOldJvm/library/a.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstOld/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstOldJvm/output.txt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstOld/output.txt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstOldJvm/output.txt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstOld/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstOldJvm/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/jvmIrAgainstOld/source.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/firAgainstOldJvm/source.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/output.txt
deleted file mode 100644
index 6bde2a37585..00000000000
--- a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error: classes compiled by a new Kotlin compiler backend were found in dependencies. Remove them from the classpath or use '-Xallow-jvm-ir-dependencies' to suppress errors
-compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/source.kt:4:5: error: class 'lib.AKt' is compiled by a new Kotlin compiler backend and cannot be loaded by the old compiler
-    get { Box("OK").value }
-    ^
-compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/source.kt:4:11: error: class 'lib.Box' is compiled by a new Kotlin compiler backend and cannot be loaded by the old compiler
-    get { Box("OK").value }
-          ^
-COMPILATION_ERROR
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/library/a.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/library/a.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/library/a.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/output.txt
new file mode 100644
index 00000000000..6fc8c06126f
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/output.txt
@@ -0,0 +1,8 @@
+error: classes compiled by the new Kotlin compiler frontend were found in dependencies. Remove them from the classpath or use '-Xallow-unstable-dependencies' to suppress errors
+compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/source.kt:4:5: error: class 'lib.AKt' is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler
+    get { Box("OK").value }
+    ^
+compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/source.kt:4:11: error: class 'lib.Box' is compiled by the new Kotlin compiler frontend and cannot be loaded by the old compiler
+    get { Box("OK").value }
+          ^
+COMPILATION_ERROR
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIr/source.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFir/source.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithAllowIrDependencies/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithAllowUnstableDependencies/library/a.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithAllowIrDependencies/library/a.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithAllowUnstableDependencies/library/a.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithAllowIrDependencies/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithAllowUnstableDependencies/output.txt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithAllowIrDependencies/output.txt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithAllowUnstableDependencies/output.txt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithAllowIrDependencies/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithAllowUnstableDependencies/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithAllowIrDependencies/source.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithAllowUnstableDependencies/source.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithStableAbi/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithStableAbi/library/a.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithStableAbi/library/a.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithStableAbi/library/a.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithStableAbi/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithStableAbi/output.txt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithStableAbi/output.txt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithStableAbi/output.txt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithStableAbi/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithStableAbi/source.kt
similarity index 100%
rename from compiler/testData/compileKotlinAgainstCustomBinaries/oldAgainstJvmIrWithStableAbi/source.kt
rename to compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstFirWithStableAbi/source.kt
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/library/a.kt
new file mode 100644
index 00000000000..71e3e5d293d
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/library/a.kt
@@ -0,0 +1,5 @@
+package lib
+
+class Box(val value: String)
+
+inline fun <T> get(block: () -> T): T = block()
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/output.txt
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/output.txt
@@ -0,0 +1 @@
+OK
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/source.kt
new file mode 100644
index 00000000000..ffadd735100
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIr/source.kt
@@ -0,0 +1,5 @@
+import lib.*
+
+fun main() {
+    get { Box("OK").value }
+}
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/library/a.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/library/a.kt
new file mode 100644
index 00000000000..71e3e5d293d
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/library/a.kt
@@ -0,0 +1,5 @@
+package lib
+
+class Box(val value: String)
+
+inline fun <T> get(block: () -> T): T = block()
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/output.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/output.txt
new file mode 100644
index 00000000000..6914512561d
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/output.txt
@@ -0,0 +1,8 @@
+error: classes compiled by an unstable version of the Kotlin compiler were found in dependencies. Remove them from the classpath or use '-Xallow-unstable-dependencies' to suppress errors
+compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/source.kt:4:5: error: class 'lib.AKt' is compiled by an unstable version of the Kotlin compiler and cannot be loaded by this compiler
+    get { Box("OK").value }
+    ^
+compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/source.kt:4:11: error: class 'lib.Box' is compiled by an unstable version of the Kotlin compiler and cannot be loaded by this compiler
+    get { Box("OK").value }
+          ^
+COMPILATION_ERROR
diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/source.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/source.kt
new file mode 100644
index 00000000000..ffadd735100
--- /dev/null
+++ b/compiler/testData/compileKotlinAgainstCustomBinaries/oldJvmAgainstJvmIrWithUnstableAbi/source.kt
@@ -0,0 +1,5 @@
+import lib.*
+
+fun main() {
+    get { Box("OK").value }
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.kt b/compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.kt
new file mode 100644
index 00000000000..a414a73665c
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.kt
@@ -0,0 +1,36 @@
+// FIR_IDENTICAL
+import kotlin.reflect.KMutableProperty0
+
+class Module
+
+class Context
+
+class Model(
+    private val value: KMutableProperty0<Module>,
+    private val context: Context
+)
+
+abstract class Reference<V : Any> {
+    abstract var v : V
+}
+
+class ModuleReference(m : Module) : Reference<Module>() {
+    override var v : Module = m
+}
+
+abstract class SettingComponent<V: Any>(
+    val reference: Reference<V>
+) {
+    var value: V
+        get() = reference.v
+        set(value) {
+            reference.v = value
+        }
+}
+
+class Component(
+    reference: Reference<Module>,
+    context: Context
+) : SettingComponent<Module>(reference) {
+    private val model = Model(::value, context)
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.txt b/compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.txt
new file mode 100644
index 00000000000..14963e7e4a4
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.txt
@@ -0,0 +1,59 @@
+package
+
+public final class Component : SettingComponent<Module> {
+    public constructor Component(/*0*/ reference: Reference<Module>, /*1*/ context: Context)
+    private final val model: Model
+    public final override /*1*/ /*fake_override*/ val reference: Reference<Module>
+    public final override /*1*/ /*fake_override*/ var value: Module
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Context {
+    public constructor Context()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Model {
+    public constructor Model(/*0*/ value: kotlin.reflect.KMutableProperty0<Module>, /*1*/ context: Context)
+    private final val context: Context
+    private final val value: kotlin.reflect.KMutableProperty0<Module>
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Module {
+    public constructor Module()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class ModuleReference : Reference<Module> {
+    public constructor ModuleReference(/*0*/ m: Module)
+    public open override /*1*/ var v: Module
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public abstract class Reference</*0*/ V : kotlin.Any> {
+    public constructor Reference</*0*/ V : kotlin.Any>()
+    public abstract var v: V
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public abstract class SettingComponent</*0*/ V : kotlin.Any> {
+    public constructor SettingComponent</*0*/ V : kotlin.Any>(/*0*/ reference: Reference<V>)
+    public final val reference: Reference<V>
+    public final var value: V
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/withQuestionMarks.kt b/compiler/testData/diagnostics/tests/callableReference/withQuestionMarks.kt
index f02e92b22f5..3a4f2f898a2 100644
--- a/compiler/testData/diagnostics/tests/callableReference/withQuestionMarks.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/withQuestionMarks.kt
@@ -10,18 +10,18 @@ fun main() {
     val x4 = <!UNRESOLVED_REFERENCE!>logger<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
     val x5 = <!UNRESOLVED_REFERENCE!>logger<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
     val x6 = <!UNRESOLVED_REFERENCE!>logger<!>!!::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
-    val x7 = <!UNRESOLVED_REFERENCE!>logger<!>::<!UNRESOLVED_REFERENCE!>info<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!OVERLOAD_RESOLUTION_AMBIGUITY!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
-    val x8 = <!UNRESOLVED_REFERENCE!>logger<!>?::<!UNRESOLVED_REFERENCE!>info<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!OVERLOAD_RESOLUTION_AMBIGUITY!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
+    val x7 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!UNRESOLVED_REFERENCE!>logger<!>::<!UNRESOLVED_REFERENCE!>info<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
+    val x8 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>logger<!>?::<!UNRESOLVED_REFERENCE!>info<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
     val x9 = <!UNRESOLVED_REFERENCE!>logger<!>!!::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
-    val x10 = <!UNRESOLVED_REFERENCE!>logger<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!UNRESOLVED_REFERENCE!>print<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!OVERLOAD_RESOLUTION_AMBIGUITY!>print<!>
-    val x11 = <!UNRESOLVED_REFERENCE!>logger<!>!!::<!UNRESOLVED_REFERENCE!>info<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>print<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!OVERLOAD_RESOLUTION_AMBIGUITY!>print<!>
-    val x12 = <!UNRESOLVED_REFERENCE!>logger<!>?::<!UNRESOLVED_REFERENCE!>info<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>print<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!OVERLOAD_RESOLUTION_AMBIGUITY!>print<!>
+    val x10 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!UNRESOLVED_REFERENCE!>logger<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!UNRESOLVED_REFERENCE!>print<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
+    val x11 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!UNRESOLVED_REFERENCE!>logger<!>!!::<!UNRESOLVED_REFERENCE!>info<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!UNRESOLVED_REFERENCE!>print<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
+    val x12 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>logger<!>?::<!UNRESOLVED_REFERENCE!>info<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!UNRESOLVED_REFERENCE!>print<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
     val x13 = <!RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS!>42<!>?::<!UNRESOLVED_REFERENCE!>unresolved<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
 
     val x14 = <!UNRESOLVED_REFERENCE!>logger<!><!SYNTAX!>?!!::info?::print?::print<!>
     val x15 = <!UNRESOLVED_REFERENCE!>logger<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!><!SYNTAX!>?!!::print?::print<!>
     val x16 = <!UNRESOLVED_REFERENCE!>logger<!>!!?::<!DEBUG_INFO_MISSING_UNRESOLVED!>info<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
-    val x17 = <!RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS!><!UNRESOLVED_REFERENCE!>logger<!>::<!UNRESOLVED_REFERENCE!>info<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!><!>?::<!OVERLOAD_RESOLUTION_AMBIGUITY!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
+    val x17 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!UNRESOLVED_REFERENCE!>logger<!>::<!UNRESOLVED_REFERENCE!>info<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>print<!>
 
     // It must be OK
     val x18 = String?::hashCode <!USELESS_ELVIS!>?: ::foo<!>
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.fir.kt
new file mode 100644
index 00000000000..768f96f595c
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.fir.kt
@@ -0,0 +1,5 @@
+val foo by <!UNRESOLVED_REFERENCE!>foo<!>
+
+val bar by <!UNRESOLVED_REFERENCE!><!INAPPLICABLE_CANDIDATE!>baz<!>(bar)<!>
+
+fun <T> baz(t: T): T = t
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.kt b/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.kt
new file mode 100644
index 00000000000..1abb8e51561
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.kt
@@ -0,0 +1,5 @@
+val foo by <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>foo<!>
+
+val bar by <!DELEGATE_SPECIAL_FUNCTION_MISSING!>baz(<!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>bar<!>)<!>
+
+fun <T> baz(t: T): T = t
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.txt b/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.txt
new file mode 100644
index 00000000000..dbc8b82f67e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt37796.txt
@@ -0,0 +1,6 @@
+package
+
+public val bar: [ERROR : Type from delegate]
+public val foo: [ERROR : <ERROR FUNCTION RETURN TYPE>]
+public fun </*0*/ T> baz(/*0*/ t: T): T
+
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
index d74411e9801..5d8b50bc9bf 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
@@ -4,12 +4,12 @@
 
 import kotlin.reflect.KProperty
 
-val a by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>a<!>
+val a by <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>
 
 val b by Delegate(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>b<!>)
 
 val c by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>d<!>
-val d by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>c<!>
+val d by <!DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>c<!>
 
 class Delegate(i: Int) {
   operator fun getValue(t: Any?, p: KProperty<*>): Int {
diff --git a/compiler/testData/diagnostics/tests/exceptions/kt24158.kt b/compiler/testData/diagnostics/tests/exceptions/kt24158.kt
new file mode 100644
index 00000000000..3962bc19907
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/exceptions/kt24158.kt
@@ -0,0 +1,10 @@
+// FIR_IDENTICAL
+// SKIP_TXT
+
+fun main() {
+    null + <!SYNTAX!>$foo<!>.<!SYNTAX!>$bar<!>.<!SYNTAX!><!>
+}
+
+fun foo2() {
+    null + <!SYNTAX!>$foo<!>. <!SYNTAX!>$bar<!> . <!SYNTAX!>$baz<!> .<!SYNTAX!><!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt
rename to compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.fir.kt
diff --git a/compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt
rename to compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt
diff --git a/compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt b/compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt
rename to compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.txt
diff --git a/compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt
rename to compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.fir.kt
diff --git a/compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt
similarity index 100%
rename from compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt
rename to compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt
diff --git a/compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt b/compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt
similarity index 100%
rename from compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt
rename to compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.txt
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt
new file mode 100644
index 00000000000..c74674862dc
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.fir.kt
@@ -0,0 +1,499 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll0(): Flow<String> {
+    return flow {
+        val inv = select(::bar, ::foo)
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select(::bar2, ::foo2)
+        inv()
+    }
+}
+
+fun poll02(): Flow<String> {
+    return flow {
+        val inv = select(::bar3, ::foo3)
+        inv()
+    }
+}
+
+fun poll03(): Flow<String> {
+    return flow {
+        val inv = select(::bar4, ::foo4)
+        inv()
+    }
+}
+
+fun poll04(): Flow<String> {
+    return flow {
+        val inv = select(::bar5, ::foo5)
+        inv
+    }
+}
+
+fun poll05(): Flow<String> {
+    return flow {
+        val inv = select(::Foo6, ::Foo6)
+        inv
+    }
+}
+
+fun poll06(): Flow<String> {
+    return flow {
+        val inv = select(foo7(), ::Foo7)
+        inv
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar3 } else { ::foo3 }
+        inv()
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo3 }
+        inv()
+    }
+}
+
+fun poll14(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar4 } else { ::foo4 }
+        inv()
+    }
+}
+
+fun poll15(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar5 } else { ::foo5 }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll16(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll17(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { foo7() } else { ::Foo7 }
+        inv
+    }
+}
+
+fun poll2(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar else -> ::foo }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll22(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar3 else -> ::foo3 }
+        inv()
+    }
+}
+
+fun poll23(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar4 else -> ::foo4 }
+        inv()
+    }
+}
+
+fun poll24(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar5 else -> ::foo5 }
+        inv
+    }
+}
+
+fun poll25(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::Foo6 else -> ::Foo6 }
+        inv
+    }
+}
+
+fun poll26(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::Foo7 false -> foo7() else -> ::Foo7 }
+        inv
+    }
+}
+
+fun poll3(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar false -> ::foo }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll31(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll32(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar3 false -> ::foo3 }
+        inv()
+    }
+}
+
+fun poll33(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar4 false -> ::foo4 }
+        inv()
+    }
+}
+
+fun poll34(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar5 false -> ::foo5 }
+        inv
+    }
+}
+
+fun poll35(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::Foo6 false -> ::Foo6 }
+        inv
+    }
+}
+
+fun poll36(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::Foo7 false -> foo7() }
+        inv
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { ::bar } finally { ::foo }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { ::bar3 } finally { ::foo3 }
+        inv()
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll44(): Flow<String> {
+    return flow {
+        val inv = try { ::bar5 } finally { ::foo5 }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll45(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll46(): Flow<String> {
+    return flow {
+        val inv = try { foo7() } finally { ::Foo7 }
+        inv
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { ::bar } catch (e: Exception) { ::foo } finally { ::foo }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll52(): Flow<String> {
+    return flow {
+        val inv = try { ::bar3 } catch (e: Exception) { ::foo3 } finally { ::foo3 }
+        inv()
+    }
+}
+
+fun poll53(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } catch (e: Exception) { ::foo4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll54(): Flow<String> {
+    return flow {
+        val inv = try { ::bar5 } catch (e: Exception) { ::foo5 } finally { ::foo5 }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll55(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll56(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo7 } catch (e: Exception) { foo7() } finally { foo7() }
+        inv
+    }
+}
+
+fun poll6(): Flow<String> {
+    return flow {
+        val inv = ::bar
+        inv
+    }
+}
+
+fun poll61(): Flow<String> {
+    return flow {
+        val inv = ::bar2
+        inv
+    }
+}
+
+fun poll62(): Flow<String> {
+    return flow {
+        val inv = ::bar3
+        inv
+    }
+}
+
+fun poll63(): Flow<String> {
+    return flow {
+        val inv = ::bar4
+        inv
+    }
+}
+
+fun poll64(): Flow<String> {
+    return flow {
+        val inv = ::bar5
+        inv
+    }
+}
+
+fun poll65(): Flow<String> {
+    return flow {
+        val inv = ::Foo6
+        inv
+    }
+}
+
+fun poll66(): Flow<String> {
+    return flow {
+        val inv = ::Foo7
+        inv
+    }
+}
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = ::bar!!
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2!!
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = ::bar3!!
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ::bar4!!
+        inv
+    }
+}
+
+fun poll74(): Flow<String> {
+    return flow {
+        val inv = ::bar5!!
+        inv
+    }
+}
+
+fun poll75(): Flow<String> {
+    return flow {
+        val inv = ::Foo6!!
+        inv
+    }
+}
+
+fun poll76(): Flow<String> {
+    return flow {
+        val inv = ::Foo7!!
+        inv
+    }
+}
+
+fun poll8(): Flow<String> {
+    return flow {
+        val inv = ::bar in setOf(::foo)
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 in setOf(::foo2)
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll82(): Flow<String> {
+    return flow {
+        val inv = ::bar3 in setOf(::foo3)
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 in setOf(::foo4)
+        inv
+    }
+}
+
+fun poll84(): Flow<String> {
+    return flow {
+        val inv = ::bar5 in setOf(::foo5)
+        inv
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = ::Foo6 in setOf(::Foo6)
+        inv
+    }
+}
+
+fun poll86(): Flow<String> {
+    return flow {
+        val inv = ::Foo7 in setOf(::Foo7)
+        inv
+    }
+}
+
+fun poll87(): Flow<String> {
+    return flow {
+        val inv = ::Foo7 in setOf(foo7())
+        inv
+    }
+}
+
+fun poll88(): Flow<String> {
+    return flow {
+        val inv = foo7() in setOf(::Foo7)
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt
new file mode 100644
index 00000000000..ad9b44a3dc4
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt
@@ -0,0 +1,499 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll0(): Flow<String> {
+    return flow {
+        val inv = select(<!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!><!>, <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!><!>)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select(::bar2, ::foo2)
+        inv()
+    }
+}
+
+fun poll02(): Flow<String> {
+    return flow {
+        val inv = select(<!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar3<!><!>, <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo3<!><!>)
+        inv()
+    }
+}
+
+fun poll03(): Flow<String> {
+    return flow {
+        val inv = select(::bar4, ::foo4)
+        inv()
+    }
+}
+
+fun poll04(): Flow<String> {
+    return flow {
+        val inv = select(<!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar5<!><!>, <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo5<!><!>)
+        inv
+    }
+}
+
+fun poll05(): Flow<String> {
+    return flow {
+        val inv = select(::Foo6, ::Foo6)
+        inv
+    }
+}
+
+fun poll06(): Flow<String> {
+    return flow {
+        val inv = select(foo7(), <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!>)
+        inv
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> } else { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        inv()
+    }
+}
+
+fun poll14(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar4 } else { ::foo4 }
+        inv()
+    }
+}
+
+fun poll15(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> } else { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll16(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll17(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { foo7() } else { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll2(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!><!> else -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!><!> }
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll22(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar3<!><!> else -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo3<!><!> }
+        inv()
+    }
+}
+
+fun poll23(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar4 else -> ::foo4 }
+        inv()
+    }
+}
+
+fun poll24(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar5<!><!> else -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo5<!><!> }
+        inv
+    }
+}
+
+fun poll25(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::Foo6 else -> ::Foo6 }
+        inv
+    }
+}
+
+fun poll26(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> false -> <!IMPLICIT_CAST_TO_ANY!>foo7()<!> <!REDUNDANT_ELSE_IN_WHEN!>else<!> -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+        inv
+    }
+}
+
+fun poll3(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!><!> false -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!><!> }
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll31(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+        inv()
+    }
+}
+
+fun poll32(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar3<!><!> false -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo3<!><!> }
+        inv()
+    }
+}
+
+fun poll33(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::bar4 false -> ::foo4 }
+        inv()
+    }
+}
+
+fun poll34(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>bar5<!><!> false -> <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo5<!><!> }
+        inv
+    }
+}
+
+fun poll35(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ::Foo6 false -> ::Foo6 }
+        inv
+    }
+}
+
+fun poll36(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> false -> <!IMPLICIT_CAST_TO_ANY!>foo7()<!> }
+        inv
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll44(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll45(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll46(): Flow<String> {
+    return flow {
+        val inv = try { foo7() } finally { ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!> }
+        inv
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!> } catch (e: Exception) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll52(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> } catch (e: Exception) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll53(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } catch (e: Exception) { ::foo4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll54(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> } catch (e: Exception) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll55(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll56(): Flow<String> {
+    return flow {
+        val inv = try { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> } catch (e: Exception) { foo7() } finally { foo7() }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll6(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll61(): Flow<String> {
+    return flow {
+        val inv = ::bar2
+        inv
+    }
+}
+
+fun poll62(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll63(): Flow<String> {
+    return flow {
+        val inv = ::bar4
+        inv
+    }
+}
+
+fun poll64(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll65(): Flow<String> {
+    return flow {
+        val inv = ::Foo6
+        inv
+    }
+}
+
+fun poll66(): Flow<String> {
+    return flow {
+        val inv = ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ::bar4<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv
+    }
+}
+
+fun poll74(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll75(): Flow<String> {
+    return flow {
+        val inv = ::Foo6<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv
+    }
+}
+
+fun poll76(): Flow<String> {
+    return flow {
+        val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll8(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!> in setOf(<!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!><!>)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo2)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll82(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> in setOf(<!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo3<!><!>)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo4)
+        inv
+    }
+}
+
+fun poll84(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> in setOf(<!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo5<!><!>)
+        inv
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = ::Foo6 in setOf(::Foo6)
+        inv
+    }
+}
+
+fun poll86(): Flow<String> {
+    return flow {
+        val inv = ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!> in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!>)
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll87(): Flow<String> {
+    return flow {
+        val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!><!> <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(foo7())
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll88(): Flow<String> {
+    return flow {
+        val inv = foo7() in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!>)
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt
new file mode 100644
index 00000000000..5b1aac97a4e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.fir.kt
@@ -0,0 +1,189 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar3 } else { ::foo3 }
+        inv()
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo3 }
+        inv()
+    }
+}
+
+fun poll14(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar4 } else { ::foo4 }
+        inv()
+    }
+}
+
+fun poll15(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar5 } else { ::foo5 }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll16(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll17(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { foo7() } else { ::Foo7 }
+        inv
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { ::bar } finally { ::foo }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { ::bar3 } finally { ::foo3 }
+        inv()
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll44(): Flow<String> {
+    return flow {
+        val inv = try { ::bar5 } finally { ::foo5 }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll45(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll46(): Flow<String> {
+    return flow {
+        val inv = try { foo7() } finally { ::Foo7 }
+        inv
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { ::bar } catch (e: Exception) { ::foo } finally { ::foo }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll52(): Flow<String> {
+    return flow {
+        val inv = try { ::bar3 } catch (e: Exception) { ::foo3 } finally { ::foo3 }
+        inv()
+    }
+}
+
+fun poll53(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } catch (e: Exception) { ::foo4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll54(): Flow<String> {
+    return flow {
+        val inv = try { ::bar5 } catch (e: Exception) { ::foo5 } finally { ::foo5 }
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll55(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll56(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo7 } catch (e: Exception) { foo7() } finally { foo7() }
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt
new file mode 100644
index 00000000000..fbf0f6f9699
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt
@@ -0,0 +1,189 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { ::foo2 }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> } else { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar2 } else { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        inv()
+    }
+}
+
+fun poll14(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::bar4 } else { ::foo4 }
+        inv()
+    }
+}
+
+fun poll15(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> } else { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll16(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll17(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { foo7() } else { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll44(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll45(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll46(): Flow<String> {
+    return flow {
+        val inv = try { foo7() } finally { ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!> }
+        inv
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!> } catch (e: Exception) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll51(): Flow<String> {
+    return flow {
+        val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+        inv()
+    }
+}
+
+fun poll52(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!> } catch (e: Exception) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo3<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll53(): Flow<String> {
+    return flow {
+        val inv = try { ::bar4 } catch (e: Exception) { ::foo4 } finally { ::foo4 }
+        inv()
+    }
+}
+
+fun poll54(): Flow<String> {
+    return flow {
+        val inv = try { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!> } catch (e: Exception) { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> } finally { <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::foo5<!> }
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll55(): Flow<String> {
+    return flow {
+        val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+        inv()
+    }
+}
+
+fun poll56(): Flow<String> {
+    return flow {
+        val inv = try { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> } catch (e: Exception) { foo7() } finally { foo7() }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt
new file mode 100644
index 00000000000..6564070e406
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.fir.kt
@@ -0,0 +1,77 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2!!
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ::bar4!!
+        inv
+    }
+}
+
+fun poll75(): Flow<String> {
+    return flow {
+        val inv = ::Foo6!!
+        inv
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 in setOf(::foo2)
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 in setOf(::foo4)
+        inv
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = ::Foo6 in setOf(::Foo6)
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
new file mode 100644
index 00000000000..33e9423f8c4
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt
@@ -0,0 +1,77 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ::bar4<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv
+    }
+}
+
+fun poll75(): Flow<String> {
+    return flow {
+        val inv = ::Foo6<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo2)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo4)
+        inv
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = ::Foo6 in setOf(::Foo6)
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt
new file mode 100644
index 00000000000..c53792ca78e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.fir.kt
@@ -0,0 +1,86 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = ::bar!!
+        <!INAPPLICABLE_CANDIDATE!>inv<!>()
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2!!
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = ::bar3!!
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ::bar4!!
+        inv
+    }
+}
+
+fun poll74(): Flow<String> {
+    return flow {
+        val inv = ::bar5!!
+        inv
+    }
+}
+
+fun poll75(): Flow<String> {
+    return flow {
+        val inv = ::Foo6!!
+        inv
+    }
+}
+
+fun poll76(): Flow<String> {
+    return flow {
+        val inv = ::Foo7!!
+        inv
+    }
+}
+
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
new file mode 100644
index 00000000000..e8e69041c03
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt
@@ -0,0 +1,86 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> FlowCollector<K>.bar(): K = null as K
+fun <K> FlowCollector<K>.foo(): K = null as K
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+val <K> FlowCollector<K>.bar5: K get() = null as K
+val <K> FlowCollector<K>.foo5: K get() = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = ::bar2<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar3<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ::bar4<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv
+    }
+}
+
+fun poll74(): Flow<String> {
+    return flow {
+        val inv = <!TYPE_INFERENCE_POSTPONED_VARIABLE_IN_RECEIVER_TYPE!>::bar5<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
+fun poll75(): Flow<String> {
+    return flow {
+        val inv = ::Foo6<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        inv
+    }
+}
+
+fun poll76(): Flow<String> {
+    return flow {
+        val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+    }
+}
+
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt
new file mode 100644
index 00000000000..1add4c83e66
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.fir.kt
@@ -0,0 +1,35 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 in setOf(::foo2)
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 in setOf(::foo4)
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
new file mode 100644
index 00000000000..1fc9b4a29dd
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt
@@ -0,0 +1,35 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+val bar4: Int
+    get() = 1
+
+var foo4: Float
+    get() = 1f
+    set(value) {}
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = ::bar2 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo2)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = ::bar4 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo4)
+        inv
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt
new file mode 100644
index 00000000000..ef0c7ae3442
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.fir.kt
@@ -0,0 +1,195 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNUSED_LAMBDA_EXPRESSION -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll0(): Flow<String> {
+    return flow {
+        val inv = select({}, {})
+        inv()
+    }
+}
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select({ 1 }, { 1f })
+        inv()
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { {} } else { {} }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { { 1 } } else { { 1f } }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) ({ }) else ({ })
+        inv()
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) ({ 1 }) else ({ 1f })
+        inv()
+    }
+}
+
+fun poll2(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> {{}} else -> {{}} }
+        inv()
+    }
+}
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> {{1}} else -> {{1f}} }
+        inv()
+    }
+}
+
+fun poll22(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ({}) else -> ({}) }
+        inv()
+    }
+}
+
+fun poll23(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ({1}) else -> ({1f}) }
+        inv()
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { {} } finally { {} }
+        inv()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { {1} } finally { {1f} }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { ({1}) } finally { ({1f}) }
+        inv()
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ({}) } finally { ({}) }
+        inv()
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { {1} } catch (e: Exception) { {1f} } finally { {} }
+        inv()
+    }
+}
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = {}!!
+        inv()
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = {1f}!!
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = {{}}!!
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ({})!!
+        inv
+    }
+}
+
+fun poll8(): Flow<String> {
+    return flow {
+        val inv = {1} in setOf({1f})
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = {} in setOf({})
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll82(): Flow<String> {
+    return flow {
+        val inv = {{}} in setOf({{}})
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = {({})} in setOf({({})})
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll84(): Flow<String> {
+    return flow {
+        val inv = {{1}} in setOf({{1f}})
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = {({"1"})} in setOf({({"1f"})})
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
+
+fun poll86(): Flow<String> {
+    return flow {
+        val inv = {({"1"})}!! in setOf({({"1f"})}!!)
+        <!UNRESOLVED_REFERENCE!>inv<!>()
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt
new file mode 100644
index 00000000000..0134ee521ae
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt
@@ -0,0 +1,195 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNUSED_LAMBDA_EXPRESSION -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+interface FlowCollector<in T> {}
+
+fun <L> flow(@BuilderInference block: suspend FlowCollector<L>.() -> Unit) = Flow(block)
+
+class Flow<out R>(private val block: suspend FlowCollector<R>.() -> Unit)
+
+fun <R> select(vararg x: R) = x[0]
+
+fun poll0(): Flow<String> {
+    return flow {
+        val inv = select({}, {})
+        inv()
+    }
+}
+
+fun poll01(): Flow<String> {
+    return flow {
+        val inv = select({ 1 }, { 1f })
+        inv()
+    }
+}
+
+fun poll1(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { {} } else { {} }
+        inv()
+    }
+}
+
+fun poll11(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) { { 1 } } else { { 1f } }
+        inv()
+    }
+}
+
+fun poll12(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) ({ }) else ({ })
+        inv()
+    }
+}
+
+fun poll13(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = if (flag) ({ 1 }) else ({ 1f })
+        inv()
+    }
+}
+
+fun poll2(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> {{}} else -> {{}} }
+        inv()
+    }
+}
+
+fun poll21(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> {{1}} else -> {{1f}} }
+        inv()
+    }
+}
+
+fun poll22(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ({}) else -> ({}) }
+        inv()
+    }
+}
+
+fun poll23(flag: Boolean): Flow<String> {
+    return flow {
+        val inv = when (flag) { true -> ({1}) else -> ({1f}) }
+        inv()
+    }
+}
+
+fun poll4(): Flow<String> {
+    return flow {
+        val inv = try { {} } finally { {} }
+        inv()
+    }
+}
+
+fun poll41(): Flow<String> {
+    return flow {
+        val inv = try { {1} } finally { {1f} }
+        inv()
+    }
+}
+
+fun poll42(): Flow<String> {
+    return flow {
+        val inv = try { ({1}) } finally { ({1f}) }
+        inv()
+    }
+}
+
+fun poll43(): Flow<String> {
+    return flow {
+        val inv = try { ({}) } finally { ({}) }
+        inv()
+    }
+}
+
+fun poll5(): Flow<String> {
+    return flow {
+        val inv = try { {1} } catch (e: Exception) { {1f} } finally { {} }
+        inv()
+    }
+}
+
+fun poll7(): Flow<String> {
+    return flow {
+        val inv = {}<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>
+        inv()
+    }
+}
+
+fun poll71(): Flow<String> {
+    return flow {
+        val inv = {1f}<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>
+        inv()
+    }
+}
+
+fun poll72(): Flow<String> {
+    return flow {
+        val inv = {{}}<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>
+        inv()
+    }
+}
+
+fun poll73(): Flow<String> {
+    return flow {
+        val inv = ({})<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>
+        inv
+    }
+}
+
+fun poll8(): Flow<String> {
+    return flow {
+        val inv = {<!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>} in setOf({1f})
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll81(): Flow<String> {
+    return flow {
+        val inv = {} in setOf({})
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll82(): Flow<String> {
+    return flow {
+        val inv = {{}} in setOf({{}})
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll83(): Flow<String> {
+    return flow {
+        val inv = {({})} in setOf({({})})
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll84(): Flow<String> {
+    return flow {
+        val inv = {{<!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>}} in setOf({{1f}})
+        <!DEBUG_INFO_MISSING_UNRESOLVED!>inv()<!>
+    }
+}
+
+fun poll85(): Flow<String> {
+    return flow {
+        val inv = {({"1"})} in setOf({({"1f"})})
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
+
+fun poll86(): Flow<String> {
+    return flow {
+        val inv = {({"1"})}<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!> in setOf({({"1f"})}<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>)
+        <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.fir.kt b/compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.fir.kt
new file mode 100644
index 00000000000..f097ddd470b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.fir.kt
@@ -0,0 +1,29 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS
+
+import kotlin.experimental.ExperimentalTypeInference
+
+class Foo7<T>
+
+fun foo7() = null as Foo7<Int>
+
+fun poll17(flag: Boolean): Any? {
+    val inv = if (flag) { foo7() } else { ::Foo7 }
+    return inv
+}
+
+fun poll26(flag: Boolean): Any? {
+    val inv = when (flag) { true -> ::Foo7 false -> foo7() else -> ::Foo7 }
+    return inv
+}
+
+fun poll36(flag: Boolean): Any? {
+    val inv = when (flag) { true -> ::Foo7 false -> foo7() }
+    return inv
+}
+
+fun poll56(): Any? {
+    val inv = try { ::Foo7 } catch (e: Exception) { foo7() } finally { foo7() }
+    return inv
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt b/compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt
new file mode 100644
index 00000000000..7db303c5969
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt
@@ -0,0 +1,29 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS
+
+import kotlin.experimental.ExperimentalTypeInference
+
+class Foo7<T>
+
+fun foo7() = null as Foo7<Int>
+
+fun poll17(flag: Boolean): Any? {
+    val inv = if (flag) { foo7() } else { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll26(flag: Boolean): Any? {
+    val inv = when (flag) { true -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> false -> <!IMPLICIT_CAST_TO_ANY!>foo7()<!> <!REDUNDANT_ELSE_IN_WHEN!>else<!> -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+    return inv
+}
+
+fun poll36(flag: Boolean): Any? {
+    val inv = when (flag) { true -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> false -> <!IMPLICIT_CAST_TO_ANY!>foo7()<!> }
+    return inv
+}
+
+fun poll56(): Any? {
+    val inv = try { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> } catch (e: Exception) { foo7() } finally { foo7() }
+    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/kt42620.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/kt42620.kt
index bab8432d108..04b2d5c3703 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/kt42620.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/kt42620.kt
@@ -3,13 +3,13 @@
 class Foo
 
 fun main1() = when {
-    else -> <!TYPE_MISMATCH!>Foo::plus<!>
+    else -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_MISMATCH!>Foo::plus<!>
 }
 
-fun main2() = if (true) Foo::<!UNRESOLVED_REFERENCE!>minus<!> else Foo::<!UNRESOLVED_REFERENCE!>times<!>
+fun main2() = if (true) <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!UNRESOLVED_REFERENCE!>minus<!><!> else <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!UNRESOLVED_REFERENCE!>times<!><!>
 
 fun main3() = if (true) { Foo::<!UNRESOLVED_REFERENCE!>minus<!> } else { Foo::<!UNRESOLVED_REFERENCE!>times<!> }
 
 fun main4() = try { Foo::<!UNRESOLVED_REFERENCE!>minus<!> } finally { <!UNUSED_EXPRESSION!>Foo::<!UNRESOLVED_REFERENCE!>times<!><!> }
 
-fun main5() = Foo::<!UNRESOLVED_REFERENCE!>minus<!> ?: Foo::<!UNRESOLVED_REFERENCE!>times<!>
+fun main5() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!UNRESOLVED_REFERENCE!>minus<!><!> ?: <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!UNRESOLVED_REFERENCE!>times<!><!>
diff --git a/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt b/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt
new file mode 100644
index 00000000000..729572ad9eb
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt
@@ -0,0 +1,314 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+fun <K> bar4(): K = null as K
+fun <K> foo4(): K = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+fun poll1(flag: Boolean) {
+    val inv = if (flag) { ::bar2 } else { ::foo2 }
+    inv()
+}
+
+fun poll11(flag: Boolean) {
+    val inv = if (flag) { ::bar2 } else { ::foo2 }
+    inv()
+}
+
+fun poll12(flag: Boolean) {
+    val inv = if (flag) { ::bar3 } else { ::foo3 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll13(flag: Boolean) {
+    val inv = if (flag) { ::bar2 } else { ::foo3 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll14(flag: Boolean) {
+    val inv = if (flag) { ::bar4 } else { ::foo4 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll15(flag: Boolean) {
+    val inv = if (flag) { ::bar5 } else { ::foo5 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll16(flag: Boolean) {
+    val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+    inv()
+}
+
+fun poll17(flag: Boolean) {
+    val inv = if (flag) { foo7() } else { ::Foo7 }
+    inv
+}
+
+fun poll2(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar else -> ::foo }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll21(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+    inv()
+}
+
+fun poll22(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar3 else -> ::foo3 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll23(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar4 else -> ::foo4 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll24(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar5 else -> ::foo5 }
+    inv
+}
+
+fun poll25(flag: Boolean) {
+    val inv = when (flag) { true -> ::Foo6 else -> ::Foo6 }
+    inv
+}
+
+fun poll26(flag: Boolean) {
+    val inv = when (flag) { true -> ::Foo7 false -> foo7() else -> ::Foo7 }
+    inv
+}
+
+fun poll3(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar false -> ::foo }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll31(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+    inv()
+}
+
+fun poll32(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar3 false -> ::foo3 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll33(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar4 false -> ::foo4 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll34(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar5 false -> ::foo5 }
+    inv
+}
+
+fun poll35(flag: Boolean) {
+    val inv = when (flag) { true -> ::Foo6 false -> ::Foo6 }
+    inv
+}
+
+fun poll36(flag: Boolean) {
+    val inv = when (flag) { true -> ::Foo7 false -> foo7() }
+    inv
+}
+
+fun poll4() {
+    val inv = try { ::bar } finally { <!UNRESOLVED_REFERENCE!>::foo<!> }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll41() {
+    val inv = try { ::bar2 } finally { ::foo2 }
+    inv()
+}
+
+fun poll42() {
+    val inv = try { ::bar3 } finally { <!UNRESOLVED_REFERENCE!>::foo3<!> }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll43() {
+    val inv = try { ::bar4 } finally { ::foo4 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll44() {
+    val inv = try { ::bar5 } finally { <!UNRESOLVED_REFERENCE!>::foo5<!> }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll45() {
+    val inv = try { ::Foo6 } finally { ::Foo6 }
+    inv()
+}
+
+fun poll46() {
+    val inv = try { foo7() } finally { ::Foo7 }
+    inv
+}
+
+fun poll5() {
+    val inv = try { ::bar } catch (e: Exception) { ::foo } finally { <!UNRESOLVED_REFERENCE!>::foo<!> }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll51() {
+    val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+    inv()
+}
+
+fun poll52() {
+    val inv = try { ::bar3 } catch (e: Exception) { ::foo3 } finally { <!UNRESOLVED_REFERENCE!>::foo3<!> }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll53() {
+    val inv = try { ::bar4 } catch (e: Exception) { ::foo4 } finally { ::foo4 }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll54() {
+    val inv = try { ::bar5 } catch (e: Exception) { ::foo5 } finally { <!UNRESOLVED_REFERENCE!>::foo5<!> }
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll55() {
+    val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+    inv()
+}
+
+fun poll56() {
+    val inv = try { ::Foo7 } catch (e: Exception) { foo7() } finally { foo7() }
+    inv
+}
+
+fun poll6() {
+    val inv = <!UNRESOLVED_REFERENCE!>::bar<!>
+    inv
+}
+
+fun poll61() {
+    val inv = ::bar2
+    inv
+}
+
+fun poll62() {
+    val inv = <!UNRESOLVED_REFERENCE!>::bar3<!>
+    inv
+}
+
+fun poll63() {
+    val inv = ::bar4
+    inv
+}
+
+fun poll64() {
+    val inv = <!UNRESOLVED_REFERENCE!>::bar5<!>
+    inv
+}
+
+fun poll65() {
+    val inv = ::Foo6
+    inv
+}
+
+fun poll66() {
+    val inv = ::Foo7
+    inv
+}
+
+fun poll7() {
+    val inv = ::bar!!
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll71() {
+    val inv = ::bar2!!
+    inv()
+}
+
+fun poll72() {
+    val inv = ::bar3!!
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll73() {
+    val inv = ::bar4!!
+    inv
+}
+
+fun poll74() {
+    val inv = ::bar5!!
+    inv
+}
+
+fun poll75() {
+    val inv = ::Foo6!!
+    inv
+}
+
+fun poll76() {
+    val inv = ::Foo7!!
+    inv
+}
+
+fun poll8() {
+    val inv = <!UNRESOLVED_REFERENCE!>::bar<!> <!NONE_APPLICABLE!>in<!> <!NONE_APPLICABLE!>setOf<!>(<!UNRESOLVED_REFERENCE!>::foo<!>)
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll81() {
+    val inv = ::bar2 in setOf(::foo2)
+    <!UNRESOLVED_REFERENCE!>inv<!>()
+}
+
+fun poll82() {
+    val inv = <!UNRESOLVED_REFERENCE!>::bar3<!> <!NONE_APPLICABLE!>in<!> <!NONE_APPLICABLE!>setOf<!>(<!UNRESOLVED_REFERENCE!>::foo3<!>)
+    <!INAPPLICABLE_CANDIDATE!>inv<!>()
+}
+
+fun poll83() {
+    val inv = ::bar4 in setOf(::foo4)
+    inv
+}
+
+fun poll84() {
+    val inv = <!UNRESOLVED_REFERENCE!>::bar5<!> <!NONE_APPLICABLE!>in<!> <!NONE_APPLICABLE!>setOf<!>(<!UNRESOLVED_REFERENCE!>::foo5<!>)
+    inv
+}
+
+fun poll85() {
+    val inv = ::Foo6 in setOf(::Foo6)
+    inv
+}
+
+fun poll86() {
+    val inv = ::Foo7 in setOf(::Foo7)
+    inv
+}
+
+fun poll87() {
+    val inv = ::Foo7 in setOf(foo7())
+    inv
+}
+
+fun poll88() {
+    val inv = foo7() in setOf(::Foo7)
+    inv
+}
diff --git a/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.kt b/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.kt
new file mode 100644
index 00000000000..2ee1eebab8f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.kt
@@ -0,0 +1,314 @@
+// WITH_RUNTIME
+// SKIP_TXT
+// !DIAGNOSTICS: -CAST_NEVER_SUCCEEDS -UNCHECKED_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE -EXPERIMENTAL_API_USAGE_ERROR -UNUSED_EXPRESSION
+
+import kotlin.experimental.ExperimentalTypeInference
+
+fun <K> K.bar3(): K = null as K
+fun <K> K.foo3(): K = null as K
+
+fun bar2(): Int = 1
+fun foo2(): Float = 1f
+
+fun <K> bar4(): K = null as K
+fun <K> foo4(): K = null as K
+
+class Foo6
+
+class Foo7<T>
+fun foo7() = null as Foo7<Int>
+
+fun poll1(flag: Boolean) {
+    val inv = if (flag) { ::bar2 } else { ::foo2 }
+    inv()
+}
+
+fun poll11(flag: Boolean) {
+    val inv = if (flag) { ::bar2 } else { ::foo2 }
+    inv()
+}
+
+fun poll12(flag: Boolean) {
+    val inv = if (flag) { ::<!UNRESOLVED_REFERENCE!>bar3<!> } else { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll13(flag: Boolean) {
+    val inv = if (flag) { ::bar2 } else { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
+    inv()
+}
+
+fun poll14(flag: Boolean) {
+    val inv = if (flag) { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::bar4<!> } else { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::foo4<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll15(flag: Boolean) {
+    val inv = if (flag) { ::<!UNRESOLVED_REFERENCE!>bar5<!> } else { ::<!UNRESOLVED_REFERENCE!>foo5<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll16(flag: Boolean) {
+    val inv = if (flag) { ::Foo6 } else { ::Foo6 }
+    inv()
+}
+
+fun poll17(flag: Boolean) {
+    val inv = if (flag) { foo7() } else { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll2(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>bar<!><!> else -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>foo<!><!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll21(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar2 else -> ::foo2 }
+    inv()
+}
+
+fun poll22(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>bar3<!><!> else -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>foo3<!><!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll23(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::bar4<!> else -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::foo4<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll24(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>bar5<!><!> else -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>foo5<!><!> }
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll25(flag: Boolean) {
+    val inv = when (flag) { true -> ::Foo6 else -> ::Foo6 }
+    inv
+}
+
+fun poll26(flag: Boolean) {
+    val inv = when (flag) { true -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> false -> <!IMPLICIT_CAST_TO_ANY!>foo7()<!> <!REDUNDANT_ELSE_IN_WHEN!>else<!> -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> }
+    inv
+}
+
+fun poll3(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>bar<!><!> false -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>foo<!><!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll31(flag: Boolean) {
+    val inv = when (flag) { true -> ::bar2 false -> ::foo2 }
+    inv()
+}
+
+fun poll32(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>bar3<!><!> false -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>foo3<!><!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll33(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::bar4<!> false -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::foo4<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll34(flag: Boolean) {
+    val inv = when (flag) { true -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>bar5<!><!> false -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE!>foo5<!><!> }
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll35(flag: Boolean) {
+    val inv = when (flag) { true -> ::Foo6 false -> ::Foo6 }
+    inv
+}
+
+fun poll36(flag: Boolean) {
+    val inv = when (flag) { true -> <!IMPLICIT_CAST_TO_ANY, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> false -> <!IMPLICIT_CAST_TO_ANY!>foo7()<!> }
+    inv
+}
+
+fun poll4() {
+    val inv = try { ::<!UNRESOLVED_REFERENCE!>bar<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll41() {
+    val inv = try { ::bar2 } finally { ::foo2 }
+    inv()
+}
+
+fun poll42() {
+    val inv = try { ::<!UNRESOLVED_REFERENCE!>bar3<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll43() {
+    val inv = try { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::bar4<!> } finally { ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo4<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll44() {
+    val inv = try { ::<!UNRESOLVED_REFERENCE!>bar5<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo5<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll45() {
+    val inv = try { ::Foo6 } finally { ::Foo6 }
+    inv()
+}
+
+fun poll46() {
+    val inv = try { foo7() } finally { ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!> }
+    inv
+}
+
+fun poll5() {
+    val inv = try { ::<!UNRESOLVED_REFERENCE!>bar<!> } catch (e: Exception) { ::<!UNRESOLVED_REFERENCE!>foo<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll51() {
+    val inv = try { ::bar2 } catch (e: Exception) { ::foo2 } finally { ::foo2 }
+    inv()
+}
+
+fun poll52() {
+    val inv = try { ::<!UNRESOLVED_REFERENCE!>bar3<!> } catch (e: Exception) { ::<!UNRESOLVED_REFERENCE!>foo3<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll53() {
+    val inv = try { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::bar4<!> } catch (e: Exception) { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::foo4<!> } finally { ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo4<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll54() {
+    val inv = try { ::<!UNRESOLVED_REFERENCE!>bar5<!> } catch (e: Exception) { ::<!UNRESOLVED_REFERENCE!>foo5<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo5<!> }
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll55() {
+    val inv = try { ::Foo6 } catch (e: Exception) { ::Foo6 } finally { ::Foo6 }
+    inv()
+}
+
+fun poll56() {
+    val inv = try { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> } catch (e: Exception) { foo7() } finally { foo7() }
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll6() {
+    val inv = ::<!UNRESOLVED_REFERENCE!>bar<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll61() {
+    val inv = ::bar2
+    inv
+}
+
+fun poll62() {
+    val inv = ::<!UNRESOLVED_REFERENCE!>bar3<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll63() {
+    val inv = ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar4<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll64() {
+    val inv = ::<!UNRESOLVED_REFERENCE!>bar5<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll65() {
+    val inv = ::Foo6
+    inv
+}
+
+fun poll66() {
+    val inv = ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo7<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll7() {
+    val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>bar<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll71() {
+    val inv = ::bar2<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    inv()
+}
+
+fun poll72() {
+    val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>bar3<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll73() {
+    val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::bar4<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll74() {
+    val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>bar5<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll75() {
+    val inv = ::Foo6<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    inv
+}
+
+fun poll76() {
+    val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll8() {
+    val inv = ::<!UNRESOLVED_REFERENCE!>bar<!> in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(::<!UNRESOLVED_REFERENCE!>foo<!>)
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll81() {
+    val inv = ::bar2 <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(::foo2)
+    <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inv<!>()
+}
+
+fun poll82() {
+    val inv = ::<!UNRESOLVED_REFERENCE!>bar3<!> in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(::<!UNRESOLVED_REFERENCE!>foo3<!>)
+    <!DEBUG_INFO_MISSING_UNRESOLVED!>inv<!>()
+}
+
+fun poll83() {
+    val inv = ::bar4 in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::foo4<!>)
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll84() {
+    val inv = ::<!UNRESOLVED_REFERENCE!>bar5<!> in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(::<!UNRESOLVED_REFERENCE!>foo5<!>)
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll85() {
+    val inv = ::Foo6 in setOf(::Foo6)
+    inv
+}
+
+fun poll86() {
+    val inv = ::Foo7 in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!>)
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll87() {
+    val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!> <!TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING!>in<!> setOf(foo7())
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>inv<!>
+}
+
+fun poll88() {
+    val inv = foo7() in <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>setOf<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::Foo7<!>)
+    inv
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10843.kt b/compiler/testData/diagnostics/tests/regressions/kt10843.kt
index 60be57a47a0..e1159184635 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10843.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10843.kt
@@ -1,8 +1,8 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See EA-76890 / KT-10843: NPE during analysis
-fun lambda(x : Int?) = x?.<!FUNCTION_CALL_EXPECTED, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, NO_VALUE_FOR_PARAMETER, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>l<!> {
-    <!CANNOT_INFER_PARAMETER_TYPE{OI}!>y<!> ->
-    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>><!> 0) return<!UNRESOLVED_REFERENCE!>@l<!> x
+fun lambda(x : Int?) = x?.<!FUNCTION_CALL_EXPECTED, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}, NO_VALUE_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> <!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!>l<!> {
+    <!CANNOT_INFER_PARAMETER_TYPE!>y<!> ->
+    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!> <!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!>><!> 0) return<!UNRESOLVED_REFERENCE!>@l<!> x
     <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!>
 }<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>
diff --git a/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt b/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt
index 6152c6d22c4..a95f2b3796c 100644
--- a/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt
+++ b/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt
@@ -28,7 +28,7 @@ fun testElvis(x: Any?) {
 }
 
 fun testExclExcl() {
-    val y = :: <!UNRESOLVED_REFERENCE!>unresolved<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    val y = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>:: <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>unresolved<!><!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
 }
 
 fun testTry() {
diff --git a/compiler/testData/diagnostics/tests/samConversions/samConversionsWithSmartCasts.fir.kt b/compiler/testData/diagnostics/tests/samConversions/samConversionsWithSmartCasts.fir.kt
index a95ff868f00..329a29f52dd 100644
--- a/compiler/testData/diagnostics/tests/samConversions/samConversionsWithSmartCasts.fir.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/samConversionsWithSmartCasts.fir.kt
@@ -49,11 +49,11 @@ fun test6(a: Any) {
 
 fun test7(a: (Int) -> Int) {
     a as () -> Unit
-    J().<!INAPPLICABLE_CANDIDATE!>run1<!>(a)
+    J().run1(a)
 }
 
 fun test8(a: () -> Unit) {
-    J().<!INAPPLICABLE_CANDIDATE!>run1<!>(J.id(a))
+    J().run1(J.id(a))
 }
 
 fun test9() {
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.fir.kt
new file mode 100644
index 00000000000..c346a1a7182
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.fir.kt
@@ -0,0 +1,56 @@
+// !API_VERSION: 1.5
+// !LANGUAGE: +JvmRecordSupport
+// SKIP_TXT
+// JVM_TARGET: 15
+// ENABLE_JVM_PREVIEW
+
+@JvmRecord
+class A0
+
+@JvmRecord
+class A1 {
+    constructor()
+}
+
+@JvmRecord
+class A2()
+
+@JvmRecord
+class A3(name: String)
+
+@JvmRecord
+class A4(var name: String)
+
+@JvmRecord
+class A5(vararg val name: String, y: Int)
+
+@JvmRecord
+open class A6(val x: String)
+
+@JvmRecord
+abstract class A7(val x: String)
+
+@JvmRecord
+sealed class A8(val x: String)
+
+@JvmRecord
+enum class A9(val x: String) {
+    X("");
+}
+
+@JvmRecord
+class A10(
+    val x: String,
+    val y: Int,
+    vararg val z: Double,
+)
+
+fun main() {
+    @JvmRecord
+    class Local
+}
+
+class Outer {
+    @JvmRecord
+    inner class Inner(val name: String)
+}
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/diagnostics.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/diagnostics.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.fir.kt
new file mode 100644
index 00000000000..e5eae937740
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.fir.kt
@@ -0,0 +1,23 @@
+// !API_VERSION: 1.5
+// !LANGUAGE: -JvmRecordSupport
+// SKIP_TXT
+// FILE: JRecord.java
+public record JRecord(int x, CharSequence y) {}
+// FILE: main.kt
+
+@JvmRecord
+class MyRec(
+    val x: String,
+    val y: Int,
+    vararg val z: Double,
+)
+
+fun foo(jr: JRecord) {
+    <!INAPPLICABLE_CANDIDATE!>JRecord<!>(1, "")
+
+    jr.<!UNRESOLVED_REFERENCE!>x<!>()
+    jr.<!UNRESOLVED_REFERENCE!>y<!>()
+
+    jr.<!UNRESOLVED_REFERENCE!>x<!>
+    jr.<!UNRESOLVED_REFERENCE!>y<!>
+}
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/disabledFeature.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/disabledFeature.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.fir.kt
new file mode 100644
index 00000000000..22af17371a7
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.fir.kt
@@ -0,0 +1,43 @@
+// !API_VERSION: 1.5
+// !LANGUAGE: +JvmRecordSupport
+// SKIP_TXT
+// JVM_TARGET: 15
+// ENABLE_JVM_PREVIEW
+
+interface I
+
+val i: I = object : I {}
+
+@JvmRecord
+data class MyRec1(val name: String) : I by i
+
+@JvmRecord
+data class MyRec2(val name: String) {
+    val x: Int = 0
+}
+
+@JvmRecord
+data class MyRec3(val name: String) {
+    val y: String
+        get() = field + "1"
+
+    init {
+        y = ""
+    }
+}
+
+@JvmRecord
+data class MyRec4(val name: String) {
+    val z: Int by lazy { 1 }
+}
+
+@JvmRecord
+data class MyRec5(val name: String) {
+    val w: String get() = name + "1"
+}
+
+
+
+
+
+
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/irrelevantFields.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/irrelevantFields.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.fir.kt
new file mode 100644
index 00000000000..6d691424021
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.fir.kt
@@ -0,0 +1,14 @@
+// !API_VERSION: 1.5
+// !LANGUAGE: +JvmRecordSupport
+// JVM_TARGET: 15
+// ENABLE_JVM_PREVIEW
+
+@JvmRecord
+class BasicRecord(val x: String)
+
+@JvmRecord
+data class BasicDataRecord(val x: String)
+
+@JvmRecord
+class BasicRecordWithSuperClass(val x: String) : Record()
+
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.txt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.txt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.fir.kt
new file mode 100644
index 00000000000..58fb8a59523
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.fir.kt
@@ -0,0 +1,18 @@
+// !API_VERSION: 1.5
+// !LANGUAGE: +JvmRecordSupport
+// FILE: MyRecord.java
+public record MyRecord(int x, CharSequence y) {
+
+}
+
+// FILE: main.kt
+
+fun foo(mr: MyRecord) {
+    <!INAPPLICABLE_CANDIDATE!>MyRecord<!>(1, "")
+
+    mr.<!UNRESOLVED_REFERENCE!>x<!>()
+    mr.<!UNRESOLVED_REFERENCE!>y<!>()
+
+    mr.<!UNRESOLVED_REFERENCE!>x<!>
+    mr.<!UNRESOLVED_REFERENCE!>y<!>
+}
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/simpleRecords.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/simpleRecords.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/simpleRecords.txt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/simpleRecords.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.txt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.fir.kt
new file mode 100644
index 00000000000..6624134fec9
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.fir.kt
@@ -0,0 +1,26 @@
+// !API_VERSION: 1.5
+// !LANGUAGE: +JvmRecordSupport
+// JVM_TARGET: 15
+// ENABLE_JVM_PREVIEW
+
+abstract class Abstract
+interface I
+
+@JvmRecord
+data class A1(val x: String) : Abstract(), I
+
+@JvmRecord
+data class A2(val x: String) : Any(), I
+
+@JvmRecord
+data class A3(val x: String) : Record(), I
+
+@JvmRecord
+data class A4(val x: String) : java.lang.Record(), I
+
+@JvmRecord
+data class A5(val x: String) : I
+
+data class A6(val x: String) : Record(), I
+
+data class A7(val x: String) : java.lang.Record(), I
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/supertypesCheck.kt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/supertypesCheck.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/jvmRecord/supertypesCheck.txt b/compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/jvmRecord/supertypesCheck.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.txt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.fir.kt
new file mode 100644
index 00000000000..cce64dd75a8
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.fir.kt
@@ -0,0 +1,44 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// ISSUE: KT-41215, KT-43551
+
+// FILE: Base.java
+public sealed class Base permits A, B {}
+
+// FILE: A.java
+public final class A extends Base {}
+
+// FILE: B.java
+public sealed class B extends Base permits B.C, B.D {
+    public static final class C implements B {}
+
+    public static non-sealed class D extends B {}
+}
+
+// FILE: main.kt
+fun test_ok_1(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B -> 2
+    }
+}
+
+fun test_ok_2(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B.C -> 2
+        is B.D -> 3
+    }
+}
+
+fun test_error_1(base: Base) {
+    val x = when (base) {
+        is A -> 1
+    }
+}
+
+fun test_error_2(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B.C -> 2
+    }
+}
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.txt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.txt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.fir.kt
new file mode 100644
index 00000000000..3e478edc7ec
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.fir.kt
@@ -0,0 +1,64 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+// ISSUE: KT-41215, KT-43551
+
+// FILE: Base.java
+public sealed interface Base permits A, B, E {}
+
+// FILE: A.java
+public non-sealed interface A extends Base {}
+
+// FILE: B.java
+public sealed interface B extends Base permits B.C, B.D {
+    public static final class C implements B {}
+
+    public static non-sealed interface D extends B {}
+}
+
+// FILE: E.java
+public enum E implements Base {
+    First, Second
+}
+
+// FILE: main.kt
+fun test_ok_1(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B -> 2
+        is E -> 3
+    }
+}
+
+fun test_ok_2(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B.C -> 2
+        is B.D -> 3
+        E.First -> 4
+        E.Second -> 5
+    }
+}
+
+fun test_error_1(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B -> 2
+    }
+}
+
+fun test_error_2(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B.C -> 2
+        is B.D -> 3
+        E.Second -> 5
+    }
+}
+
+fun test_error_3(base: Base) {
+    val x = when (base) {
+        is A -> 1
+        is B.C -> 2
+        E.First -> 4
+        E.Second -> 5
+    }
+}
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.txt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.txt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.fir.kt
new file mode 100644
index 00000000000..2cce51631b1
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.fir.kt
@@ -0,0 +1,11 @@
+// ISSUE: KT-41215
+
+// FILE: Base.java
+public sealed class Base permits A, B {}
+
+// FILE: A.java
+public final class A extends Base {}
+
+// FILE: B.kt
+
+class B : Base()
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.txt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.txt
diff --git a/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.fir.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.fir.kt
new file mode 100644
index 00000000000..fd2cf989bd4
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.fir.kt
@@ -0,0 +1,11 @@
+// ISSUE: KT-41215
+
+// FILE: Base.java
+public sealed interface Base permits A, B {}
+
+// FILE: A.java
+public final class A extends Base {}
+
+// FILE: B.kt
+
+class B : Base
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt
diff --git a/compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.txt b/compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.txt
rename to compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.txt
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt
new file mode 100644
index 00000000000..c2efd713d78
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt
@@ -0,0 +1,3 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+
+typealias R<T: List<R>> = List<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.kt
new file mode 100644
index 00000000000..1733bf2eb6a
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.kt
@@ -0,0 +1,3 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+
+typealias R<T: <!BOUND_ON_TYPE_ALIAS_PARAMETER_NOT_ALLOWED!>List<<!UNRESOLVED_REFERENCE!>R<!>><!>> = List<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt
new file mode 100644
index 00000000000..c30a61d8f3f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt
@@ -0,0 +1,3 @@
+package
+
+public typealias R</*0*/ T : kotlin.collections.List<[ERROR : R]>> = kotlin.collections.List<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14612.fir.kt b/compiler/testData/diagnostics/tests/typealias/kt14612.fir.kt
new file mode 100644
index 00000000000..3aa32a7624f
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/kt14612.fir.kt
@@ -0,0 +1,3 @@
+// ISSUE: KT-14612
+
+typealias S = @S Suppress
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14612.kt b/compiler/testData/diagnostics/tests/typealias/kt14612.kt
new file mode 100644
index 00000000000..54de5c038a0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/kt14612.kt
@@ -0,0 +1,3 @@
+// ISSUE: KT-14612
+
+typealias S = <!RECURSIVE_TYPEALIAS_EXPANSION!>@S<!> Suppress
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14612.txt b/compiler/testData/diagnostics/tests/typealias/kt14612.txt
new file mode 100644
index 00000000000..71b154ca6f0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/kt14612.txt
@@ -0,0 +1,4 @@
+package
+
+public typealias S = @S /* = kotlin.Suppress */(names = {}) kotlin.Suppress
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
index 8aee3020c07..756e5794fc0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
@@ -10,25 +10,25 @@ class Controller<T> {
 fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
-    apply {
-        yield(4)
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>apply<!> {
+        <!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}!>yield<!>(4)
     }
 }
 
 val test2 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(B)
-    apply {
-        yield(C)
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>apply<!> {
+        <!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}!>yield<!>(<!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}!>C<!>)
     }
 }
 
-val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
-    this.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> {
+val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+    this.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> {
         yield(B)
     }
 
-    apply {
-        yield(C)
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>apply<!> {
+        <!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}!>yield<!>(<!DEBUG_INFO_MISSING_UNRESOLVED, NI;DEBUG_INFO_MISSING_UNRESOLVED{OI}!>C<!>)
     }
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
index 343ff7160d9..96eaa66b31f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
@@ -16,7 +16,7 @@ fun <S> generate(@BuilderInference g: suspend GenericController<S>.() -> Unit):
 @BuilderInference
 suspend fun <S> GenericController<List<S>>.yieldGenerate(g: suspend GenericController<S>.() -> Unit): Unit = TODO()
 
-val test1 = generate {
+val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     // TODO: KT-15185
     <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}, TYPE_MISMATCH{OI}!>yieldGenerate<!> {
         yield(4)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt42620.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt42620.kt
index abc8c0bb545..f8322ec29ff 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt42620.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt42620.kt
@@ -3,13 +3,13 @@
 class Foo
 
 fun main1() = when {
-    else -> Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>plus<!>
+    else -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>plus<!><!>
 }
 
-fun main2() = if (true) Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>minus<!> else Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>times<!>
+fun main2() = if (true) <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>minus<!><!> else <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>times<!><!>
 
 fun main3() = if (true) { Foo::<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>minus<!> } else { Foo::<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>times<!> }
 
 fun main4() = try { Foo::<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>minus<!> } finally { <!UNUSED_EXPRESSION!>Foo::<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>times<!><!> }
 
-fun main5() = Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>minus<!> ?: Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>times<!>
+fun main5() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>minus<!><!> ?: <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Foo::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>times<!><!>
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt b/compiler/testData/foreignAnnotations/java8Tests/checkerFramework.kt
similarity index 96%
rename from compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt
rename to compiler/testData/foreignAnnotations/java8Tests/checkerFramework.kt
index 7c3d2276550..356b008d995 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/checkerFramework.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 // FILE: A.java
 
 import org.checkerframework.checker.nullness.qual.*;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.txt b/compiler/testData/foreignAnnotations/java8Tests/checkerFramework.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.txt
rename to compiler/testData/foreignAnnotations/java8Tests/checkerFramework.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt b/compiler/testData/foreignAnnotations/java8Tests/eclipse.kt
similarity index 96%
rename from compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt
rename to compiler/testData/foreignAnnotations/java8Tests/eclipse.kt
index 400ea2b2db7..b0377e9c1d7 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/eclipse.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 // FILE: A.java
 
 import org.eclipse.jdt.annotation.*;
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/eclipse.txt b/compiler/testData/foreignAnnotations/java8Tests/eclipse.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/eclipse.txt
rename to compiler/testData/foreignAnnotations/java8Tests/eclipse.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/AnnotatedBoundsOfWildcard.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/AnnotatedBoundsOfWildcard.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/AnnotatedBoundsOfWildcard.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/AnnotatedBoundsOfWildcard.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/Defaults.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/Defaults.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/Defaults.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/Defaults.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/IgnoreAnnotations.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/IgnoreAnnotations.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/IgnoreAnnotations.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/IgnoreAnnotations.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/NonPlatformTypeParameter.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/NonPlatformTypeParameter.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/NonPlatformTypeParameter.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/NonPlatformTypeParameter.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/NullnessUnspecifiedTypeParameter.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/NullnessUnspecifiedTypeParameter.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/NullnessUnspecifiedTypeParameter.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/NullnessUnspecifiedTypeParameter.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/SelfType.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/SelfType.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/SelfType.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/SelfType.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/Simple.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/Simple.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/Simple.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/Simple.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/TypeArgumentsFromParameterBounds.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/TypeArgumentsFromParameterBounds.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/TypeArgumentsFromParameterBounds.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/TypeArgumentsFromParameterBounds.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/TypeParameterBounds.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/TypeParameterBounds.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/TypeParameterBounds.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/TypeParameterBounds.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/WildcardsWithDefault.java b/compiler/testData/foreignAnnotations/java8Tests/jspecify/java/WildcardsWithDefault.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/java/WildcardsWithDefault.java
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/java/WildcardsWithDefault.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Defaults.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Defaults.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Defaults.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Defaults.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Defaults.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Defaults.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Defaults.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Defaults.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/IgnoreAnnotations.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/IgnoreAnnotations.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/IgnoreAnnotations.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/IgnoreAnnotations.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/IgnoreAnnotations.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/IgnoreAnnotations.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/IgnoreAnnotations.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/IgnoreAnnotations.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/SelfType.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/SelfType.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/SelfType.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/SelfType.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/SelfType.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/SelfType.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/SelfType.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/SelfType.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Simple.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Simple.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Simple.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Simple.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Simple.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Simple.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Simple.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Simple.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeParameterBounds.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeParameterBounds.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeParameterBounds.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeParameterBounds.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeParameterBounds.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeParameterBounds.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeParameterBounds.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeParameterBounds.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/WildcardsWithDefault.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/WildcardsWithDefault.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/WildcardsWithDefault.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/WildcardsWithDefault.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/WildcardsWithDefault.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/WildcardsWithDefault.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/WildcardsWithDefault.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/WildcardsWithDefault.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Defaults.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Defaults.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Defaults.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Defaults.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Defaults.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Defaults.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Defaults.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Defaults.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/IgnoreAnnotations.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/IgnoreAnnotations.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/IgnoreAnnotations.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/IgnoreAnnotations.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/IgnoreAnnotations.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/IgnoreAnnotations.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/IgnoreAnnotations.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/IgnoreAnnotations.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/SelfType.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/SelfType.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/SelfType.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/SelfType.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/SelfType.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/SelfType.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/SelfType.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/SelfType.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Simple.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Simple.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Simple.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Simple.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Simple.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Simple.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Simple.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Simple.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeParameterBounds.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeParameterBounds.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeParameterBounds.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeParameterBounds.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeParameterBounds.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeParameterBounds.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeParameterBounds.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeParameterBounds.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/WildcardsWithDefault.kt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/WildcardsWithDefault.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/WildcardsWithDefault.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/WildcardsWithDefault.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/WildcardsWithDefault.txt b/compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/WildcardsWithDefault.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/WildcardsWithDefault.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/WildcardsWithDefault.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.kt
similarity index 98%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.kt
index 6dab460b47e..b456190a040 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // SKIP_JAVAC
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 
 // FILE: spr/NonNullApi.java
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.txt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt
similarity index 98%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt
index f42f4703406..e507782179b 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // SKIP_JAVAC
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 
 // FILE: spr/NonNullApi.java
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.txt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.kt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.txt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.kt
similarity index 83%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.kt
index ee376f2237e..fc9f997911b 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !WITH_NEW_INFERENCE
 // RENDER_PACKAGE: test
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 // WITH_RUNTIME
 // FILE: spr/Nullable.java
 
@@ -89,9 +89,9 @@ fun main(a: test.A, l: L<Map<String, Int>, Int?>, l1: L<Map<String, Int>, Int>)
     a.bar(<!TYPE_MISMATCH!>l1 <!UNCHECKED_CAST!>as L<Map<String, Int>, Int?><!><!>)
 
     a.baz1().t().containsKey("")
-    a.baz1().t().<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING, OI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>containsKey<!>(null)
+    a.baz1().t().<!TYPE_INFERENCE_ONLY_INPUT_TYPES{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING{NI}!>containsKey<!>(null)
     a.baz1().t().containsValue(1)
-    a.baz1().t().<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING, OI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>containsValue<!>(null)
+    a.baz1().t().<!TYPE_INFERENCE_ONLY_INPUT_TYPES{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING{NI}!>containsValue<!>(null)
     a.baz1().s().hashCode()
 
     a.baz1().setT(l.t())
@@ -105,8 +105,8 @@ fun main(a: test.A, l: L<Map<String, Int>, Int?>, l1: L<Map<String, Int>, Int>)
     a.baz2().s().hashCode()
 
     a.baz3().t().containsKey("")
-    a.baz3().t().<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING, OI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>containsKey<!>(null)
+    a.baz3().t().<!TYPE_INFERENCE_ONLY_INPUT_TYPES{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING{NI}!>containsKey<!>(null)
     a.baz3().t().containsValue(1)
-    a.baz3().t().<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING, OI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>containsValue<!>(null)
+    a.baz3().t().<!TYPE_INFERENCE_ONLY_INPUT_TYPES{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES_WARNING{NI}!>containsValue<!>(null)
     a.baz3().s().hashCode()
 }
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.txt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.kt
similarity index 98%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.kt
index d9931c5c933..a5e561a8b84 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // SKIP_JAVAC
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 
 // FILE: spr/NonNullApi.java
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.txt b/compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.txt
rename to compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.javac.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.javac.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.javac.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.javac.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.javac.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.javac.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.javac.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.javac.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.kt
similarity index 94%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.kt
index 064490eabc6..54447f6dc80 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.kt
@@ -1,4 +1,4 @@
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 // FILE: BaseClass.java
 import org.checkerframework.checker.nullness.qual.*;
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.kt
similarity index 94%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.kt
index 2485a94b269..6d9493a06ad 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.kt
@@ -1,4 +1,4 @@
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 // FILE: BaseClass.java
 import org.checkerframework.checker.nullness.qual.*;
 
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.javac.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.javac.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.javac.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.javac.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.kt
similarity index 95%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.kt
index f9b0196f55b..1779f2ff832 100644
--- a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt
+++ b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.kt
@@ -1,4 +1,4 @@
-// SKIP_COMPILED_JAVA
+// SOURCE_RETENTION_ANNOTATIONS
 // FILE: Base.java
 public interface Base<T> {}
 // FILE: A.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.txt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.txt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.java b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.java
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.java b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.java
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnType.java b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnType.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnType.java
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnType.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnType.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnType.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnType.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnType.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.java b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.java
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameter.java b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameter.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameter.java
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameter.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameter.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameter.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameter.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameter.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.java b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.java
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.java
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.java
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.kt b/compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt b/compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.kt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt
rename to compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.kt
diff --git a/compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.txt b/compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.txt
similarity index 100%
rename from compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.txt
rename to compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.txt
diff --git a/compiler/testData/foreignAnnotations/tests/androidRecently.kt b/compiler/testData/foreignAnnotations/tests/androidRecently.kt
index d1e0d25799b..87db9d10e37 100644
--- a/compiler/testData/foreignAnnotations/tests/androidRecently.kt
+++ b/compiler/testData/foreignAnnotations/tests/androidRecently.kt
@@ -28,7 +28,7 @@ public class A<T> {
 fun main(a: A<String>, a1: A<String?>) {
     a.foo("", null)?.length
     <!RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS("String?")!>a.foo("", null)<!>.length
-    <!RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS("String", "Nothing?")!>null<!>, "")<!>.length
+    <!RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS("String; Nothing?")!>null<!>, "")<!>.length
 
     a.bar().length
     a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt b/compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt
index 88e688729da..699d56e42b0 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT ignore
+// JSR305_GLOBAL_REPORT: ignore
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt
index 577e1f7f007..0d8430398c6 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: MyNotNull.java
 import javax.annotation.Nonnull;
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt
index afcf67e81f6..553a9ed4f19 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt
index 7fa13399fa1..250f5d751d0 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt
index ac2604e3d0a..7f242acc517 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
@@ -23,4 +23,4 @@ fun test() {
     n = J.staticNN
     n = J.staticN
     n = J.staticJ
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt
index ca1893a3de0..1fa019d5b35 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt
index e605d9401e2..ee206e827cf 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
@@ -28,4 +28,4 @@ fun test() {
     }
 }
 
-fun foo(j: J) {}
\ No newline at end of file
+fun foo(j: J) {}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt
index ae0230cd4fe..9e7593d52a1 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
@@ -21,4 +21,4 @@ fun test() {
     fun foo(p: J = platformNN, p1: J = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>, p2: J = platformJ) {}
 
     fun foo1(p: J? = platformNN, p1: J? = platformN, p2: J? = platformJ) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt
index a1a1271e667..a2dff017faf 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt
index b68e3d8ce6b..01103a43cc4 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 // FULL_JDK
 // FILE: J.java
 
@@ -16,4 +16,4 @@ public class J {
 
 class A : List<String> by J.staticNN
 class B : List<String> by <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>J.staticN<!>
-class C : List<String> by J.staticJ
\ No newline at end of file
+class C : List<String> by J.staticJ
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt
index 2b2597e624c..bfb6cfd93db 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt
index c2a7b613c5e..207a8578d78 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt
index fe78c4c18d6..deb8609a588 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt
@@ -1,5 +1,5 @@
 // !CHECK_TYPE
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt
index aa9903cad3a..5d5cf0bc3d0 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt
index 3b88e1a4faa..766ddce2c58 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
@@ -24,4 +24,4 @@ fun test() {
 }
 
 fun foo(j: J) {}
-fun bar(j: J?) {}
\ No newline at end of file
+fun bar(j: J?) {}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt
index f139bb0c8ac..56f66ef3048 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt
index 1ddfc4b8ed5..6c4cd9997c8 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // KT-6829 False warning on map to @Nullable
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt
index da222f94377..db8b11f6fc6 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt
index 1be98d46514..0942cef64a1 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
@@ -87,4 +87,4 @@ fun test(n: J?, nn: J) {
     J(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>n<!>, n, n)
     J(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>platformN<!>, platformN, platformN)
     J(platformJ, platformJ, platformJ)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt
index 41df7a664ac..4d7e339f976 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt
index 063d5a8040a..d1f329b07ec 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt
@@ -1,4 +1,4 @@
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
@@ -22,4 +22,4 @@ fun test1() {
 
 fun test2() {
     throw J.staticJ
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt
index a45fb76b54d..ed18465e1d4 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: J.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt
index 91a649fc727..ba8daa5eb6d 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_EXPRESSION
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: MyNotNull.java
 import javax.annotation.Nonnull;
@@ -93,4 +93,4 @@ fun ifChecksAndSmartCasts() {
     // Platform
     val r5 = if (e == null) 42 else e.length
     val r6 = if (f == null) 42 else <!DEBUG_INFO_SMARTCAST!>f<!>.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt
index 1833cedee0b..eec05644e1f 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: A.java
 public class A<T> {
@@ -38,4 +38,4 @@ fun test() {
     a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
 
     val b: String = <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.bar()<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt
index e3925d20cb4..e0a88b0452c 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: MyNullable.java
 import javax.annotation.*;
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt
index 401bd236b74..39c0347a208 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: MyNotNull.java
 import javax.annotation.Nonnull;
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt
index 08ad56c2509..59063f744a1 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt
index 4d523713f40..5a2b75f10d6 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt
index 7a293e23b98..7f16516d921 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: spr/NonNullApi.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt
index 430fca93cf7..fd4307af307 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: FieldsAreNullable.java
 import java.lang.annotation.Documented;
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt
index 68e1be1e1bd..bcc0288c1ed 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: NonNullApi.java
 
@@ -156,4 +156,4 @@ fun main(a: A, b: B, c: C) {
     c.bar1(null)?.length
     c.bar2(null)<!UNSAFE_CALL!>.<!>length
     c.baz(<!NULL_FOR_NONNULL_TYPE!>null<!>).length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt
index dfa676a71d5..5d96db14821 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: NonNullApi.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt
index e84522ab81f..88c9350f771 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt
index 82bdb9efe2f..60a195b55e0 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: test/package-info.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt
index 47af51393bd..4d5c7f9d1f5 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: spr/Nullable.java
 
@@ -69,7 +69,7 @@ public class A {
 fun main(a: A) {
     a.foo("", null)<!UNNECESSARY_SAFE_CALL!>?.<!>length
     a.foo("", null).length
-    a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS("String", "Nothing?")!>null<!>, "").length
+    a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS("String; Nothing?")!>null<!>, "").length
 
     a.bar().length
     a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt
index a6d55046292..c258023f619 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: spr/Nullable.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt b/compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt
index 84bb68a0baf..dca155d9b83 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// RENDER_PACKAGE: test
-// RENDER_PACKAGE: test2
+// RENDER_PACKAGE: test, test2
 
 // FILE: test/package-info.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt
index 901f060308d..872c955e69c 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT ignore
+// JSR305_GLOBAL_REPORT: ignore
 
 // FILE: MyErrorNonnull.java
 import javax.annotation.*;
@@ -81,4 +81,4 @@ fun main(a: A) {
 
     a.foo4("")
     a.foo4(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt
index 72245c8be03..32f86ddb6df 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT ignore
-// JSR305_MIGRATION_REPORT strict
-// JSR305_SPECIAL_REPORT MyNonnull:warn
+// JSR305_GLOBAL_REPORT: ignore
+// JSR305_MIGRATION_REPORT: strict
+// JSR305_SPECIAL_REPORT: MyNonnull:warn
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt
index 571c247ac0a..dd19df3595c 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
-// JSR305_MIGRATION_REPORT ignore
-// JSR305_SPECIAL_REPORT MyNullable:strict, MyMigrationNonnull:strict
+// JSR305_GLOBAL_REPORT: warn
+// JSR305_MIGRATION_REPORT: ignore
+// JSR305_SPECIAL_REPORT: MyNullable:strict, MyMigrationNonnull:strict
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt
index d881422d507..d4ec6cc35ef 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
-// JSR305_MIGRATION_REPORT strict
-// JSR305_SPECIAL_REPORT MyNonnull:ignore, MySuperNull:strict
+// JSR305_GLOBAL_REPORT: warn
+// JSR305_MIGRATION_REPORT: strict
+// JSR305_SPECIAL_REPORT: MyNonnull:ignore, MySuperNull:strict
 
 // FILE: MySuperNull.java
 import javax.annotation.*;
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt
index d0557e9655e..e545e32d7b2 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT strict
-// JSR305_MIGRATION_REPORT ignore
-// JSR305_SPECIAL_REPORT MyNullable:warn, MyMigrationNonnull:strict
+// JSR305_GLOBAL_REPORT: strict
+// JSR305_MIGRATION_REPORT: ignore
+// JSR305_SPECIAL_REPORT: MyNullable:warn, MyMigrationNonnull:strict
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt
index 8c636fbbd5a..3ff18b11f3e 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT strict
-// JSR305_MIGRATION_REPORT warn
-// JSR305_SPECIAL_REPORT MyNullable:ignore, MyMigrationNullable:strict
+// JSR305_GLOBAL_REPORT: strict
+// JSR305_MIGRATION_REPORT: warn
+// JSR305_SPECIAL_REPORT: MyNullable:ignore, MyMigrationNullable:strict
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt
index 649a59425dc..e1f6c124fdb 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
-// JSR305_MIGRATION_REPORT strict
+// JSR305_GLOBAL_REPORT: warn
+// JSR305_MIGRATION_REPORT: strict
 
 // FILE: A.java
 import javax.annotation.Nullable;
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt
index adb449454cb..f81586e0dfd 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT ignore
-// JSR305_MIGRATION_REPORT ignore
-// JSR305_SPECIAL_REPORT MyNonnull:warn, MyMigrationNonnull:strict
+// JSR305_GLOBAL_REPORT: ignore
+// JSR305_MIGRATION_REPORT: ignore
+// JSR305_SPECIAL_REPORT: MyNonnull:warn, MyMigrationNonnull:strict
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt
index f5669b101d9..8e9879de5a3 100644
--- a/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt
+++ b/compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT ignore
-// JSR305_MIGRATION_REPORT warn
-// JSR305_SPECIAL_REPORT MyNonnull:strict
+// JSR305_GLOBAL_REPORT: ignore
+// JSR305_MIGRATION_REPORT: warn
+// JSR305_SPECIAL_REPORT: MyNonnull:strict
 
 // FILE: A.java
 
diff --git a/compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt b/compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt
index 15e8c92e4a9..3f5d6a0fc90 100644
--- a/compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt
+++ b/compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_GLOBAL_REPORT warn
+// JSR305_GLOBAL_REPORT: warn
 
 // FILE: NonNullApi.java
 
@@ -66,4 +66,4 @@ fun main(default: PolicyFromDefault, nickname: PolicyFromNickname) {
 
     nickname.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>).length
     nickname.foo("hello").length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt
index 35b49f52d51..dac9b0059cd 100644
--- a/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt
+++ b/compiler/testData/ir/irText/classes/inlineClassSyntheticMethods.fir.txt
@@ -95,7 +95,7 @@ FILE fqName:<root> fileName:/inlineClassSyntheticMethods.kt
       $this: VALUE_PARAMETER GENERATED_INLINE_CLASS_MEMBER name:<this> type:<root>.IC<TT of <root>.IC>
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.IC'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+          CALL 'public final fun hashCode (): kotlin.Int declared in <root>.C' type=kotlin.Int origin=null
             $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:c type:<root>.C<TT of <root>.IC> visibility:private [final]' type=<root>.C<TT of <root>.IC> origin=null
               receiver: GET_VAR '<this>: <root>.IC<TT of <root>.IC> declared in <root>.IC.hashCode' type=<root>.IC<TT of <root>.IC> origin=null
     FUN GENERATED_INLINE_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.IC<TT of <root>.IC>) returnType:kotlin.String
diff --git a/compiler/testData/ir/irText/classes/kt19306.kt b/compiler/testData/ir/irText/classes/kt19306.kt
new file mode 100644
index 00000000000..984402638ab
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt19306.kt
@@ -0,0 +1,17 @@
+// SKIP_KT_DUMP
+// FILE: kt19306_test1.kt
+package test1
+
+abstract class A {
+    protected var p = ""
+        private set
+}
+
+// FILE: kt19306_test2.kt
+package test2
+
+import test1.A
+
+class B : A() {
+    fun test() = { -> p }
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/classes/kt19306_test1.fir.txt b/compiler/testData/ir/irText/classes/kt19306_test1.fir.txt
new file mode 100644
index 00000000000..4fa37d61152
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt19306_test1.fir.txt
@@ -0,0 +1,39 @@
+FILE fqName:test1 fileName:/kt19306_test1.kt
+  CLASS CLASS name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test1.A
+    CONSTRUCTOR visibility:public <> () returnType:test1.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:p visibility:protected modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.String visibility:private
+        EXPRESSION_BODY
+          CONST String type=kotlin.String value=""
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:protected modality:FINAL <> ($this:test1.A) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:p visibility:protected modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:test1.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='protected final fun <get-p> (): kotlin.String declared in test1.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.String visibility:private' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: test1.A declared in test1.A.<get-p>' type=test1.A origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:private modality:FINAL <> ($this:test1.A, <set-?>:kotlin.String) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:p visibility:protected modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:test1.A
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.String visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: test1.A declared in test1.A.<set-p>' type=test1.A origin=null
+            value: GET_VAR '<set-?>: kotlin.String declared in test1.A.<set-p>' type=kotlin.String origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/kt19306_test1.txt b/compiler/testData/ir/irText/classes/kt19306_test1.txt
new file mode 100644
index 00000000000..4fa37d61152
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt19306_test1.txt
@@ -0,0 +1,39 @@
+FILE fqName:test1 fileName:/kt19306_test1.kt
+  CLASS CLASS name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test1.A
+    CONSTRUCTOR visibility:public <> () returnType:test1.A [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:p visibility:protected modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.String visibility:private
+        EXPRESSION_BODY
+          CONST String type=kotlin.String value=""
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-p> visibility:protected modality:FINAL <> ($this:test1.A) returnType:kotlin.String
+        correspondingProperty: PROPERTY name:p visibility:protected modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:test1.A
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='protected final fun <get-p> (): kotlin.String declared in test1.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.String visibility:private' type=kotlin.String origin=null
+              receiver: GET_VAR '<this>: test1.A declared in test1.A.<get-p>' type=test1.A origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-p> visibility:private modality:FINAL <> ($this:test1.A, <set-?>:kotlin.String) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:p visibility:protected modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:test1.A
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.String
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.String visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: test1.A declared in test1.A.<set-p>' type=test1.A origin=null
+            value: GET_VAR '<set-?>: kotlin.String declared in test1.A.<set-p>' type=kotlin.String origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/kt19306_test2.fir.txt b/compiler/testData/ir/irText/classes/kt19306_test2.fir.txt
new file mode 100644
index 00000000000..967a701cd4e
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt19306_test2.fir.txt
@@ -0,0 +1,36 @@
+FILE fqName:test2 fileName:/kt19306_test2.kt
+  CLASS CLASS name:B modality:FINAL visibility:public superTypes:[test1.A]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test2.B
+    CONSTRUCTOR visibility:public <> () returnType:test2.B [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in test1.A'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public superTypes:[test1.A]'
+    FUN name:test visibility:public modality:FINAL <> ($this:test2.B) returnType:kotlin.Function0<kotlin.String>
+      $this: VALUE_PARAMETER name:<this> type:test2.B
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun test (): kotlin.Function0<kotlin.String> declared in test2.B'
+          FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in test2.B.test'
+                  CALL 'protected final fun <get-p> (): kotlin.String declared in test1.A' type=kotlin.String origin=GET_PROPERTY
+                    $this: GET_VAR '<this>: test2.B declared in test2.B.test' type=test2.B origin=null
+    PROPERTY FAKE_OVERRIDE name:p visibility:protected modality:FINAL [fake_override,var]
+      FUN FAKE_OVERRIDE name:<get-p> visibility:protected modality:FINAL <> ($this:test1.A) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:p visibility:protected modality:FINAL [fake_override,var]
+        overridden:
+          protected final fun <get-p> (): kotlin.String declared in test1.A
+        $this: VALUE_PARAMETER name:<this> type:test1.A
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/kt19306_test2.txt b/compiler/testData/ir/irText/classes/kt19306_test2.txt
new file mode 100644
index 00000000000..07b3e3b2e33
--- /dev/null
+++ b/compiler/testData/ir/irText/classes/kt19306_test2.txt
@@ -0,0 +1,36 @@
+FILE fqName:test2 fileName:/kt19306_test2.kt
+  CLASS CLASS name:B modality:FINAL visibility:public superTypes:[test1.A]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:test2.B
+    CONSTRUCTOR visibility:public <> () returnType:test2.B [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in test1.A'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:B modality:FINAL visibility:public superTypes:[test1.A]'
+    FUN name:test visibility:public modality:FINAL <> ($this:test2.B) returnType:kotlin.Function0<kotlin.String>
+      $this: VALUE_PARAMETER name:<this> type:test2.B
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun test (): kotlin.Function0<kotlin.String> declared in test2.B'
+          FUN_EXPR type=kotlin.Function0<kotlin.String> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.String
+              BLOCK_BODY
+                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.String declared in test2.B.test'
+                  CALL 'protected final fun <get-p> (): kotlin.String [fake_override] declared in test2.B' type=kotlin.String origin=GET_PROPERTY
+                    $this: GET_VAR '<this>: test2.B declared in test2.B.test' type=test2.B origin=null
+    PROPERTY FAKE_OVERRIDE name:p visibility:protected modality:FINAL [fake_override,var]
+      FUN FAKE_OVERRIDE name:<get-p> visibility:protected modality:FINAL <> ($this:test1.A) returnType:kotlin.String [fake_override]
+        correspondingProperty: PROPERTY FAKE_OVERRIDE name:p visibility:protected modality:FINAL [fake_override,var]
+        overridden:
+          protected final fun <get-p> (): kotlin.String declared in test1.A
+        $this: VALUE_PARAMETER name:<this> type:test1.A
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in test1.A
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int [fake_override] declared in test1.A
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String [fake_override] declared in test1.A
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt
index 921be13b44b..41833762667 100644
--- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt
+++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt
@@ -81,7 +81,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
       $this: VALUE_PARAMETER GENERATED_DATA_CLASS_MEMBER name:<this> type:<root>.A
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.A'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+          CALL 'public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.Function2' type=kotlin.Int origin=null
             $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:private [final]' type=@[ExtensionFunctionType] kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
               receiver: GET_VAR '<this>: <root>.A declared in <root>.A.hashCode' type=<root>.A origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.A) returnType:kotlin.String
diff --git a/compiler/testData/ir/irText/expressions/kt36963.fir.txt b/compiler/testData/ir/irText/expressions/kt36963.fir.txt
deleted file mode 100644
index 334ffd0f603..00000000000
--- a/compiler/testData/ir/irText/expressions/kt36963.fir.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-FILE fqName:<root> fileName:/kt36963.kt
-  FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit
-    BLOCK_BODY
-  FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction0<kotlin.Unit>
-    BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (): kotlin.reflect.KFunction0<kotlin.Unit> declared in <root>'
-        CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): T0 of kotlin.internal.ir.CHECK_NOT_NULL declared in kotlin.internal.ir' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=EXCLEXCL
-          <T0>: kotlin.reflect.KFunction0<kotlin.Unit>
-          arg0: FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null reflectionTarget=<same>
diff --git a/compiler/testData/ir/irText/expressions/kt36963.kt b/compiler/testData/ir/irText/expressions/kt36963.kt
index f2eb7497c47..0c7fbc90274 100644
--- a/compiler/testData/ir/irText/expressions/kt36963.kt
+++ b/compiler/testData/ir/irText/expressions/kt36963.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 fun foo() {}
 
 fun test() = (::foo)!!
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/expressions/kt36963.kt.txt b/compiler/testData/ir/irText/expressions/kt36963.kt.txt
index ffb3b8a04d3..f156845fb79 100644
--- a/compiler/testData/ir/irText/expressions/kt36963.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt36963.kt.txt
@@ -1,7 +1,7 @@
 fun foo() {
 }
 
-fun test(): ErrorType {
+fun test(): KFunction0<Unit> {
   return CHECK_NOT_NULL<KFunction0<Unit>>(arg0 = ::foo)
 }
 
diff --git a/compiler/testData/ir/irText/expressions/kt36963.txt b/compiler/testData/ir/irText/expressions/kt36963.txt
index 2930185f6f7..334ffd0f603 100644
--- a/compiler/testData/ir/irText/expressions/kt36963.txt
+++ b/compiler/testData/ir/irText/expressions/kt36963.txt
@@ -1,9 +1,9 @@
 FILE fqName:<root> fileName:/kt36963.kt
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
-  FUN name:test visibility:public modality:FINAL <> () returnType:IrErrorType
+  FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction0<kotlin.Unit>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test (): kotlin.reflect.KFunction0<kotlin.Unit> declared in <root>'
         CALL 'public final fun CHECK_NOT_NULL <T0> (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): T0 of kotlin.internal.ir.CHECK_NOT_NULL declared in kotlin.internal.ir' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=EXCLEXCL
           <T0>: kotlin.reflect.KFunction0<kotlin.Unit>
           arg0: FUNCTION_REFERENCE 'public final fun foo (): kotlin.Unit declared in <root>' type=kotlin.reflect.KFunction0<kotlin.Unit> origin=null reflectionTarget=<same>
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.kt.txt
index ee1b3d61c77..8a6af5e2cfa 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.kt.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.kt.txt
@@ -44,11 +44,11 @@ fun test6(a: Any) {
 
 fun test7(a: Function1<Int, Int>) {
   a as Function0<Unit> /*~> Unit */
-  error("") /* ErrorCallExpression */a /*as Function0<Unit> */;
+  J().run1(r = a /*as Function0<Unit> */ /*-> Runnable? */)
 }
 
 fun test8(a: Function0<Unit>) {
-  error("") /* ErrorCallExpression */id<Function0<Unit>?>(x = a);
+  J().run1(r = id<Function0<Unit>?>(x = a) /*-> Runnable? */)
 }
 
 fun test9() {
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
index 40cc1ac952e..720cf65c0da 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
@@ -91,16 +91,20 @@ FILE fqName:<root> fileName:/samConversionsWithSmartCasts.kt
       TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
         TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
           GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /J.run1>#' type=kotlin.Unit
-        TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
-          GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
+      CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        $this: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.J' type=<root>.J origin=null
+        r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable?
+          TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
+            GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
   FUN name:test8 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit>
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): /J.run1>#' type=kotlin.Unit
-        CALL 'public open fun id <T> (x: T of <root>.J.id?): T of <root>.J.id? declared in <root>.J' type=kotlin.Function0<kotlin.Unit>? origin=null
-          <T>: kotlin.Function0<kotlin.Unit>?
-          x: GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test8' type=kotlin.Function0<kotlin.Unit> origin=null
+      CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        $this: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.J' type=<root>.J origin=null
+        r: TYPE_OP type=java.lang.Runnable? origin=SAM_CONVERSION typeOperand=java.lang.Runnable?
+          CALL 'public open fun id <T> (x: T of <root>.J.id?): T of <root>.J.id? declared in <root>.J' type=kotlin.Function0<kotlin.Unit>? origin=null
+            <T>: kotlin.Function0<kotlin.Unit>?
+            x: GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test8' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:test9 visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
       CALL 'public open fun run1 (r: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
diff --git a/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.kt.txt b/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.kt.txt
index b56406a3173..41ae8a9e89d 100644
--- a/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.kt.txt
+++ b/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.kt.txt
@@ -157,7 +157,7 @@ fun testSmartCastWithSuspendConversion(a: Any) {
       callee.invoke()
     }
 
-    a::suspendConversion0
+    a /*as Function0<Unit> */::suspendConversion0
   })
 }
 
@@ -169,7 +169,7 @@ fun testSmartCastOnVarWithSuspendConversion(a: Any) {
       callee.invoke()
     }
 
-    b::suspendConversion0
+    b /*as Function0<Unit> */::suspendConversion0
   })
 }
 
diff --git a/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.txt b/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.txt
index e779c2032d2..74a8f6f05c5 100644
--- a/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.txt
+++ b/compiler/testData/ir/irText/expressions/suspendConversionOnArbitraryExpression.txt
@@ -227,7 +227,8 @@ FILE fqName:<root> fileName:/suspendConversionOnArbitraryExpression.kt
               CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=kotlin.Unit origin=null
                 $this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.testSmartCastWithSuspendConversion.suspendConversion0' type=kotlin.Function0<kotlin.Unit> origin=null
           FUNCTION_REFERENCE 'local final fun suspendConversion0 (): kotlin.Unit [suspend] declared in <root>.testSmartCastWithSuspendConversion' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
-            $receiver: GET_VAR 'a: kotlin.Any declared in <root>.testSmartCastWithSuspendConversion' type=kotlin.Any origin=null
+            $receiver: TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
+              GET_VAR 'a: kotlin.Any declared in <root>.testSmartCastWithSuspendConversion' type=kotlin.Any origin=null
   FUN name:testSmartCastOnVarWithSuspendConversion visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Any
     BLOCK_BODY
@@ -244,7 +245,8 @@ FILE fqName:<root> fileName:/suspendConversionOnArbitraryExpression.kt
               CALL 'public abstract fun invoke (): R of kotlin.Function0 [operator] declared in kotlin.Function0' type=kotlin.Unit origin=null
                 $this: GET_VAR 'callee: kotlin.Function0<kotlin.Unit> declared in <root>.testSmartCastOnVarWithSuspendConversion.suspendConversion0' type=kotlin.Function0<kotlin.Unit> origin=null
           FUNCTION_REFERENCE 'local final fun suspendConversion0 (): kotlin.Unit [suspend] declared in <root>.testSmartCastOnVarWithSuspendConversion' type=kotlin.coroutines.SuspendFunction0<kotlin.Unit> origin=SUSPEND_CONVERSION reflectionTarget=null
-            $receiver: GET_VAR 'var b: kotlin.Any [var] declared in <root>.testSmartCastOnVarWithSuspendConversion' type=kotlin.Any origin=null
+            $receiver: TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=IMPLICIT_CAST typeOperand=kotlin.Function0<kotlin.Unit>
+              GET_VAR 'var b: kotlin.Any [var] declared in <root>.testSmartCastOnVarWithSuspendConversion' type=kotlin.Any origin=null
   FUN name:testSmartCastVsSuspendConversion visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit
     VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit>
     BLOCK_BODY
diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.txt
index b034dcca96b..c2fbb9ed3f7 100644
--- a/compiler/testData/ir/irText/firProblems/SignatureClash.fir.txt
+++ b/compiler/testData/ir/irText/firProblems/SignatureClash.fir.txt
@@ -169,7 +169,7 @@ FILE fqName:<root> fileName:/SignatureClash.kt
       $this: VALUE_PARAMETER GENERATED_DATA_CLASS_MEMBER name:<this> type:<root>.DataClass
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in <root>.DataClass'
-          CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
+          CALL 'public open fun hashCode (): kotlin.Int [fake_override] declared in <root>.Delegate' type=kotlin.Int origin=null
             $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:delegate type:<root>.Delegate visibility:private [final]' type=<root>.Delegate origin=null
               receiver: GET_VAR '<this>: <root>.DataClass declared in <root>.DataClass.hashCode' type=<root>.DataClass origin=null
     FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:<root>.DataClass) returnType:kotlin.String
diff --git a/compiler/testData/ir/irText/firProblems/SyntheticSetterType.fir.kt.txt b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.fir.kt.txt
new file mode 100644
index 00000000000..617548322fa
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.fir.kt.txt
@@ -0,0 +1,3 @@
+fun foo(descriptor: PropertyDescriptorImpl) {
+  descriptor.setOverriddenDescriptors(overriddenDescriptors = emptyList<PropertyDescriptor?>())
+}
diff --git a/compiler/testData/ir/irText/firProblems/SyntheticSetterType.fir.txt b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.fir.txt
new file mode 100644
index 00000000000..3d107bdafb2
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.fir.txt
@@ -0,0 +1,8 @@
+FILE fqName:<root> fileName:/SyntheticSetterType.kt
+  FUN name:foo visibility:public modality:FINAL <> (descriptor:<root>.PropertyDescriptorImpl) returnType:kotlin.Unit
+    VALUE_PARAMETER name:descriptor index:0 type:<root>.PropertyDescriptorImpl
+    BLOCK_BODY
+      CALL 'public open fun setOverriddenDescriptors (overriddenDescriptors: @[EnhancedNullability] kotlin.collections.Collection<out <root>.CallableMemberDescriptor?>): kotlin.Unit declared in <root>.PropertyDescriptorImpl' type=kotlin.Unit origin=EQ
+        $this: GET_VAR 'descriptor: <root>.PropertyDescriptorImpl declared in <root>.foo' type=<root>.PropertyDescriptorImpl origin=null
+        overriddenDescriptors: CALL 'public final fun emptyList <T> (): kotlin.collections.List<T of kotlin.collections.emptyList> declared in kotlin.collections' type=kotlin.collections.List<<root>.PropertyDescriptor?> origin=null
+          <T>: <root>.PropertyDescriptor?
diff --git a/compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt
new file mode 100644
index 00000000000..3a0d6011f78
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt
@@ -0,0 +1,47 @@
+// WITH_RUNTIME
+// FILE: PropertyDescriptorImpl.java
+
+import org.jetbrains.annotations.NotNull;
+import java.util.*;
+
+public class PropertyDescriptorImpl implements PropertyDescriptor {
+    @Override
+    public void setOverriddenDescriptors(@NotNull Collection<? extends CallableMemberDescriptor> overriddenDescriptors) {
+        this.overriddenProperties = (Collection<? extends PropertyDescriptor>) overriddenDescriptors;
+    }
+
+    @NotNull
+    @Override
+    public Collection<? extends PropertyDescriptor> getOverriddenDescriptors() {
+        return overriddenProperties != null ? overriddenProperties : Collections.<PropertyDescriptor>emptyList();
+    }
+}
+
+// FILE: PropertyDescriptor.java
+
+import org.jetbrains.annotations.NotNull;
+import java.util.*;
+
+public interface PropertyDescriptor extends CallableMemberDescriptor {
+    @NotNull
+    @Override
+    Collection<? extends PropertyDescriptor> getOverriddenDescriptors();
+}
+
+// FILE: CallableMemberDescriptor.java
+
+import org.jetbrains.annotations.NotNull;
+import java.util.*;
+
+public interface CallableMemberDescriptor {
+    @NotNull
+    Collection<? extends CallableMemberDescriptor> getOverriddenDescriptors();
+
+    void setOverriddenDescriptors(@NotNull Collection<? extends CallableMemberDescriptor> overriddenDescriptors);
+}
+
+// FILE: SyntheticSetterType.kt
+
+fun foo(descriptor: PropertyDescriptorImpl) {
+    descriptor.overriddenDescriptors = emptyList()
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt.txt b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt.txt
new file mode 100644
index 00000000000..0fbad156101
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt.txt
@@ -0,0 +1,3 @@
+fun foo(descriptor: PropertyDescriptorImpl) {
+  descriptor.setOverriddenDescriptors(overriddenDescriptors = emptyList<@FlexibleNullability PropertyDescriptor?>())
+}
diff --git a/compiler/testData/ir/irText/firProblems/SyntheticSetterType.txt b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.txt
new file mode 100644
index 00000000000..bcdd3eb5187
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/SyntheticSetterType.txt
@@ -0,0 +1,8 @@
+FILE fqName:<root> fileName:/SyntheticSetterType.kt
+  FUN name:foo visibility:public modality:FINAL <> (descriptor:<root>.PropertyDescriptorImpl) returnType:kotlin.Unit
+    VALUE_PARAMETER name:descriptor index:0 type:<root>.PropertyDescriptorImpl
+    BLOCK_BODY
+      CALL 'public open fun setOverriddenDescriptors (overriddenDescriptors: @[EnhancedNullability] kotlin.collections.MutableCollection<out @[FlexibleNullability] <root>.CallableMemberDescriptor?>): kotlin.Unit declared in <root>.PropertyDescriptorImpl' type=kotlin.Unit origin=EQ
+        $this: GET_VAR 'descriptor: <root>.PropertyDescriptorImpl declared in <root>.foo' type=<root>.PropertyDescriptorImpl origin=null
+        overriddenDescriptors: CALL 'public final fun emptyList <T> (): kotlin.collections.List<T of kotlin.collections.emptyList> declared in kotlin.collections' type=kotlin.collections.List<@[FlexibleNullability] <root>.PropertyDescriptor?> origin=null
+          <T>: @[FlexibleNullability] <root>.PropertyDescriptor?
diff --git a/compiler/testData/ir/irText/firProblems/readWriteProperty.fir.kt.txt b/compiler/testData/ir/irText/firProblems/readWriteProperty.fir.kt.txt
new file mode 100644
index 00000000000..72f6380c202
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/readWriteProperty.fir.kt.txt
@@ -0,0 +1,76 @@
+class SettingType<out V : Any> {
+  constructor(type: KClass<out V>) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  val type: KClass<out V>
+    field = type
+    get
+
+}
+
+class SettingReference<V : Any, T : SettingType<V>> {
+  constructor(t: T, v: V) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  var t: T
+    field = t
+    get
+    set
+
+  var v: V
+    field = v
+    get
+    set
+
+}
+
+class IdeWizard {
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  var projectTemplate: Int? /* by */
+    field = <this>.setting<Int, SettingType<Int>>(reference = SettingReference<Int, SettingType<Int>>(t = SettingType<Int>(type = 42::class), v = 42))
+    get(): Int? {
+      return <this>.#projectTemplate$delegate.getValue(thisRef = <this>, property = IdeWizard::projectTemplate)
+    }
+    set(<set-?>: Int?) {
+      <this>.#projectTemplate$delegate.setValue(thisRef = <this>, property = IdeWizard::projectTemplate, value = <set-?>)
+    }
+
+  private fun <V : Any, T : SettingType<V>> setting(reference: SettingReference<V, T>): <no name provided><V, T> {
+    return { // BLOCK
+      local class <no name provided> : ReadWriteProperty<Any?, V?> {
+        private constructor() /* primary */ {
+          super/*Any*/()
+          /* <init>() */
+
+        }
+
+        override operator fun setValue(thisRef: Any?, property: KProperty<*>, value: V?) {
+          when {
+            EQEQ(arg0 = value, arg1 = null) -> return Unit
+          }
+          reference.<set-t>(<set-?> = SettingType<V>(type = value /*as V */::class) as T)
+          reference.<set-v>(<set-?> = value /*as V */)
+        }
+
+        override operator fun getValue(thisRef: Any?, property: KProperty<*>): V? {
+          return reference.<get-v>()
+        }
+
+      }
+
+      <no name provided>()
+    }
+  }
+
+}
diff --git a/compiler/testData/ir/irText/firProblems/readWriteProperty.fir.txt b/compiler/testData/ir/irText/firProblems/readWriteProperty.fir.txt
new file mode 100644
index 00000000000..c7de57617e9
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/readWriteProperty.fir.txt
@@ -0,0 +1,214 @@
+FILE fqName:<root> fileName:/readWriteProperty.kt
+  CLASS CLASS name:SettingType modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.SettingType<V of <root>.SettingType>
+    TYPE_PARAMETER name:V index:0 variance:out superTypes:[kotlin.Any]
+    CONSTRUCTOR visibility:public <> (type:kotlin.reflect.KClass<out V of <root>.SettingType>) returnType:<root>.SettingType<V of <root>.SettingType> [primary]
+      VALUE_PARAMETER name:type index:0 type:kotlin.reflect.KClass<out V of <root>.SettingType>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SettingType modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:type visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.reflect.KClass<out V of <root>.SettingType> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'type: kotlin.reflect.KClass<out V of <root>.SettingType> declared in <root>.SettingType.<init>' type=kotlin.reflect.KClass<out V of <root>.SettingType> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-type> visibility:public modality:FINAL <> ($this:<root>.SettingType<V of <root>.SettingType>) returnType:kotlin.reflect.KClass<out V of <root>.SettingType>
+        correspondingProperty: PROPERTY name:type visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingType<V of <root>.SettingType>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-type> (): kotlin.reflect.KClass<out V of <root>.SettingType> declared in <root>.SettingType'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.reflect.KClass<out V of <root>.SettingType> visibility:private [final]' type=kotlin.reflect.KClass<out V of <root>.SettingType> origin=null
+              receiver: GET_VAR '<this>: <root>.SettingType<V of <root>.SettingType> declared in <root>.SettingType.<get-type>' type=<root>.SettingType<V of <root>.SettingType> origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:SettingReference modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+    TYPE_PARAMETER name:V index:0 variance: superTypes:[kotlin.Any]
+    TYPE_PARAMETER name:T index:1 variance: superTypes:[<root>.SettingType<V of <root>.SettingReference>]
+    CONSTRUCTOR visibility:public <> (t:T of <root>.SettingReference, v:V of <root>.SettingReference) returnType:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> [primary]
+      VALUE_PARAMETER name:t index:0 type:T of <root>.SettingReference
+      VALUE_PARAMETER name:v index:1 type:V of <root>.SettingReference
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SettingReference modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:t visibility:public modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:t type:T of <root>.SettingReference visibility:private
+        EXPRESSION_BODY
+          GET_VAR 't: T of <root>.SettingReference declared in <root>.SettingReference.<init>' type=T of <root>.SettingReference origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-t> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>) returnType:T of <root>.SettingReference
+        correspondingProperty: PROPERTY name:t visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-t> (): T of <root>.SettingReference declared in <root>.SettingReference'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:t type:T of <root>.SettingReference visibility:private' type=T of <root>.SettingReference origin=null
+              receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<get-t>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-t> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>, <set-?>:T of <root>.SettingReference) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:t visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        VALUE_PARAMETER name:<set-?> index:0 type:T of <root>.SettingReference
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:t type:T of <root>.SettingReference visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<set-t>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+            value: GET_VAR '<set-?>: T of <root>.SettingReference declared in <root>.SettingReference.<set-t>' type=T of <root>.SettingReference origin=null
+    PROPERTY name:v visibility:public modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:v type:V of <root>.SettingReference visibility:private
+        EXPRESSION_BODY
+          GET_VAR 'v: V of <root>.SettingReference declared in <root>.SettingReference.<init>' type=V of <root>.SettingReference origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-v> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>) returnType:V of <root>.SettingReference
+        correspondingProperty: PROPERTY name:v visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-v> (): V of <root>.SettingReference declared in <root>.SettingReference'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:v type:V of <root>.SettingReference visibility:private' type=V of <root>.SettingReference origin=null
+              receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<get-v>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-v> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>, <set-?>:V of <root>.SettingReference) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:v visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        VALUE_PARAMETER name:<set-?> index:0 type:V of <root>.SettingReference
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:v type:V of <root>.SettingReference visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<set-v>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+            value: GET_VAR '<set-?>: V of <root>.SettingReference declared in <root>.SettingReference.<set-v>' type=V of <root>.SettingReference origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:IdeWizard modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IdeWizard
+    CONSTRUCTOR visibility:public <> () returnType:<root>.IdeWizard [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:IdeWizard modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:projectTemplate visibility:public modality:FINAL [delegated,var]
+      FIELD PROPERTY_DELEGATE name:projectTemplate$delegate type:<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> visibility:private [final]
+        EXPRESSION_BODY
+          CALL 'private final fun setting <V, T> (reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>): <root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard' type=<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+            <V>: kotlin.Int
+            <T>: <root>.SettingType<kotlin.Int>
+            $this: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard' type=<root>.IdeWizard origin=null
+            reference: CONSTRUCTOR_CALL 'public constructor <init> (t: T of <root>.SettingReference, v: V of <root>.SettingReference) [primary] declared in <root>.SettingReference' type=<root>.SettingReference<kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+              <class: V>: kotlin.Int
+              <class: T>: <root>.SettingType<kotlin.Int>
+              t: CONSTRUCTOR_CALL 'public constructor <init> (type: kotlin.reflect.KClass<out V of <root>.SettingType>) [primary] declared in <root>.SettingType' type=<root>.SettingType<kotlin.Int> origin=null
+                <class: V>: kotlin.Int
+                type: GET_CLASS type=kotlin.reflect.KClass<kotlin.Int>
+                  CONST Int type=kotlin.Int value=42
+              v: CONST Int type=kotlin.Int value=42
+      FUN DELEGATED_PROPERTY_ACCESSOR name:<get-projectTemplate> visibility:public modality:FINAL <> ($this:<root>.IdeWizard) returnType:kotlin.Int?
+        correspondingProperty: PROPERTY name:projectTemplate visibility:public modality:FINAL [delegated,var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-projectTemplate> (): kotlin.Int? declared in <root>.IdeWizard'
+            CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of <root>.IdeWizard.setting? [operator] declared in <root>.IdeWizard.setting.<no name provided>' type=kotlin.Int? origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:projectTemplate$delegate type:<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> visibility:private [final]' type=<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+                receiver: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<get-projectTemplate>' type=<root>.IdeWizard origin=null
+              thisRef: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<get-projectTemplate>' type=<root>.IdeWizard origin=null
+              property: PROPERTY_REFERENCE 'public final projectTemplate: kotlin.Int? [delegated,var]' field=null getter='public final fun <get-projectTemplate> (): kotlin.Int? declared in <root>.IdeWizard' setter='public final fun <set-projectTemplate> (<set-?>: kotlin.Int?): kotlin.Unit declared in <root>.IdeWizard' type=kotlin.reflect.KMutableProperty1<<root>.IdeWizard, kotlin.Int?> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+      FUN DELEGATED_PROPERTY_ACCESSOR name:<set-projectTemplate> visibility:public modality:FINAL <> ($this:<root>.IdeWizard, <set-?>:kotlin.Int?) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:projectTemplate visibility:public modality:FINAL [delegated,var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int?
+        BLOCK_BODY
+          CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of <root>.IdeWizard.setting?): kotlin.Unit [operator] declared in <root>.IdeWizard.setting.<no name provided>' type=kotlin.Unit origin=null
+            $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:projectTemplate$delegate type:<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> visibility:private [final]' type=<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+              receiver: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<set-projectTemplate>' type=<root>.IdeWizard origin=null
+            thisRef: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<set-projectTemplate>' type=<root>.IdeWizard origin=null
+            property: PROPERTY_REFERENCE 'public final projectTemplate: kotlin.Int? [delegated,var]' field=null getter='public final fun <get-projectTemplate> (): kotlin.Int? declared in <root>.IdeWizard' setter='public final fun <set-projectTemplate> (<set-?>: kotlin.Int?): kotlin.Unit declared in <root>.IdeWizard' type=kotlin.reflect.KMutableProperty1<<root>.IdeWizard, kotlin.Int?> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+            value: GET_VAR '<set-?>: kotlin.Int? declared in <root>.IdeWizard.<set-projectTemplate>' type=kotlin.Int? origin=null
+    FUN name:setting visibility:private modality:FINAL <V, T> ($this:<root>.IdeWizard, reference:<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>) returnType:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+      TYPE_PARAMETER name:V index:0 variance: superTypes:[kotlin.Any]
+      TYPE_PARAMETER name:T index:1 variance: superTypes:[<root>.SettingType<V of <root>.IdeWizard.setting>]
+      $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard
+      VALUE_PARAMETER name:reference index:0 type:<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='private final fun setting <V, T> (reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>): <root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard'
+          BLOCK type=<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.properties.ReadWriteProperty<kotlin.Any?, V of <root>.IdeWizard.setting?>]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+              CONSTRUCTOR visibility:private <> () returnType:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.properties.ReadWriteProperty<kotlin.Any?, V of <root>.IdeWizard.setting?>]'
+              FUN name:setValue visibility:public modality:FINAL <> ($this:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>, thisRef:kotlin.Any?, property:kotlin.reflect.KProperty<*>, value:V of <root>.IdeWizard.setting?) returnType:kotlin.Unit [operator]
+                overridden:
+                  public abstract fun setValue (thisRef: T of kotlin.properties.ReadWriteProperty, property: kotlin.reflect.KProperty<*>, value: V of kotlin.properties.ReadWriteProperty): kotlin.Unit [operator] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+                VALUE_PARAMETER name:thisRef index:0 type:kotlin.Any?
+                VALUE_PARAMETER name:property index:1 type:kotlin.reflect.KProperty<*>
+                VALUE_PARAMETER name:value index:2 type:V of <root>.IdeWizard.setting?
+                BLOCK_BODY
+                  WHEN type=kotlin.Unit origin=IF
+                    BRANCH
+                      if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                        arg0: GET_VAR 'value: V of <root>.IdeWizard.setting? declared in <root>.IdeWizard.setting.<no name provided>.setValue' type=V of <root>.IdeWizard.setting? origin=null
+                        arg1: CONST Null type=kotlin.Nothing? value=null
+                      then: RETURN type=kotlin.Nothing from='public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of <root>.IdeWizard.setting?): kotlin.Unit [operator] declared in <root>.IdeWizard.setting.<no name provided>'
+                        GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+                  CALL 'public final fun <set-t> (<set-?>: T of <root>.SettingReference): kotlin.Unit declared in <root>.SettingReference' type=kotlin.Unit origin=EQ
+                    $this: GET_VAR 'reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard.setting' type=<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=null
+                    <set-?>: TYPE_OP type=T of <root>.IdeWizard.setting origin=CAST typeOperand=T of <root>.IdeWizard.setting
+                      CONSTRUCTOR_CALL 'public constructor <init> (type: kotlin.reflect.KClass<out V of <root>.SettingType>) [primary] declared in <root>.SettingType' type=<root>.SettingType<V of <root>.IdeWizard.setting> origin=null
+                        <class: V>: V of <root>.IdeWizard.setting
+                        type: GET_CLASS type=kotlin.reflect.KClass<V of <root>.IdeWizard.setting>
+                          TYPE_OP type=V of <root>.IdeWizard.setting origin=IMPLICIT_CAST typeOperand=V of <root>.IdeWizard.setting
+                            GET_VAR 'value: V of <root>.IdeWizard.setting? declared in <root>.IdeWizard.setting.<no name provided>.setValue' type=V of <root>.IdeWizard.setting? origin=null
+                  CALL 'public final fun <set-v> (<set-?>: V of <root>.SettingReference): kotlin.Unit declared in <root>.SettingReference' type=kotlin.Unit origin=EQ
+                    $this: GET_VAR 'reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard.setting' type=<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=null
+                    <set-?>: TYPE_OP type=V of <root>.IdeWizard.setting origin=IMPLICIT_CAST typeOperand=V of <root>.IdeWizard.setting
+                      GET_VAR 'value: V of <root>.IdeWizard.setting? declared in <root>.IdeWizard.setting.<no name provided>.setValue' type=V of <root>.IdeWizard.setting? origin=null
+              FUN name:getValue visibility:public modality:FINAL <> ($this:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>, thisRef:kotlin.Any?, property:kotlin.reflect.KProperty<*>) returnType:V of <root>.IdeWizard.setting? [operator]
+                overridden:
+                  public abstract fun getValue (thisRef: T of kotlin.properties.ReadWriteProperty, property: kotlin.reflect.KProperty<*>): V of kotlin.properties.ReadWriteProperty [operator] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+                VALUE_PARAMETER name:thisRef index:0 type:kotlin.Any?
+                VALUE_PARAMETER name:property index:1 type:kotlin.reflect.KProperty<*>
+                BLOCK_BODY
+                  RETURN type=kotlin.Nothing from='public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of <root>.IdeWizard.setting? [operator] declared in <root>.IdeWizard.setting.<no name provided>'
+                    CALL 'public final fun <get-v> (): V of <root>.SettingReference declared in <root>.SettingReference' type=V of <root>.IdeWizard.setting origin=GET_PROPERTY
+                      $this: GET_VAR 'reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard.setting' type=<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=null
+              FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+                overridden:
+                  public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int declared in kotlin.Any
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String declared in kotlin.Any
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.IdeWizard.setting.<no name provided>' type=<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=OBJECT_LITERAL
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/firProblems/readWriteProperty.kt b/compiler/testData/ir/irText/firProblems/readWriteProperty.kt
new file mode 100644
index 00000000000..a75e4444bad
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/readWriteProperty.kt
@@ -0,0 +1,32 @@
+// WITH_RUNTIME
+// WITH_REFLECT
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KClass
+import kotlin.reflect.KProperty
+
+class SettingType<out V : Any>(
+    val type : KClass<out V>
+)
+
+class SettingReference<V : Any, T : SettingType<V>>(
+    var t : T
+    var v : V
+)
+
+class IdeWizard {
+    var projectTemplate by setting(SettingReference(SettingType(42::class), 42))
+
+    private fun <V : Any, T : SettingType<V>> setting(reference: SettingReference<V, T>) =
+        object : ReadWriteProperty<Any?, V?> {
+            override fun setValue(thisRef: Any?, property: KProperty<*>, value: V?) {
+                if (value == null) return
+                reference.t = SettingType(value::class) as T
+                reference.v = value
+            }
+
+            override fun getValue(thisRef: Any?, property: KProperty<*>): V? {
+                return reference.v
+            }
+        }
+}
diff --git a/compiler/testData/ir/irText/firProblems/readWriteProperty.kt.txt b/compiler/testData/ir/irText/firProblems/readWriteProperty.kt.txt
new file mode 100644
index 00000000000..895e9c43fc1
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/readWriteProperty.kt.txt
@@ -0,0 +1,76 @@
+class SettingType<out V : Any> {
+  constructor(type: KClass<out V>) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  val type: KClass<out V>
+    field = type
+    get
+
+}
+
+class SettingReference<V : Any, T : SettingType<V>> {
+  constructor(t: T, v: V) /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  var t: T
+    field = t
+    get
+    set
+
+  var v: V
+    field = v
+    get
+    set
+
+}
+
+class IdeWizard {
+  constructor() /* primary */ {
+    super/*Any*/()
+    /* <init>() */
+
+  }
+
+  var projectTemplate: Int? /* by */
+    field = <this>.setting<Int, SettingType<Int>>(reference = SettingReference<Int, SettingType<Int>>(t = SettingType<Int>(type = 42::class), v = 42))
+    get(): Int? {
+      return <this>.#projectTemplate$delegate.getValue(thisRef = <this>, property = IdeWizard::projectTemplate)
+    }
+    set(<set-?>: Int?) {
+      return <this>.#projectTemplate$delegate.setValue(thisRef = <this>, property = IdeWizard::projectTemplate, value = <set-?>)
+    }
+
+  private fun <V : Any, T : SettingType<V>> setting(reference: SettingReference<V, T>): <no name provided><V, T> {
+    return { // BLOCK
+      local class <no name provided> : ReadWriteProperty<Any?, V?> {
+        constructor() /* primary */ {
+          super/*Any*/()
+          /* <init>() */
+
+        }
+
+        override operator fun setValue(thisRef: Any?, property: KProperty<*>, value: V?) {
+          when {
+            EQEQ(arg0 = value, arg1 = null) -> return Unit
+          }
+          reference.<set-t>(<set-?> = SettingType<V>(type = value::class) as T)
+          reference.<set-v>(<set-?> = value)
+        }
+
+        override operator fun getValue(thisRef: Any?, property: KProperty<*>): V? {
+          return reference.<get-v>()
+        }
+
+      }
+
+      <no name provided>()
+    }
+  }
+
+}
diff --git a/compiler/testData/ir/irText/firProblems/readWriteProperty.txt b/compiler/testData/ir/irText/firProblems/readWriteProperty.txt
new file mode 100644
index 00000000000..6d558213b76
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/readWriteProperty.txt
@@ -0,0 +1,213 @@
+FILE fqName:<root> fileName:/readWriteProperty.kt
+  CLASS CLASS name:SettingType modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.SettingType<V of <root>.SettingType>
+    TYPE_PARAMETER name:V index:0 variance:out superTypes:[kotlin.Any]
+    CONSTRUCTOR visibility:public <> (type:kotlin.reflect.KClass<out V of <root>.SettingType>) returnType:<root>.SettingType<V of <root>.SettingType> [primary]
+      VALUE_PARAMETER name:type index:0 type:kotlin.reflect.KClass<out V of <root>.SettingType>
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SettingType modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:type visibility:public modality:FINAL [val]
+      FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.reflect.KClass<out V of <root>.SettingType> visibility:private [final]
+        EXPRESSION_BODY
+          GET_VAR 'type: kotlin.reflect.KClass<out V of <root>.SettingType> declared in <root>.SettingType.<init>' type=kotlin.reflect.KClass<out V of <root>.SettingType> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-type> visibility:public modality:FINAL <> ($this:<root>.SettingType<V of <root>.SettingType>) returnType:kotlin.reflect.KClass<out V of <root>.SettingType>
+        correspondingProperty: PROPERTY name:type visibility:public modality:FINAL [val]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingType<V of <root>.SettingType>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-type> (): kotlin.reflect.KClass<out V of <root>.SettingType> declared in <root>.SettingType'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:type type:kotlin.reflect.KClass<out V of <root>.SettingType> visibility:private [final]' type=kotlin.reflect.KClass<out V of <root>.SettingType> origin=null
+              receiver: GET_VAR '<this>: <root>.SettingType<V of <root>.SettingType> declared in <root>.SettingType.<get-type>' type=<root>.SettingType<V of <root>.SettingType> origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:SettingReference modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+    TYPE_PARAMETER name:V index:0 variance: superTypes:[kotlin.Any]
+    TYPE_PARAMETER name:T index:1 variance: superTypes:[<root>.SettingType<V of <root>.SettingReference>]
+    CONSTRUCTOR visibility:public <> (t:T of <root>.SettingReference, v:V of <root>.SettingReference) returnType:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> [primary]
+      VALUE_PARAMETER name:t index:0 type:T of <root>.SettingReference
+      VALUE_PARAMETER name:v index:1 type:V of <root>.SettingReference
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:SettingReference modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:t visibility:public modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:t type:T of <root>.SettingReference visibility:private
+        EXPRESSION_BODY
+          GET_VAR 't: T of <root>.SettingReference declared in <root>.SettingReference.<init>' type=T of <root>.SettingReference origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-t> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>) returnType:T of <root>.SettingReference
+        correspondingProperty: PROPERTY name:t visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-t> (): T of <root>.SettingReference declared in <root>.SettingReference'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:t type:T of <root>.SettingReference visibility:private' type=T of <root>.SettingReference origin=null
+              receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<get-t>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-t> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>, <set-?>:T of <root>.SettingReference) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:t visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        VALUE_PARAMETER name:<set-?> index:0 type:T of <root>.SettingReference
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:t type:T of <root>.SettingReference visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<set-t>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+            value: GET_VAR '<set-?>: T of <root>.SettingReference declared in <root>.SettingReference.<set-t>' type=T of <root>.SettingReference origin=null
+    PROPERTY name:v visibility:public modality:FINAL [var]
+      FIELD PROPERTY_BACKING_FIELD name:v type:V of <root>.SettingReference visibility:private
+        EXPRESSION_BODY
+          GET_VAR 'v: V of <root>.SettingReference declared in <root>.SettingReference.<init>' type=V of <root>.SettingReference origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-v> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>) returnType:V of <root>.SettingReference
+        correspondingProperty: PROPERTY name:v visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-v> (): V of <root>.SettingReference declared in <root>.SettingReference'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:v type:V of <root>.SettingReference visibility:private' type=V of <root>.SettingReference origin=null
+              receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<get-v>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-v> visibility:public modality:FINAL <> ($this:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>, <set-?>:V of <root>.SettingReference) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:v visibility:public modality:FINAL [var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference>
+        VALUE_PARAMETER name:<set-?> index:0 type:V of <root>.SettingReference
+        BLOCK_BODY
+          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:v type:V of <root>.SettingReference visibility:private' type=kotlin.Unit origin=null
+            receiver: GET_VAR '<this>: <root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> declared in <root>.SettingReference.<set-v>' type=<root>.SettingReference<V of <root>.SettingReference, T of <root>.SettingReference> origin=null
+            value: GET_VAR '<set-?>: V of <root>.SettingReference declared in <root>.SettingReference.<set-v>' type=V of <root>.SettingReference origin=null
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+  CLASS CLASS name:IdeWizard modality:FINAL visibility:public superTypes:[kotlin.Any]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IdeWizard
+    CONSTRUCTOR visibility:public <> () returnType:<root>.IdeWizard [primary]
+      BLOCK_BODY
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+        INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:IdeWizard modality:FINAL visibility:public superTypes:[kotlin.Any]'
+    PROPERTY name:projectTemplate visibility:public modality:FINAL [delegated,var]
+      FIELD PROPERTY_DELEGATE name:projectTemplate$delegate type:<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> visibility:private [final]
+        EXPRESSION_BODY
+          CALL 'private final fun setting <V, T> (reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>): <root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard' type=<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+            <V>: kotlin.Int
+            <T>: <root>.SettingType<kotlin.Int>
+            $this: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard' type=<root>.IdeWizard origin=null
+            reference: CONSTRUCTOR_CALL 'public constructor <init> (t: T of <root>.SettingReference, v: V of <root>.SettingReference) [primary] declared in <root>.SettingReference' type=<root>.SettingReference<kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+              <class: V>: kotlin.Int
+              <class: T>: <root>.SettingType<kotlin.Int>
+              t: CONSTRUCTOR_CALL 'public constructor <init> (type: kotlin.reflect.KClass<out V of <root>.SettingType>) [primary] declared in <root>.SettingType' type=<root>.SettingType<kotlin.Int> origin=null
+                <class: V>: kotlin.Int
+                type: GET_CLASS type=kotlin.reflect.KClass<out kotlin.Int>
+                  CONST Int type=kotlin.Int value=42
+              v: CONST Int type=kotlin.Int value=42
+      FUN DELEGATED_PROPERTY_ACCESSOR name:<get-projectTemplate> visibility:public modality:FINAL <> ($this:<root>.IdeWizard) returnType:kotlin.Int?
+        correspondingProperty: PROPERTY name:projectTemplate visibility:public modality:FINAL [delegated,var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <get-projectTemplate> (): kotlin.Int? declared in <root>.IdeWizard'
+            CALL 'public open fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of <root>.IdeWizard.setting? [operator] declared in <root>.IdeWizard.setting.<no name provided>' type=kotlin.Int? origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:projectTemplate$delegate type:<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> visibility:private [final]' type=<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+                receiver: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<get-projectTemplate>' type=<root>.IdeWizard origin=null
+              thisRef: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<get-projectTemplate>' type=<root>.IdeWizard origin=null
+              property: PROPERTY_REFERENCE 'public final projectTemplate: kotlin.Int? [delegated,var]' field=null getter='public final fun <get-projectTemplate> (): kotlin.Int? declared in <root>.IdeWizard' setter='public final fun <set-projectTemplate> (<set-?>: kotlin.Int?): kotlin.Unit declared in <root>.IdeWizard' type=kotlin.reflect.KMutableProperty1<<root>.IdeWizard, kotlin.Int?> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+      FUN DELEGATED_PROPERTY_ACCESSOR name:<set-projectTemplate> visibility:public modality:FINAL <> ($this:<root>.IdeWizard, <set-?>:kotlin.Int?) returnType:kotlin.Unit
+        correspondingProperty: PROPERTY name:projectTemplate visibility:public modality:FINAL [delegated,var]
+        $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int?
+        BLOCK_BODY
+          RETURN type=kotlin.Nothing from='public final fun <set-projectTemplate> (<set-?>: kotlin.Int?): kotlin.Unit declared in <root>.IdeWizard'
+            CALL 'public open fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of <root>.IdeWizard.setting?): kotlin.Unit [operator] declared in <root>.IdeWizard.setting.<no name provided>' type=kotlin.Unit origin=null
+              $this: GET_FIELD 'FIELD PROPERTY_DELEGATE name:projectTemplate$delegate type:<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> visibility:private [final]' type=<root>.IdeWizard.setting.<no name provided><kotlin.Int, <root>.SettingType<kotlin.Int>> origin=null
+                receiver: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<set-projectTemplate>' type=<root>.IdeWizard origin=null
+              thisRef: GET_VAR '<this>: <root>.IdeWizard declared in <root>.IdeWizard.<set-projectTemplate>' type=<root>.IdeWizard origin=null
+              property: PROPERTY_REFERENCE 'public final projectTemplate: kotlin.Int? [delegated,var]' field=null getter='public final fun <get-projectTemplate> (): kotlin.Int? declared in <root>.IdeWizard' setter='public final fun <set-projectTemplate> (<set-?>: kotlin.Int?): kotlin.Unit declared in <root>.IdeWizard' type=kotlin.reflect.KMutableProperty1<<root>.IdeWizard, kotlin.Int?> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+              value: GET_VAR '<set-?>: kotlin.Int? declared in <root>.IdeWizard.<set-projectTemplate>' type=kotlin.Int? origin=null
+    FUN name:setting visibility:private modality:FINAL <V, T> ($this:<root>.IdeWizard, reference:<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>) returnType:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+      TYPE_PARAMETER name:V index:0 variance: superTypes:[kotlin.Any]
+      TYPE_PARAMETER name:T index:1 variance: superTypes:[<root>.SettingType<V of <root>.IdeWizard.setting>]
+      $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard
+      VALUE_PARAMETER name:reference index:0 type:<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='private final fun setting <V, T> (reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>): <root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard'
+          BLOCK type=<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=OBJECT_LITERAL
+            CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.properties.ReadWriteProperty<kotlin.Any?, V of <root>.IdeWizard.setting?>]
+              $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+              CONSTRUCTOR visibility:public <> () returnType:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> [primary]
+                BLOCK_BODY
+                  DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+                  INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.properties.ReadWriteProperty<kotlin.Any?, V of <root>.IdeWizard.setting?>]'
+              FUN name:setValue visibility:public modality:OPEN <> ($this:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>, thisRef:kotlin.Any?, property:kotlin.reflect.KProperty<*>, value:V of <root>.IdeWizard.setting?) returnType:kotlin.Unit [operator]
+                overridden:
+                  public abstract fun setValue (thisRef: T of kotlin.properties.ReadWriteProperty, property: kotlin.reflect.KProperty<*>, value: V of kotlin.properties.ReadWriteProperty): kotlin.Unit [operator] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+                VALUE_PARAMETER name:thisRef index:0 type:kotlin.Any?
+                VALUE_PARAMETER name:property index:1 type:kotlin.reflect.KProperty<*>
+                VALUE_PARAMETER name:value index:2 type:V of <root>.IdeWizard.setting?
+                BLOCK_BODY
+                  WHEN type=kotlin.Unit origin=IF
+                    BRANCH
+                      if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                        arg0: GET_VAR 'value: V of <root>.IdeWizard.setting? declared in <root>.IdeWizard.setting.<no name provided>.setValue' type=V of <root>.IdeWizard.setting? origin=null
+                        arg1: CONST Null type=kotlin.Nothing? value=null
+                      then: RETURN type=kotlin.Nothing from='public open fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of <root>.IdeWizard.setting?): kotlin.Unit [operator] declared in <root>.IdeWizard.setting.<no name provided>'
+                        GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+                  CALL 'public final fun <set-t> (<set-?>: T of <root>.SettingReference): kotlin.Unit declared in <root>.SettingReference' type=kotlin.Unit origin=EQ
+                    $this: GET_VAR 'reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard.setting' type=<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=null
+                    <set-?>: TYPE_OP type=T of <root>.IdeWizard.setting origin=CAST typeOperand=T of <root>.IdeWizard.setting
+                      CONSTRUCTOR_CALL 'public constructor <init> (type: kotlin.reflect.KClass<out V of <root>.SettingType>) [primary] declared in <root>.SettingType' type=<root>.SettingType<V of <root>.IdeWizard.setting> origin=null
+                        <class: V>: V of <root>.IdeWizard.setting
+                        type: GET_CLASS type=kotlin.reflect.KClass<out V of <root>.IdeWizard.setting>
+                          GET_VAR 'value: V of <root>.IdeWizard.setting? declared in <root>.IdeWizard.setting.<no name provided>.setValue' type=V of <root>.IdeWizard.setting? origin=null
+                  CALL 'public final fun <set-v> (<set-?>: V of <root>.SettingReference): kotlin.Unit declared in <root>.SettingReference' type=kotlin.Unit origin=EQ
+                    $this: GET_VAR 'reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard.setting' type=<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=null
+                    <set-?>: GET_VAR 'value: V of <root>.IdeWizard.setting? declared in <root>.IdeWizard.setting.<no name provided>.setValue' type=V of <root>.IdeWizard.setting? origin=null
+              FUN name:getValue visibility:public modality:OPEN <> ($this:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>, thisRef:kotlin.Any?, property:kotlin.reflect.KProperty<*>) returnType:V of <root>.IdeWizard.setting? [operator]
+                overridden:
+                  public abstract fun getValue (thisRef: T of kotlin.properties.ReadWriteProperty, property: kotlin.reflect.KProperty<*>): V of kotlin.properties.ReadWriteProperty [operator] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting>
+                VALUE_PARAMETER name:thisRef index:0 type:kotlin.Any?
+                VALUE_PARAMETER name:property index:1 type:kotlin.reflect.KProperty<*>
+                BLOCK_BODY
+                  RETURN type=kotlin.Nothing from='public open fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of <root>.IdeWizard.setting? [operator] declared in <root>.IdeWizard.setting.<no name provided>'
+                    CALL 'public final fun <get-v> (): V of <root>.SettingReference declared in <root>.SettingReference' type=V of <root>.IdeWizard.setting origin=GET_PROPERTY
+                      $this: GET_VAR 'reference: <root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> declared in <root>.IdeWizard.setting' type=<root>.SettingReference<V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=null
+              FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+                overridden:
+                  public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+                VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+              FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+                overridden:
+                  public open fun hashCode (): kotlin.Int [fake_override] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+              FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+                overridden:
+                  public open fun toString (): kotlin.String [fake_override] declared in kotlin.properties.ReadWriteProperty
+                $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+            CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.IdeWizard.setting.<no name provided>' type=<root>.IdeWizard.setting.<no name provided><V of <root>.IdeWizard.setting, T of <root>.IdeWizard.setting> origin=OBJECT_LITERAL
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
+      overridden:
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
+      overridden:
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
+      overridden:
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt
new file mode 100644
index 00000000000..2e0d59300f3
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.kt.txt
@@ -0,0 +1,6 @@
+fun foo(movedPaths: MutableList<Couple<FilePath>>) {
+  movedPaths.forEach<Couple<FilePath>>(action = local fun <anonymous>(it: Couple<FilePath>) {
+    it.#second.getName() /*~> Unit */
+  }
+)
+}
diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.txt
new file mode 100644
index 00000000000..1d0d71e73db
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.txt
@@ -0,0 +1,15 @@
+FILE fqName:<root> fileName:/typeParameterFromJavaClass.kt
+  FUN name:foo visibility:public modality:FINAL <> (movedPaths:kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>>) returnType:kotlin.Unit
+    VALUE_PARAMETER name:movedPaths index:0 type:kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>>
+    BLOCK_BODY
+      CALL 'public final fun forEach <T> (action: kotlin.Function1<T of kotlin.collections.forEach, kotlin.Unit>): kotlin.Unit [inline] declared in kotlin.collections' type=kotlin.Unit origin=null
+        <T>: <root>.Couple<<root>.FilePath>
+        $receiver: GET_VAR 'movedPaths: kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>> declared in <root>.foo' type=kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>> origin=null
+        action: FUN_EXPR type=kotlin.Function1<<root>.Couple<<root>.FilePath>, kotlin.Unit> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:<root>.Couple<<root>.FilePath>) returnType:kotlin.Unit
+            VALUE_PARAMETER name:it index:0 type:<root>.Couple<<root>.FilePath>
+            BLOCK_BODY
+              TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                CALL 'public abstract fun getName (): kotlin.String? declared in <root>.FilePath' type=kotlin.String? origin=GET_PROPERTY
+                  $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:second type:B of <root>.Pair? visibility:public [final]' type=<root>.FilePath? origin=GET_PROPERTY
+                    receiver: GET_VAR 'it: <root>.Couple<<root>.FilePath> declared in <root>.foo.<anonymous>' type=<root>.Couple<<root>.FilePath> origin=null
diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt
new file mode 100644
index 00000000000..30faaaed089
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt
@@ -0,0 +1,33 @@
+// FILE: Pair.java
+
+public class Pair<A, B> {
+    public final A first;
+    public final B second;
+
+    public Pair(A first, B second) {
+        this.first = first;
+        this.second = second;
+    }
+}
+
+// FILE: Couple.java
+
+public class Couple<T> extends Pair<T, T> {
+    public Couple(T first, T second) {
+        super(first, second);
+    }
+}
+
+// FILE: FilePath.java
+
+public interface FilePath {
+    String getName();
+}
+
+// FILE: typeParameterFromJavaClass.kt
+
+// WITH_RUNTIME
+
+fun foo(movedPaths: MutableList<Couple<FilePath>>) {
+    movedPaths.forEach { it.second.name }
+}
diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt
new file mode 100644
index 00000000000..b9d5db64a2c
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt.txt
@@ -0,0 +1,6 @@
+fun foo(movedPaths: MutableList<Couple<FilePath>>) {
+  movedPaths.forEach<Couple<FilePath>>(action = local fun <anonymous>(it: Couple<FilePath>) {
+    itsuper.#second /*!! FilePath */.getName() /*~> Unit */
+  }
+)
+}
diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.txt
new file mode 100644
index 00000000000..ca709a07f33
--- /dev/null
+++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.txt
@@ -0,0 +1,16 @@
+FILE fqName:<root> fileName:/typeParameterFromJavaClass.kt
+  FUN name:foo visibility:public modality:FINAL <> (movedPaths:kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>>) returnType:kotlin.Unit
+    VALUE_PARAMETER name:movedPaths index:0 type:kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>>
+    BLOCK_BODY
+      CALL 'public final fun forEach <T> (action: kotlin.Function1<T of kotlin.collections.forEach, kotlin.Unit>): kotlin.Unit [inline] declared in kotlin.collections' type=kotlin.Unit origin=null
+        <T>: <root>.Couple<<root>.FilePath>
+        $receiver: GET_VAR 'movedPaths: kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>> declared in <root>.foo' type=kotlin.collections.MutableList<<root>.Couple<<root>.FilePath>> origin=null
+        action: FUN_EXPR type=kotlin.Function1<<root>.Couple<<root>.FilePath>, kotlin.Unit> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:<root>.Couple<<root>.FilePath>) returnType:kotlin.Unit
+            VALUE_PARAMETER name:it index:0 type:<root>.Couple<<root>.FilePath>
+            BLOCK_BODY
+              TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit
+                CALL 'public abstract fun getName (): @[FlexibleNullability] kotlin.String? declared in <root>.FilePath' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY
+                  $this: TYPE_OP type=<root>.FilePath origin=IMPLICIT_NOTNULL typeOperand=<root>.FilePath
+                    GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:second type:@[FlexibleNullability] B of <root>.Pair? visibility:public [final]' type=@[FlexibleNullability] <root>.FilePath? origin=GET_PROPERTY
+                      receiver: GET_VAR 'it: <root>.Couple<<root>.FilePath> declared in <root>.foo.<anonymous>' type=<root>.Couple<<root>.FilePath> origin=null
diff --git a/compiler/testData/ir/sourceRanges/kt24258.kt b/compiler/testData/ir/sourceRanges/kt24258.kt
new file mode 100644
index 00000000000..ea2d708f522
--- /dev/null
+++ b/compiler/testData/ir/sourceRanges/kt24258.kt
@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+// FILE: kt24258.kt
+
+val lazyNullString: String by lazy { J.nullString() }
+
+fun testLazyNullString() {
+    val s: String = lazyNullString
+}
+
+// FILE: J.java
+public class J {
+    public static String nullString() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/sourceRanges/kt24258.txt b/compiler/testData/ir/sourceRanges/kt24258.txt
new file mode 100644
index 00000000000..b168ecfeb0a
--- /dev/null
+++ b/compiler/testData/ir/sourceRanges/kt24258.txt
@@ -0,0 +1,22 @@
+@0:0..9:0 FILE fqName:<root> fileName:/kt24258.kt
+  @3:0..53 PROPERTY name:lazyNullString visibility:public modality:FINAL [delegated,val]
+    @3:27..53 FIELD PROPERTY_DELEGATE name:lazyNullString$delegate type:kotlin.Lazy<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]
+      @3:30..53 EXPRESSION_BODY
+        @3:30..53 CALL 'public final fun lazy <T> (initializer: kotlin.Function0<T of kotlin.lazy>): kotlin.Lazy<T of kotlin.lazy> declared in kotlin' type=kotlin.Lazy<@[FlexibleNullability] kotlin.String?> origin=null
+          @3:35..53 FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA
+            @3:35..53 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String?
+              @3:37..51 BLOCK_BODY
+                @3:39..51 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): @[FlexibleNullability] kotlin.String? declared in <root>.lazyNullString$delegate'
+                  @3:39..51 CALL 'public open fun nullString (): @[FlexibleNullability] kotlin.String? declared in <root>.J' type=@[FlexibleNullability] kotlin.String? origin=null
+    @3:27..53 FUN DELEGATED_PROPERTY_ACCESSOR name:<get-lazyNullString> visibility:public modality:FINAL <> () returnType:kotlin.String
+      @3:30..53 BLOCK_BODY
+        @3:30..53 RETURN type=kotlin.Nothing from='public final fun <get-lazyNullString> (): kotlin.String declared in <root>'
+          @3:30..53 TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String
+            @3:30..53 CALL 'public final fun getValue <T> (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): T of kotlin.getValue [inline,operator] declared in kotlin' type=@[FlexibleNullability] kotlin.String? origin=null
+              @3:27..53 GET_FIELD 'FIELD PROPERTY_DELEGATE name:lazyNullString$delegate type:kotlin.Lazy<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.Lazy<@[FlexibleNullability] kotlin.String?> origin=null
+              @-1:-1..-1 CONST Null type=kotlin.Nothing? value=null
+              @3:27..53 PROPERTY_REFERENCE 'public final lazyNullString: kotlin.String [delegated,val]' field=null getter='public final fun <get-lazyNullString> (): kotlin.String declared in <root>' setter=null type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE
+  @5:0..7:1 FUN name:testLazyNullString visibility:public modality:FINAL <> () returnType:kotlin.Unit
+    @5:25..7:1 BLOCK_BODY
+      @6:4..34 VAR name:s type:kotlin.String [val]
+        @6:20..34 CALL 'public final fun <get-lazyNullString> (): kotlin.String declared in <root>' type=kotlin.String origin=GET_PROPERTY
diff --git a/compiler/testData/psi/recovery/kt24158.kt b/compiler/testData/psi/recovery/kt24158.kt
new file mode 100644
index 00000000000..e632182a94d
--- /dev/null
+++ b/compiler/testData/psi/recovery/kt24158.kt
@@ -0,0 +1,7 @@
+fun main() {
+    null + $foo.$bar.
+}
+
+fun foo2() {
+    null + $foo. $bar . $baz .
+}
diff --git a/compiler/testData/psi/recovery/kt24158.txt b/compiler/testData/psi/recovery/kt24158.txt
new file mode 100644
index 00000000000..7d8e9e9fde8
--- /dev/null
+++ b/compiler/testData/psi/recovery/kt24158.txt
@@ -0,0 +1,69 @@
+KtFile: kt24158.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('main')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      BINARY_EXPRESSION
+        NULL
+          PsiElement(null)('null')
+        PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
+          PsiElement(PLUS)('+')
+        PsiWhiteSpace(' ')
+        PsiErrorElement:Expecting an element
+          PsiElement(FIELD_IDENTIFIER)('$foo')
+        PsiElement(DOT)('.')
+        PsiErrorElement:Expecting an element
+          PsiElement(FIELD_IDENTIFIER)('$bar')
+        PsiElement(DOT)('.')
+        PsiErrorElement:Expecting an element
+          <empty list>
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('foo2')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      BINARY_EXPRESSION
+        NULL
+          PsiElement(null)('null')
+        PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
+          PsiElement(PLUS)('+')
+        PsiWhiteSpace(' ')
+        PsiErrorElement:Expecting an element
+          PsiElement(FIELD_IDENTIFIER)('$foo')
+        PsiElement(DOT)('.')
+        PsiWhiteSpace(' ')
+        PsiErrorElement:Expecting an element
+          PsiElement(FIELD_IDENTIFIER)('$bar')
+        PsiWhiteSpace(' ')
+        PsiElement(DOT)('.')
+        PsiWhiteSpace(' ')
+        PsiErrorElement:Expecting an element
+          PsiElement(FIELD_IDENTIFIER)('$baz')
+        PsiWhiteSpace(' ')
+        PsiElement(DOT)('.')
+        PsiErrorElement:Expecting an element
+          <empty list>
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')
diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts
index 77faab3ee3f..df3765abc9f 100644
--- a/compiler/tests-common-new/build.gradle.kts
+++ b/compiler/tests-common-new/build.gradle.kts
@@ -17,12 +17,12 @@ dependencies {
 
     testImplementation(projectTests(":generators:test-generator"))
 
-    testImplementation(platform("org.junit:junit-bom:5.7.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.junit.platform:junit-platform-commons:1.7.0")
+    testApi(platform("org.junit:junit-bom:5.7.0"))
+    testApi("org.junit.jupiter:junit-jupiter")
+    testApi("org.junit.platform:junit-platform-commons:1.7.0")
     testApi(projectTests(":compiler:test-infrastructure"))
-    testImplementation(projectTests(":compiler:test-infrastructure-utils"))
-    testImplementation(projectTests(":compiler:tests-compiler-utils"))
+    testApi(projectTests(":compiler:test-infrastructure-utils"))
+    testApi(projectTests(":compiler:tests-compiler-utils"))
 
     testImplementation(intellijDep()) {
         // This dependency is needed only for FileComparisonFailure
@@ -88,5 +88,3 @@ projectTest(parallel = true, jUnit5Enabled = true) {
 }
 
 testsJar()
-
-val generateTests by generator("org.jetbrains.kotlin.test.generators.GenerateNewCompilerTestsKt")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index fbb0cacf8f4..edef6d75d7c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -3010,6 +3010,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt");
                 }
 
+                @Test
+                @TestMetadata("propertyFromAbstractSuperClass.kt")
+                public void testPropertyFromAbstractSuperClass() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/callableReference/property/propertyFromAbstractSuperClass.kt");
+                }
+
                 @Test
                 @TestMetadata("protectedVarFromClass.kt")
                 public void testProtectedVarFromClass() throws Exception {
@@ -6957,6 +6963,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.kt");
             }
 
+            @Test
+            @TestMetadata("kt37796.kt")
+            public void testKt37796() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/delegatedProperty/kt37796.kt");
+            }
+
             @Test
             @TestMetadata("kt4640.kt")
             public void testKt4640() throws Exception {
@@ -9106,6 +9118,22 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/exceptions")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Exceptions extends AbstractDiagnosticTest {
+            @Test
+            public void testAllFilesPresentInExceptions() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/exceptions"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+            }
+
+            @Test
+            @TestMetadata("kt24158.kt")
+            public void testKt24158() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/exceptions/kt24158.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/exposed")
         @TestDataPath("$PROJECT_ROOT")
@@ -12151,6 +12179,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/inference/reportAboutUnresolvedReferenceAsUnresolved.kt");
             }
 
+            @Test
+            @TestMetadata("reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt")
+            public void testReportNotEnoughTypeInformationErrorsOnBlockExpressions() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/reportNotEnoughTypeInformationErrorsOnBlockExpressions.kt");
+            }
+
             @Test
             @TestMetadata("resolveWithUnknownLambdaParameterType.kt")
             public void testResolveWithUnknownLambdaParameterType() throws Exception {
@@ -12164,15 +12198,9 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             }
 
             @Test
-            @TestMetadata("simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt")
-            public void testSimpleLambdaInCallWithAnotherLambdaWithBuilderInference() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt");
-            }
-
-            @Test
-            @TestMetadata("skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt")
-            public void testSkipedUnresolvedInBuilderInferenceWithStubReceiverType() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt");
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.kt");
             }
 
             @Test
@@ -12241,6 +12269,64 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.kt");
             }
 
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/inference/builderInference")
+            @TestDataPath("$PROJECT_ROOT")
+            public class BuilderInference extends AbstractDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInBuilderInference() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/builderInference"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt")
+                public void testSimpleLambdaInCallWithAnotherLambdaWithBuilderInference() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/simpleLambdaInCallWithAnotherLambdaWithBuilderInference.kt");
+                }
+
+                @Test
+                @TestMetadata("skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt")
+                public void testSkipedUnresolvedInBuilderInferenceWithStubReceiverType() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/skipedUnresolvedInBuilderInferenceWithStubReceiverType.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferences.kt")
+                public void testSpecialCallsWithCallableReferences() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferences.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt")
+                public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExression() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExression.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesDontRewriteAtSlice.kt")
+                public void testSpecialCallsWithCallableReferencesDontRewriteAtSlice() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesDontRewriteAtSlice.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+                public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+                public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCallsWithLambdas.kt")
+                public void testSpecialCallsWithLambdas() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/builderInference/specialCallsWithLambdas.kt");
+                }
+            }
+
             @Nested
             @TestMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes")
             @TestDataPath("$PROJECT_ROOT")
@@ -28304,6 +28390,96 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TestsWithJava15 extends AbstractDiagnosticTest {
+            @Test
+            public void testAllFilesPresentInTestsWithJava15() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord")
+            @TestDataPath("$PROJECT_ROOT")
+            public class JvmRecord extends AbstractDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInJvmRecord() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("diagnostics.kt")
+                public void testDiagnostics() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/diagnostics.kt");
+                }
+
+                @Test
+                @TestMetadata("disabledFeature.kt")
+                public void testDisabledFeature() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/disabledFeature.kt");
+                }
+
+                @Test
+                @TestMetadata("irrelevantFields.kt")
+                public void testIrrelevantFields() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/irrelevantFields.kt");
+                }
+
+                @Test
+                @TestMetadata("jvmRecordDescriptorStructure.kt")
+                public void testJvmRecordDescriptorStructure() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt");
+                }
+
+                @Test
+                @TestMetadata("simpleRecords.kt")
+                public void testSimpleRecords() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/simpleRecords.kt");
+                }
+
+                @Test
+                @TestMetadata("supertypesCheck.kt")
+                public void testSupertypesCheck() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/jvmRecord/supertypesCheck.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses")
+            @TestDataPath("$PROJECT_ROOT")
+            public class SealedClasses extends AbstractDiagnosticTest {
+                @Test
+                public void testAllFilesPresentInSealedClasses() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses"), Pattern.compile("^(.*)\\.kts?$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), true);
+                }
+
+                @Test
+                @TestMetadata("javaSealedClassExhaustiveness.kt")
+                public void testJavaSealedClassExhaustiveness() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt");
+                }
+
+                @Test
+                @TestMetadata("javaSealedInterfaceExhaustiveness.kt")
+                public void testJavaSealedInterfaceExhaustiveness() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt");
+                }
+
+                @Test
+                @TestMetadata("kotlinInheritsJavaClass.kt")
+                public void testKotlinInheritsJavaClass() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt");
+                }
+
+                @Test
+                @TestMetadata("kotlinInheritsJavaInterface.kt")
+                public void testKotlinInheritsJavaInterface() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt");
+                }
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
         @TestDataPath("$PROJECT_ROOT")
@@ -28653,6 +28829,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.kt");
             }
 
+            @Test
+            @TestMetadata("boundsViolationRecursive.kt")
+            public void testBoundsViolationRecursive() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.kt");
+            }
+
             @Test
             @TestMetadata("capturingTypeParametersFromOuterClass.kt")
             public void testCapturingTypeParametersFromOuterClass() throws Exception {
@@ -28827,6 +29009,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/typealias/kt14518.kt");
             }
 
+            @Test
+            @TestMetadata("kt14612.kt")
+            public void testKt14612() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/typealias/kt14612.kt");
+            }
+
             @Test
             @TestMetadata("kt14641.kt")
             public void testKt14641() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java
new file mode 100644
index 00000000000..241f58fcbbc
--- /dev/null
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java
@@ -0,0 +1,659 @@
+/*
+ * Copyright 2010-2020 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.test.runners;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+public class ForeignAnnotationsNoAnnotationInClasspathTestGenerated extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+    @Nested
+    @TestMetadata("compiler/testData/foreignAnnotations/tests")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Tests extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+        @Test
+        public void testAllFilesPresentInTests() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("androidRecently.kt")
+        public void testAndroidRecently() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
+        }
+
+        @Test
+        @TestMetadata("androidSdk.kt")
+        public void testAndroidSdk() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
+        }
+
+        @Test
+        @TestMetadata("android_support.kt")
+        public void testAndroid_support() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
+        }
+
+        @Test
+        @TestMetadata("androidx.kt")
+        public void testAndroidx() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
+        }
+
+        @Test
+        @TestMetadata("aosp.kt")
+        public void testAosp() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
+        }
+
+        @Test
+        @TestMetadata("checkerFramework.kt")
+        public void testCheckerFramework() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
+        }
+
+        @Test
+        @TestMetadata("eclipse.kt")
+        public void testEclipse() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
+        }
+
+        @Test
+        @TestMetadata("findBugsSimple.kt")
+        public void testFindBugsSimple() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
+        }
+
+        @Test
+        @TestMetadata("irrelevantQualifierNicknames.kt")
+        public void testIrrelevantQualifierNicknames() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
+        }
+
+        @Test
+        @TestMetadata("lombokSimple.kt")
+        public void testLombokSimple() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
+        }
+
+        @Test
+        @TestMetadata("rxjava.kt")
+        public void testRxjava() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+            @Test
+            public void testAllFilesPresentInJsr305() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("nonNullNever.kt")
+            public void testNonNullNever() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
+            }
+
+            @Test
+            @TestMetadata("nullabilityNicknames.kt")
+            public void testNullabilityNicknames() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("strange.kt")
+            public void testStrange() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Ignore extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+                @Test
+                public void testAllFilesPresentInIgnore() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefault.kt")
+                public void testParametersAreNonnullByDefault() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
+            @TestDataPath("$PROJECT_ROOT")
+            public class NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+                @Test
+                public void testAllFilesPresentInNullabilityWarnings() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("elvis.kt")
+                public void testElvis() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
+                }
+
+                @Test
+                @TestMetadata("localInference.kt")
+                public void testLocalInference() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityGenerics.kt")
+                public void testNullabilityGenerics() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityNicknames.kt")
+                public void testNullabilityNicknames() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
+                }
+
+                @Test
+                @TestMetadata("safeCalls.kt")
+                public void testSafeCalls() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
+                }
+
+                @Test
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
+                }
+
+                @Test
+                @TestMetadata("strange.kt")
+                public void testStrange() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
+                }
+
+                @Nested
+                @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
+                @TestDataPath("$PROJECT_ROOT")
+                public class FromPlatformTypes extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+                    @Test
+                    public void testAllFilesPresentInFromPlatformTypes() throws Exception {
+                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    }
+
+                    @Test
+                    @TestMetadata("arithmetic.kt")
+                    public void testArithmetic() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("array.kt")
+                    public void testArray() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("assignToVar.kt")
+                    public void testAssignToVar() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("conditions.kt")
+                    public void testConditions() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("dataFlowInfo.kt")
+                    public void testDataFlowInfo() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("defaultParameters.kt")
+                    public void testDefaultParameters() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("delegatedProperties.kt")
+                    public void testDelegatedProperties() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("delegation.kt")
+                    public void testDelegation() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("derefenceExtension.kt")
+                    public void testDerefenceExtension() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("derefenceMember.kt")
+                    public void testDerefenceMember() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("expectedType.kt")
+                    public void testExpectedType() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("for.kt")
+                    public void testFor() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("functionArguments.kt")
+                    public void testFunctionArguments() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("invoke.kt")
+                    public void testInvoke() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("kt6829.kt")
+                    public void testKt6829() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("multiDeclaration.kt")
+                    public void testMultiDeclaration() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("passToJava.kt")
+                    public void testPassToJava() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("primitiveArray.kt")
+                    public void testPrimitiveArray() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("throw.kt")
+                    public void testThrow() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("uselessElvisRightIsNull.kt")
+                    public void testUselessElvisRightIsNull() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
+                    }
+                }
+
+                @Nested
+                @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
+                @TestDataPath("$PROJECT_ROOT")
+                public class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+                    @Test
+                    public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    }
+
+                    @Test
+                    @TestMetadata("equalsOnNonNull.kt")
+                    public void testEqualsOnNonNull() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("fieldsAreNullable.kt")
+                    public void testFieldsAreNullable() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("nullabilityFromOverridden.kt")
+                    public void testNullabilityFromOverridden() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("overridingDefaultQualifier.kt")
+                    public void testOverridingDefaultQualifier() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("parametersAreNonnullByDefault.kt")
+                    public void testParametersAreNonnullByDefault() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
+                    public void testParametersAreNonnullByDefaultPackage() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("springNullable.kt")
+                    public void testSpringNullable() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("springNullablePackage.kt")
+                    public void testSpringNullablePackage() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
+                    }
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
+            @TestDataPath("$PROJECT_ROOT")
+            public class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+                @Test
+                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("fieldsAreNullable.kt")
+                public void testFieldsAreNullable() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
+                }
+
+                @Test
+                @TestMetadata("forceFlexibility.kt")
+                public void testForceFlexibility() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
+                }
+
+                @Test
+                @TestMetadata("forceFlexibleOverOverrides.kt")
+                public void testForceFlexibleOverOverrides() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityFromOverridden.kt")
+                public void testNullabilityFromOverridden() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
+                }
+
+                @Test
+                @TestMetadata("overridingDefaultQualifier.kt")
+                public void testOverridingDefaultQualifier() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefault.kt")
+                public void testParametersAreNonnullByDefault() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
+                public void testParametersAreNonnullByDefaultPackage() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
+                }
+
+                @Test
+                @TestMetadata("springNullable.kt")
+                public void testSpringNullable() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
+                }
+
+                @Test
+                @TestMetadata("springNullablePackage.kt")
+                public void testSpringNullablePackage() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
+                }
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+            @Test
+            public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Migration extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+                @Test
+                public void testAllFilesPresentInMigration() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("customMigration.kt")
+                public void testCustomMigration() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
+                }
+
+                @Test
+                @TestMetadata("globalIgnore.kt")
+                public void testGlobalIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("globalWarningMigrationIgnore.kt")
+                public void testGlobalWarningMigrationIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationError.kt")
+                public void testMigrationError() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationIgnore.kt")
+                public void testMigrationIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationWarning.kt")
+                public void testMigrationWarning() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
+                }
+
+                @Test
+                @TestMetadata("overrideConflicts.kt")
+                public void testOverrideConflicts() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCollision.kt")
+                public void testSpecialCollision() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
+                }
+
+                @Test
+                @TestMetadata("stateRefinement.kt")
+                public void testStateRefinement() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
+                }
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+            @Test
+            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
+            public void testDefaultAndNicknameMigrationPolicy() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
+            }
+        }
+    }
+
+    @Nested
+    @TestMetadata("compiler/testData/foreignAnnotations/java8Tests")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Java8Tests extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+        @Test
+        public void testAllFilesPresentInJava8Tests() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
+        }
+
+        @Test
+        @TestMetadata("checkerFramework.kt")
+        public void testCheckerFramework() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/checkerFramework.kt");
+        }
+
+        @Test
+        @TestMetadata("eclipse.kt")
+        public void testEclipse() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/eclipse.kt");
+        }
+
+        @Test
+        @TestMetadata("typeUseOnObject.kt")
+        public void testTypeUseOnObject() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/jsr305")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+            @Test
+            public void testAllFilesPresentInJsr305() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("defaultAnnotationAppliedToType.kt")
+            public void testDefaultAnnotationAppliedToType() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.kt");
+            }
+
+            @Test
+            @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
+            public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
+            }
+
+            @Test
+            @TestMetadata("springNullableWithTypeUse.kt")
+            public void testSpringNullableWithTypeUse() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.kt");
+            }
+
+            @Test
+            @TestMetadata("typeArguments.kt")
+            public void testTypeArguments() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("typeUseVsMethodConflict.kt")
+            public void testTypeUseVsMethodConflict() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TypeEnhancement extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
+            @Test
+            public void testAllFilesPresentInTypeEnhancement() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("annotatedTypeArguments.kt")
+            public void testAnnotatedTypeArguments() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("methodWithTypeParameter.kt")
+            public void testMethodWithTypeParameter() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.kt");
+            }
+
+            @Test
+            @TestMetadata("notNullVarargsOverrides.kt")
+            public void testNotNullVarargsOverrides() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.kt");
+            }
+
+            @Test
+            @TestMetadata("nullableVarargsOverrides.kt")
+            public void testNullableVarargsOverrides() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.kt")
+            public void testReturnTypeDifferentConstructor() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.kt")
+            public void testReturnTypeOverrideInKotlin() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.kt");
+            }
+        }
+    }
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
new file mode 100644
index 00000000000..67f869a6cf8
--- /dev/null
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
@@ -0,0 +1,659 @@
+/*
+ * Copyright 2010-2020 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.test.runners;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+public class ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+    @Nested
+    @TestMetadata("compiler/testData/foreignAnnotations/tests")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Tests extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+        @Test
+        public void testAllFilesPresentInTests() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("androidRecently.kt")
+        public void testAndroidRecently() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
+        }
+
+        @Test
+        @TestMetadata("androidSdk.kt")
+        public void testAndroidSdk() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
+        }
+
+        @Test
+        @TestMetadata("android_support.kt")
+        public void testAndroid_support() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
+        }
+
+        @Test
+        @TestMetadata("androidx.kt")
+        public void testAndroidx() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
+        }
+
+        @Test
+        @TestMetadata("aosp.kt")
+        public void testAosp() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
+        }
+
+        @Test
+        @TestMetadata("checkerFramework.kt")
+        public void testCheckerFramework() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
+        }
+
+        @Test
+        @TestMetadata("eclipse.kt")
+        public void testEclipse() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
+        }
+
+        @Test
+        @TestMetadata("findBugsSimple.kt")
+        public void testFindBugsSimple() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
+        }
+
+        @Test
+        @TestMetadata("irrelevantQualifierNicknames.kt")
+        public void testIrrelevantQualifierNicknames() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
+        }
+
+        @Test
+        @TestMetadata("lombokSimple.kt")
+        public void testLombokSimple() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
+        }
+
+        @Test
+        @TestMetadata("rxjava.kt")
+        public void testRxjava() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+            @Test
+            public void testAllFilesPresentInJsr305() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("nonNullNever.kt")
+            public void testNonNullNever() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
+            }
+
+            @Test
+            @TestMetadata("nullabilityNicknames.kt")
+            public void testNullabilityNicknames() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("strange.kt")
+            public void testStrange() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Ignore extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+                @Test
+                public void testAllFilesPresentInIgnore() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefault.kt")
+                public void testParametersAreNonnullByDefault() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
+            @TestDataPath("$PROJECT_ROOT")
+            public class NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+                @Test
+                public void testAllFilesPresentInNullabilityWarnings() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("elvis.kt")
+                public void testElvis() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
+                }
+
+                @Test
+                @TestMetadata("localInference.kt")
+                public void testLocalInference() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityGenerics.kt")
+                public void testNullabilityGenerics() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityNicknames.kt")
+                public void testNullabilityNicknames() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
+                }
+
+                @Test
+                @TestMetadata("safeCalls.kt")
+                public void testSafeCalls() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
+                }
+
+                @Test
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
+                }
+
+                @Test
+                @TestMetadata("strange.kt")
+                public void testStrange() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
+                }
+
+                @Nested
+                @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
+                @TestDataPath("$PROJECT_ROOT")
+                public class FromPlatformTypes extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+                    @Test
+                    public void testAllFilesPresentInFromPlatformTypes() throws Exception {
+                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    }
+
+                    @Test
+                    @TestMetadata("arithmetic.kt")
+                    public void testArithmetic() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("array.kt")
+                    public void testArray() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("assignToVar.kt")
+                    public void testAssignToVar() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("conditions.kt")
+                    public void testConditions() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("dataFlowInfo.kt")
+                    public void testDataFlowInfo() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("defaultParameters.kt")
+                    public void testDefaultParameters() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("delegatedProperties.kt")
+                    public void testDelegatedProperties() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("delegation.kt")
+                    public void testDelegation() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("derefenceExtension.kt")
+                    public void testDerefenceExtension() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("derefenceMember.kt")
+                    public void testDerefenceMember() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("expectedType.kt")
+                    public void testExpectedType() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("for.kt")
+                    public void testFor() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("functionArguments.kt")
+                    public void testFunctionArguments() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("invoke.kt")
+                    public void testInvoke() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("kt6829.kt")
+                    public void testKt6829() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("multiDeclaration.kt")
+                    public void testMultiDeclaration() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("passToJava.kt")
+                    public void testPassToJava() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("primitiveArray.kt")
+                    public void testPrimitiveArray() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("throw.kt")
+                    public void testThrow() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("uselessElvisRightIsNull.kt")
+                    public void testUselessElvisRightIsNull() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
+                    }
+                }
+
+                @Nested
+                @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
+                @TestDataPath("$PROJECT_ROOT")
+                public class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+                    @Test
+                    public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    }
+
+                    @Test
+                    @TestMetadata("equalsOnNonNull.kt")
+                    public void testEqualsOnNonNull() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("fieldsAreNullable.kt")
+                    public void testFieldsAreNullable() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("nullabilityFromOverridden.kt")
+                    public void testNullabilityFromOverridden() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("overridingDefaultQualifier.kt")
+                    public void testOverridingDefaultQualifier() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("parametersAreNonnullByDefault.kt")
+                    public void testParametersAreNonnullByDefault() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
+                    public void testParametersAreNonnullByDefaultPackage() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("springNullable.kt")
+                    public void testSpringNullable() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("springNullablePackage.kt")
+                    public void testSpringNullablePackage() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
+                    }
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
+            @TestDataPath("$PROJECT_ROOT")
+            public class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+                @Test
+                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("fieldsAreNullable.kt")
+                public void testFieldsAreNullable() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
+                }
+
+                @Test
+                @TestMetadata("forceFlexibility.kt")
+                public void testForceFlexibility() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
+                }
+
+                @Test
+                @TestMetadata("forceFlexibleOverOverrides.kt")
+                public void testForceFlexibleOverOverrides() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityFromOverridden.kt")
+                public void testNullabilityFromOverridden() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
+                }
+
+                @Test
+                @TestMetadata("overridingDefaultQualifier.kt")
+                public void testOverridingDefaultQualifier() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefault.kt")
+                public void testParametersAreNonnullByDefault() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
+                public void testParametersAreNonnullByDefaultPackage() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
+                }
+
+                @Test
+                @TestMetadata("springNullable.kt")
+                public void testSpringNullable() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
+                }
+
+                @Test
+                @TestMetadata("springNullablePackage.kt")
+                public void testSpringNullablePackage() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
+                }
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+            @Test
+            public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Migration extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+                @Test
+                public void testAllFilesPresentInMigration() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("customMigration.kt")
+                public void testCustomMigration() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
+                }
+
+                @Test
+                @TestMetadata("globalIgnore.kt")
+                public void testGlobalIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("globalWarningMigrationIgnore.kt")
+                public void testGlobalWarningMigrationIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationError.kt")
+                public void testMigrationError() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationIgnore.kt")
+                public void testMigrationIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationWarning.kt")
+                public void testMigrationWarning() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
+                }
+
+                @Test
+                @TestMetadata("overrideConflicts.kt")
+                public void testOverrideConflicts() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCollision.kt")
+                public void testSpecialCollision() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
+                }
+
+                @Test
+                @TestMetadata("stateRefinement.kt")
+                public void testStateRefinement() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
+                }
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+            @Test
+            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
+            public void testDefaultAndNicknameMigrationPolicy() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
+            }
+        }
+    }
+
+    @Nested
+    @TestMetadata("compiler/testData/foreignAnnotations/java8Tests")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Java8Tests extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+        @Test
+        public void testAllFilesPresentInJava8Tests() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
+        }
+
+        @Test
+        @TestMetadata("checkerFramework.kt")
+        public void testCheckerFramework() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/checkerFramework.kt");
+        }
+
+        @Test
+        @TestMetadata("eclipse.kt")
+        public void testEclipse() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/eclipse.kt");
+        }
+
+        @Test
+        @TestMetadata("typeUseOnObject.kt")
+        public void testTypeUseOnObject() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/jsr305")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+            @Test
+            public void testAllFilesPresentInJsr305() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("defaultAnnotationAppliedToType.kt")
+            public void testDefaultAnnotationAppliedToType() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.kt");
+            }
+
+            @Test
+            @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
+            public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
+            }
+
+            @Test
+            @TestMetadata("springNullableWithTypeUse.kt")
+            public void testSpringNullableWithTypeUse() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.kt");
+            }
+
+            @Test
+            @TestMetadata("typeArguments.kt")
+            public void testTypeArguments() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("typeUseVsMethodConflict.kt")
+            public void testTypeUseVsMethodConflict() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TypeEnhancement extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
+            @Test
+            public void testAllFilesPresentInTypeEnhancement() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("annotatedTypeArguments.kt")
+            public void testAnnotatedTypeArguments() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("methodWithTypeParameter.kt")
+            public void testMethodWithTypeParameter() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.kt");
+            }
+
+            @Test
+            @TestMetadata("notNullVarargsOverrides.kt")
+            public void testNotNullVarargsOverrides() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.kt");
+            }
+
+            @Test
+            @TestMetadata("nullableVarargsOverrides.kt")
+            public void testNullableVarargsOverrides() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.kt")
+            public void testReturnTypeDifferentConstructor() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.kt")
+            public void testReturnTypeOverrideInKotlin() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.kt");
+            }
+        }
+    }
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsTestGenerated.java
new file mode 100644
index 00000000000..548f5bd78ec
--- /dev/null
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsTestGenerated.java
@@ -0,0 +1,659 @@
+/*
+ * Copyright 2010-2020 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.test.runners;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+public class ForeignAnnotationsTestGenerated extends AbstractForeignAnnotationsTest {
+    @Nested
+    @TestMetadata("compiler/testData/foreignAnnotations/tests")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Tests extends AbstractForeignAnnotationsTest {
+        @Test
+        public void testAllFilesPresentInTests() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        }
+
+        @Test
+        @TestMetadata("androidRecently.kt")
+        public void testAndroidRecently() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
+        }
+
+        @Test
+        @TestMetadata("androidSdk.kt")
+        public void testAndroidSdk() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
+        }
+
+        @Test
+        @TestMetadata("android_support.kt")
+        public void testAndroid_support() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
+        }
+
+        @Test
+        @TestMetadata("androidx.kt")
+        public void testAndroidx() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
+        }
+
+        @Test
+        @TestMetadata("aosp.kt")
+        public void testAosp() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
+        }
+
+        @Test
+        @TestMetadata("checkerFramework.kt")
+        public void testCheckerFramework() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
+        }
+
+        @Test
+        @TestMetadata("eclipse.kt")
+        public void testEclipse() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
+        }
+
+        @Test
+        @TestMetadata("findBugsSimple.kt")
+        public void testFindBugsSimple() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
+        }
+
+        @Test
+        @TestMetadata("irrelevantQualifierNicknames.kt")
+        public void testIrrelevantQualifierNicknames() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
+        }
+
+        @Test
+        @TestMetadata("lombokSimple.kt")
+        public void testLombokSimple() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
+        }
+
+        @Test
+        @TestMetadata("rxjava.kt")
+        public void testRxjava() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305 extends AbstractForeignAnnotationsTest {
+            @Test
+            public void testAllFilesPresentInJsr305() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("nonNullNever.kt")
+            public void testNonNullNever() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
+            }
+
+            @Test
+            @TestMetadata("nullabilityNicknames.kt")
+            public void testNullabilityNicknames() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
+            }
+
+            @Test
+            @TestMetadata("strange.kt")
+            public void testStrange() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Ignore extends AbstractForeignAnnotationsTest {
+                @Test
+                public void testAllFilesPresentInIgnore() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefault.kt")
+                public void testParametersAreNonnullByDefault() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
+            @TestDataPath("$PROJECT_ROOT")
+            public class NullabilityWarnings extends AbstractForeignAnnotationsTest {
+                @Test
+                public void testAllFilesPresentInNullabilityWarnings() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("elvis.kt")
+                public void testElvis() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
+                }
+
+                @Test
+                @TestMetadata("localInference.kt")
+                public void testLocalInference() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityGenerics.kt")
+                public void testNullabilityGenerics() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityNicknames.kt")
+                public void testNullabilityNicknames() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
+                }
+
+                @Test
+                @TestMetadata("safeCalls.kt")
+                public void testSafeCalls() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
+                }
+
+                @Test
+                @TestMetadata("simple.kt")
+                public void testSimple() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
+                }
+
+                @Test
+                @TestMetadata("strange.kt")
+                public void testStrange() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
+                }
+
+                @Nested
+                @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
+                @TestDataPath("$PROJECT_ROOT")
+                public class FromPlatformTypes extends AbstractForeignAnnotationsTest {
+                    @Test
+                    public void testAllFilesPresentInFromPlatformTypes() throws Exception {
+                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    }
+
+                    @Test
+                    @TestMetadata("arithmetic.kt")
+                    public void testArithmetic() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("array.kt")
+                    public void testArray() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("assignToVar.kt")
+                    public void testAssignToVar() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("conditions.kt")
+                    public void testConditions() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("dataFlowInfo.kt")
+                    public void testDataFlowInfo() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("defaultParameters.kt")
+                    public void testDefaultParameters() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("delegatedProperties.kt")
+                    public void testDelegatedProperties() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("delegation.kt")
+                    public void testDelegation() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("derefenceExtension.kt")
+                    public void testDerefenceExtension() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("derefenceMember.kt")
+                    public void testDerefenceMember() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("expectedType.kt")
+                    public void testExpectedType() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("for.kt")
+                    public void testFor() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("functionArguments.kt")
+                    public void testFunctionArguments() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("invoke.kt")
+                    public void testInvoke() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("kt6829.kt")
+                    public void testKt6829() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("multiDeclaration.kt")
+                    public void testMultiDeclaration() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("passToJava.kt")
+                    public void testPassToJava() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("primitiveArray.kt")
+                    public void testPrimitiveArray() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("throw.kt")
+                    public void testThrow() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("uselessElvisRightIsNull.kt")
+                    public void testUselessElvisRightIsNull() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
+                    }
+                }
+
+                @Nested
+                @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
+                @TestDataPath("$PROJECT_ROOT")
+                public class TypeQualifierDefault extends AbstractForeignAnnotationsTest {
+                    @Test
+                    public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                    }
+
+                    @Test
+                    @TestMetadata("equalsOnNonNull.kt")
+                    public void testEqualsOnNonNull() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("fieldsAreNullable.kt")
+                    public void testFieldsAreNullable() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("nullabilityFromOverridden.kt")
+                    public void testNullabilityFromOverridden() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("overridingDefaultQualifier.kt")
+                    public void testOverridingDefaultQualifier() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("parametersAreNonnullByDefault.kt")
+                    public void testParametersAreNonnullByDefault() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
+                    public void testParametersAreNonnullByDefaultPackage() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("springNullable.kt")
+                    public void testSpringNullable() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
+                    }
+
+                    @Test
+                    @TestMetadata("springNullablePackage.kt")
+                    public void testSpringNullablePackage() throws Exception {
+                        runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
+                    }
+                }
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
+            @TestDataPath("$PROJECT_ROOT")
+            public class TypeQualifierDefault extends AbstractForeignAnnotationsTest {
+                @Test
+                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("fieldsAreNullable.kt")
+                public void testFieldsAreNullable() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
+                }
+
+                @Test
+                @TestMetadata("forceFlexibility.kt")
+                public void testForceFlexibility() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
+                }
+
+                @Test
+                @TestMetadata("forceFlexibleOverOverrides.kt")
+                public void testForceFlexibleOverOverrides() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
+                }
+
+                @Test
+                @TestMetadata("nullabilityFromOverridden.kt")
+                public void testNullabilityFromOverridden() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
+                }
+
+                @Test
+                @TestMetadata("overridingDefaultQualifier.kt")
+                public void testOverridingDefaultQualifier() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefault.kt")
+                public void testParametersAreNonnullByDefault() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
+                }
+
+                @Test
+                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
+                public void testParametersAreNonnullByDefaultPackage() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
+                }
+
+                @Test
+                @TestMetadata("springNullable.kt")
+                public void testSpringNullable() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
+                }
+
+                @Test
+                @TestMetadata("springNullablePackage.kt")
+                public void testSpringNullablePackage() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
+                }
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsTest {
+            @Test
+            public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Nested
+            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
+            @TestDataPath("$PROJECT_ROOT")
+            public class Migration extends AbstractForeignAnnotationsTest {
+                @Test
+                public void testAllFilesPresentInMigration() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
+                }
+
+                @Test
+                @TestMetadata("customMigration.kt")
+                public void testCustomMigration() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
+                }
+
+                @Test
+                @TestMetadata("globalIgnore.kt")
+                public void testGlobalIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("globalWarningMigrationIgnore.kt")
+                public void testGlobalWarningMigrationIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationError.kt")
+                public void testMigrationError() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationIgnore.kt")
+                public void testMigrationIgnore() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
+                }
+
+                @Test
+                @TestMetadata("migrationWarning.kt")
+                public void testMigrationWarning() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
+                }
+
+                @Test
+                @TestMetadata("overrideConflicts.kt")
+                public void testOverrideConflicts() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
+                }
+
+                @Test
+                @TestMetadata("specialCollision.kt")
+                public void testSpecialCollision() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
+                }
+
+                @Test
+                @TestMetadata("stateRefinement.kt")
+                public void testStateRefinement() throws Exception {
+                    runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
+                }
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TypeQualifierDefault extends AbstractForeignAnnotationsTest {
+            @Test
+            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
+            public void testDefaultAndNicknameMigrationPolicy() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
+            }
+        }
+    }
+
+    @Nested
+    @TestMetadata("compiler/testData/foreignAnnotations/java8Tests")
+    @TestDataPath("$PROJECT_ROOT")
+    public class Java8Tests extends AbstractForeignAnnotationsTest {
+        @Test
+        public void testAllFilesPresentInJava8Tests() throws Exception {
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
+        }
+
+        @Test
+        @TestMetadata("checkerFramework.kt")
+        public void testCheckerFramework() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/checkerFramework.kt");
+        }
+
+        @Test
+        @TestMetadata("eclipse.kt")
+        public void testEclipse() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/eclipse.kt");
+        }
+
+        @Test
+        @TestMetadata("typeUseOnObject.kt")
+        public void testTypeUseOnObject() throws Exception {
+            runTest("compiler/testData/foreignAnnotations/java8Tests/typeUseOnObject.kt");
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/jsr305")
+        @TestDataPath("$PROJECT_ROOT")
+        public class Jsr305 extends AbstractForeignAnnotationsTest {
+            @Test
+            public void testAllFilesPresentInJsr305() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("defaultAnnotationAppliedToType.kt")
+            public void testDefaultAnnotationAppliedToType() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToType.kt");
+            }
+
+            @Test
+            @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
+            public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
+            }
+
+            @Test
+            @TestMetadata("springNullableWithTypeUse.kt")
+            public void testSpringNullableWithTypeUse() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/springNullableWithTypeUse.kt");
+            }
+
+            @Test
+            @TestMetadata("typeArguments.kt")
+            public void testTypeArguments() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/typeArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("typeUseVsMethodConflict.kt")
+            public void testTypeUseVsMethodConflict() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/jsr305/typeUseVsMethodConflict.kt");
+            }
+        }
+
+        @Nested
+        @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement")
+        @TestDataPath("$PROJECT_ROOT")
+        public class TypeEnhancement extends AbstractForeignAnnotationsTest {
+            @Test
+            public void testAllFilesPresentInTypeEnhancement() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            }
+
+            @Test
+            @TestMetadata("annotatedTypeArguments.kt")
+            public void testAnnotatedTypeArguments() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/annotatedTypeArguments.kt");
+            }
+
+            @Test
+            @TestMetadata("methodWithTypeParameter.kt")
+            public void testMethodWithTypeParameter() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/methodWithTypeParameter.kt");
+            }
+
+            @Test
+            @TestMetadata("notNullVarargsOverrides.kt")
+            public void testNotNullVarargsOverrides() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/notNullVarargsOverrides.kt");
+            }
+
+            @Test
+            @TestMetadata("nullableVarargsOverrides.kt")
+            public void testNullableVarargsOverrides() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/nullableVarargsOverrides.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeDifferentConstructor.kt")
+            public void testReturnTypeDifferentConstructor() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeDifferentConstructor.kt");
+            }
+
+            @Test
+            @TestMetadata("returnTypeOverrideInKotlin.kt")
+            public void testReturnTypeOverrideInKotlin() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
+            }
+
+            @Test
+            @TestMetadata("simple.kt")
+            public void testSimple() throws Exception {
+                runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancement/simple.kt");
+            }
+        }
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt
index 16fb993d6af..c9e21b8bc17 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/IrBackendInput.kt
@@ -5,27 +5,13 @@
 
 package org.jetbrains.kotlin.test.backend.ir
 
-import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
-import org.jetbrains.kotlin.backend.jvm.JvmGeneratorExtensions
-import org.jetbrains.kotlin.backend.jvm.MetadataSerializerFactory
-import org.jetbrains.kotlin.codegen.state.GenerationState
-import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.ir.linkage.IrProvider
-import org.jetbrains.kotlin.ir.util.SymbolTable
-import org.jetbrains.kotlin.psi2ir.PsiSourceManager
+import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
 import org.jetbrains.kotlin.test.model.BackendKinds
 import org.jetbrains.kotlin.test.model.ResultingArtifact
 
 // IR backend (JVM, JS, Native)
 data class IrBackendInput(
-    val state: GenerationState,
-    val irModuleFragment: IrModuleFragment,
-    val symbolTable: SymbolTable,
-    val sourceManager: PsiSourceManager,
-    val phaseConfig: PhaseConfig,
-    val irProviders: List<IrProvider>,
-    val extensions: JvmGeneratorExtensions,
-    val serializerFactory: MetadataSerializerFactory
+    val backendInput: JvmIrCodegenFactory.JvmIrBackendInput
 ) : ResultingArtifact.BackendInput<IrBackendInput>() {
     override val kind: BackendKinds.IrBackend
         get() = BackendKinds.IrBackend
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/JvmIrBackendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/JvmIrBackendFacade.kt
index 600646290a5..0a560a3c6a5 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/JvmIrBackendFacade.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/ir/JvmIrBackendFacade.kt
@@ -16,19 +16,9 @@ class JvmIrBackendFacade(
         module: TestModule,
         inputArtifact: IrBackendInput
     ): BinaryArtifacts.Jvm {
-        val (state, irModuleFragment, symbolTable, sourceManager, phaseConfig, irProviders, extensions, serializerFactory) = inputArtifact
-
+        val state = inputArtifact.backendInput.state
         val codegenFactory = state.codegenFactory as JvmIrCodegenFactory
-        codegenFactory.doGenerateFilesInternal(
-            state,
-            irModuleFragment,
-            symbolTable,
-            sourceManager,
-            phaseConfig,
-            irProviders,
-            extensions,
-            serializerFactory
-        )
+        codegenFactory.doGenerateFilesInternal(inputArtifact.backendInput)
         state.factory.done()
 
         return BinaryArtifacts.Jvm(state.factory)
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/DiagnosticsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/DiagnosticsDirectives.kt
index 52f043cdd35..487acb809f7 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/DiagnosticsDirectives.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/DiagnosticsDirectives.kt
@@ -55,4 +55,11 @@ object DiagnosticsDirectives : SimpleDirectivesContainer() {
               is enabled in test 
         """.trimIndent()
     )
+
+    val RENDER_PACKAGE by stringDirective(
+        description = """
+            Dump declaration from packages listed in directive
+              (additional to root package)
+        """.trimIndent()
+    )
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt
index eee8d9c9544..0edefff5924 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/FirDiagnosticsDirectives.kt
@@ -35,4 +35,8 @@ object FirDiagnosticsDirectives : SimpleDirectivesContainer() {
             For enabling light tree mode use $USE_LIGHT_TREE directive
         """.trimIndent()
     )
+
+    val WITH_EXTENDED_CHECKERS by directive(
+        description = "Enable extended checkers"
+    )
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt
new file mode 100644
index 00000000000..7f1839c8e3e
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2020 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.test.directives
+
+import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
+import org.jetbrains.kotlin.test.services.configuration.JdkForeignAnnotationType
+import org.jetbrains.kotlin.utils.ReportLevel
+
+@Suppress("RemoveExplicitTypeArguments")
+object ForeignAnnotationsDirectives : SimpleDirectivesContainer() {
+    val JSR305_GLOBAL_REPORT by enumDirective<ReportLevel>(
+        description = "Global report level",
+        additionalParser = ReportLevel.Companion::findByDescription
+    )
+
+    val JSR305_MIGRATION_REPORT by enumDirective<ReportLevel>(
+        description = "Migration report level",
+        additionalParser = ReportLevel.Companion::findByDescription
+    )
+
+    val JSR305_SPECIAL_REPORT by stringDirective(
+        description = "Report level for specific annotations"
+    )
+
+    val JSPECIFY_STATE by enumDirective<ReportLevel>(
+        description = "Report level for jSpecify annotations",
+        additionalParser = ReportLevel.Companion::findByDescription
+    )
+
+    val ANNOTATIONS_PATH by enumDirective<JdkForeignAnnotationType>(
+        description = "Path to foreign annotations"
+    )
+
+    val SOURCE_RETENTION_ANNOTATIONS by directive(
+        description = "Skip test against compiled annotation because of their Source retention"
+    )
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt
index a32f9dbb48a..c0b623f48dc 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt
@@ -33,4 +33,5 @@ object JvmEnvironmentConfigurationDirectives : SimpleDirectivesContainer() {
 
     val USE_PSI_CLASS_FILES_READING by directive("Use a slower (PSI-based) class files reading implementation")
     val USE_JAVAC by directive("Enable javac integration")
+    val SKIP_JAVA_SOURCES by directive("Don't add java sources to compile classpath")
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt
index 420fffd775e..d81a02a799a 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontend2IrConverter.kt
@@ -5,37 +5,12 @@
 
 package org.jetbrains.kotlin.test.frontend.classic
 
-import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl
-import org.jetbrains.kotlin.backend.common.ir.BuiltinSymbolsBase
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
-import org.jetbrains.kotlin.backend.jvm.JvmGeneratorExtensions
 import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
-import org.jetbrains.kotlin.backend.jvm.JvmNameProvider
-import org.jetbrains.kotlin.backend.jvm.codegen.DescriptorMetadataSerializer
 import org.jetbrains.kotlin.backend.jvm.jvmPhases
-import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories
 import org.jetbrains.kotlin.codegen.state.GenerationState
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.KlibModuleOrigin
-import org.jetbrains.kotlin.idea.MainFunctionDetector
-import org.jetbrains.kotlin.ir.backend.jvm.serialization.EmptyLoggingContext
-import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmIrLinker
-import org.jetbrains.kotlin.ir.backend.jvm.serialization.JvmManglerDesc
-import org.jetbrains.kotlin.ir.builders.TranslationPluginContext
-import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
-import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory
-import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator
-import org.jetbrains.kotlin.ir.util.ReferenceSymbolTable
-import org.jetbrains.kotlin.ir.util.SymbolTable
-import org.jetbrains.kotlin.ir.util.TypeTranslator
-import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
-import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
-import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.test.backend.ir.IrBackendInput
 import org.jetbrains.kotlin.test.model.BackendKinds
 import org.jetbrains.kotlin.test.model.Frontend2BackendConverter
@@ -61,98 +36,14 @@ class ClassicFrontend2IrConverter(
 
         val files = psiFiles.values.toList()
         val phaseConfig = configuration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jvmPhases)
+        val codegenFactory = JvmIrCodegenFactory(phaseConfig)
         val state = GenerationState.Builder(
             project, ClassBuilderFactories.TEST, analysisResult.moduleDescriptor, analysisResult.bindingContext,
             files, configuration
-        ).codegenFactory(
-            JvmIrCodegenFactory(phaseConfig)
-        ).isIrBackend(true).build()
+        ).codegenFactory(codegenFactory)
+            .isIrBackend(true)
+            .build()
 
-        val extensions = JvmGeneratorExtensions()
-        val mangler = JvmManglerDesc(MainFunctionDetector(state.bindingContext, state.languageVersionSettings))
-        val psi2ir = Psi2IrTranslator(state.languageVersionSettings, Psi2IrConfiguration())
-        val symbolTable = SymbolTable(JvmIdSignatureDescriptor(mangler), IrFactoryImpl, JvmNameProvider)
-        val psi2irContext = psi2ir.createGeneratorContext(state.module, state.bindingContext, symbolTable, extensions)
-        val pluginExtensions = IrGenerationExtension.getInstances(state.project)
-        val functionFactory = IrFunctionFactory(psi2irContext.irBuiltIns, symbolTable)
-        psi2irContext.irBuiltIns.functionFactory = functionFactory
-
-        val stubGenerator = DeclarationStubGenerator(
-            psi2irContext.moduleDescriptor, symbolTable, psi2irContext.irBuiltIns.languageVersionSettings, extensions
-        )
-        val frontEndContext = object : TranslationPluginContext {
-            override val moduleDescriptor: ModuleDescriptor
-                get() = psi2irContext.moduleDescriptor
-            override val bindingContext: BindingContext
-                get() = psi2irContext.bindingContext
-            override val symbolTable: ReferenceSymbolTable
-                get() = symbolTable
-            override val typeTranslator: TypeTranslator
-                get() = psi2irContext.typeTranslator
-            override val irBuiltIns: IrBuiltIns
-                get() = psi2irContext.irBuiltIns
-        }
-        val irLinker = JvmIrLinker(
-            psi2irContext.moduleDescriptor,
-            EmptyLoggingContext,
-            psi2irContext.irBuiltIns,
-            symbolTable,
-            functionFactory,
-            frontEndContext,
-            stubGenerator,
-            mangler
-        )
-
-        val pluginContext by lazy {
-            psi2irContext.run {
-                val symbols = BuiltinSymbolsBase(irBuiltIns, moduleDescriptor.builtIns, symbolTable.lazyWrapper)
-                IrPluginContextImpl(
-                    moduleDescriptor, bindingContext, languageVersionSettings, symbolTable, typeTranslator, irBuiltIns, irLinker, symbols
-                )
-            }
-        }
-
-        for (extension in pluginExtensions) {
-            psi2ir.addPostprocessingStep { moduleFragment ->
-                val old = stubGenerator.unboundSymbolGeneration
-                try {
-                    stubGenerator.unboundSymbolGeneration = true
-                    extension.generate(moduleFragment, pluginContext)
-                } finally {
-                    stubGenerator.unboundSymbolGeneration = old
-                }
-            }
-        }
-
-        val dependencies = psi2irContext.moduleDescriptor.allDependencyModules.map {
-            val kotlinLibrary = (it.getCapability(KlibModuleOrigin.CAPABILITY) as? DeserializedKlibModuleOrigin)?.library
-            irLinker.deserializeIrModuleHeader(it, kotlinLibrary)
-        }
-        val irProviders = listOf(irLinker)
-
-        val irModuleFragment = psi2ir.generateModuleFragment(
-            psi2irContext,
-            files,
-            irProviders,
-            pluginExtensions,
-            expectDescriptorToSymbol = null
-        )
-        irLinker.postProcess()
-
-        stubGenerator.unboundSymbolGeneration = true
-
-        // We need to compile all files we reference in Klibs
-        irModuleFragment.files.addAll(dependencies.flatMap { it.files })
-
-        return IrBackendInput(
-            state,
-            irModuleFragment,
-            symbolTable,
-            psi2irContext.sourceManager,
-            phaseConfig,
-            irProviders,
-            extensions,
-            ::DescriptorMetadataSerializer
-        )
+        return IrBackendInput(codegenFactory.convertToIr(state, files))
     }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt
index 5593fe9c115..2a9811ff291 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt
@@ -66,6 +66,7 @@ class DeclarationsDumpHandler(
         assertions.assertEqualsToFile(expectedFile, resultDump)
     }
 
+    @OptIn(ExperimentalStdlibApi::class)
     override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) {
         if (DiagnosticsDirectives.SKIP_TXT in module.directives) return
         val moduleDescriptor = info.analysisResult.moduleDescriptor
@@ -73,7 +74,12 @@ class DeclarationsDumpHandler(
         val comparator = RecursiveDescriptorComparator(
             createdAffectedPackagesConfiguration(module.files, info.ktFiles, moduleDescriptor, checkTypeEnabled)
         )
-        val packages = listOf(FqName.ROOT)
+        val packages = buildList {
+            module.directives[DiagnosticsDirectives.RENDER_PACKAGE].forEach {
+                add(FqName(it))
+            }
+            add(FqName.ROOT)
+        }
         val textByPackage = packages.keysToMap { StringBuilder() }
 
         for ((packageName, packageText) in textByPackage.entries) {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt
index d54cda890ba..d7fce5c3400 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrResultsConverter.kt
@@ -16,10 +16,9 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactories
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver
-import org.jetbrains.kotlin.fir.backend.jvm.FirMetadataSerializer
+import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension
 import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory
-import org.jetbrains.kotlin.ir.util.generateTypicalIrProviderList
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.CompilerEnvironment
 import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
@@ -77,20 +76,23 @@ class Fir2IrResultsConverter(
         ).build()
 
         irModuleFragment.irBuiltins.functionFactory = IrFunctionFactory(irModuleFragment.irBuiltins, symbolTable)
-        val irProviders = generateTypicalIrProviderList(
-            irModuleFragment.descriptor, irModuleFragment.irBuiltins, symbolTable, extensions = extensions
+        val irProviders = codegenFactory.configureBuiltInsAndgenerateIrProvidersInFrontendIRMode(
+            irModuleFragment,
+            symbolTable,
+            extensions
         )
 
         return IrBackendInput(
-            generationState,
-            irModuleFragment,
-            symbolTable,
-            sourceManager,
-            phaseConfig,
-            irProviders,
-            extensions,
-        ) { context, irClass, _, serializationBindings, parent ->
-            FirMetadataSerializer(inputArtifact.session, context, irClass, serializationBindings, components, parent)
-        }
+            JvmIrCodegenFactory.JvmIrBackendInput(
+                generationState,
+                irModuleFragment,
+                symbolTable,
+                sourceManager,
+                phaseConfig,
+                irProviders,
+                extensions,
+                FirJvmBackendExtension(inputArtifact.session, components)
+            )
+        )
     }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
index 7d4c1695559..848e0e21b65 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.fir.analysis.FirAnalyzerFacade
+import org.jetbrains.kotlin.fir.checkers.registerExtendedCommonCheckers
 import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
 import org.jetbrains.kotlin.fir.session.FirJvmModuleInfo
 import org.jetbrains.kotlin.fir.session.FirSessionFactory
@@ -21,7 +22,6 @@ import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.model.*
 import org.jetbrains.kotlin.test.services.*
-import java.io.File
 
 class FirFrontendFacade(
     testServices: TestServices
@@ -65,7 +65,11 @@ class FirFrontendFacade(
             sourcesScope,
             project,
             languageVersionSettings = languageVersionSettings
-        )
+        ) {
+            if (FirDiagnosticsDirectives.WITH_EXTENDED_CHECKERS in module.directives) {
+                registerExtendedCommonCheckers()
+            }
+        }
 
         val firAnalyzerFacade = FirAnalyzerFacade(session, languageVersionSettings, ktFiles, originalFiles, lightTreeEnabled)
         val firFiles = firAnalyzerFacade.runResolution()
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt
index 1f95054aeb1..4a8222e28c0 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGenerationDSL.kt
@@ -9,14 +9,14 @@ import org.jetbrains.kotlin.generators.InconsistencyChecker
 import org.jetbrains.kotlin.generators.TestGroupSuite
 import org.jetbrains.kotlin.generators.testGroupSuite
 
-fun generateNewTestGroupSuite(
+fun generateTestGroupSuiteWithJUnit5(
     args: Array<String>,
     init: TestGroupSuite.() -> Unit
 ) {
-    generateNewTestGroupSuite(InconsistencyChecker.hasDryRunArg(args), init)
+    generateTestGroupSuiteWithJUnit5(InconsistencyChecker.hasDryRunArg(args), init)
 }
 
-fun generateNewTestGroupSuite(
+fun generateTestGroupSuiteWithJUnit5(
     dryRun: Boolean = false,
     init: TestGroupSuite.() -> Unit
 ) {
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt
index c6902c89a75..492f658534f 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/NewTestGeneratorImpl.kt
@@ -22,6 +22,8 @@ import java.io.File
 import java.io.IOException
 import java.util.*
 
+private const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt"
+
 private val METHOD_GENERATORS = listOf(
     SimpleTestClassModelTestAllFilesPresentMethodGenerator,
     SimpleTestMethodGenerator,
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt
index e82d9f6534e..fa8f5cb9c65 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt
@@ -49,11 +49,20 @@ class TestConfigurationImpl(
         }
     }
 
+    private val environmentConfigurators: List<EnvironmentConfigurator> =
+        environmentConfigurators.map { it.invoke(testServices) }.also { configurators ->
+            configurators.flatMapTo(allDirectives) { it.directivesContainers }
+            for (configurator in configurators) {
+                configurator.additionalServices.forEach { testServices.register(it) }
+            }
+        }
+
     override val moduleStructureExtractor: ModuleStructureExtractor = ModuleStructureExtractorImpl(
         testServices,
         additionalSourceProviders.map { it.invoke(testServices) }.also {
             it.flatMapTo(allDirectives) { provider -> provider.directives }
-        }
+        },
+        this.environmentConfigurators
     )
 
     override val metaTestConfigurators: List<MetaTestConfigurator> = metaTestConfigurators.map {
@@ -75,15 +84,7 @@ class TestConfigurationImpl(
             val sourceFileProvider = SourceFileProviderImpl(sourceFilePreprocessors)
             register(SourceFileProvider::class, sourceFileProvider)
 
-            val configurators = environmentConfigurators.map { it.invoke(this) }
-            configurators.flatMapTo(allDirectives) { it.directivesContainers }
-            for (configurator in configurators) {
-                configurator.additionalServices.forEach { register(it) }
-            }
-            val environmentProvider = CompilerConfigurationProviderImpl(
-                rootDisposable,
-                configurators
-            )
+            val environmentProvider = CompilerConfigurationProviderImpl(rootDisposable, this@TestConfigurationImpl.environmentConfigurators)
             register(CompilerConfigurationProvider::class, environmentProvider)
 
             register(AssertionsService::class, assertions)
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt
index e3db8408a71..cf032ff4adc 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticTest.kt
@@ -7,10 +7,12 @@ package org.jetbrains.kotlin.test.runners
 
 import org.jetbrains.kotlin.config.ExplicitApiMode
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives
 import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_JVM_DIAGNOSTICS_ON_FRONTEND
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.JDK_KIND
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_REFLECT
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_STDLIB
 import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.EXPLICIT_API_MODE
 import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.USE_EXPERIMENTAL
@@ -80,5 +82,13 @@ abstract class AbstractDiagnosticTest : AbstractKotlinCompilerTest() {
                 +WITH_STDLIB
             }
         }
+
+        forTestsMatching("compiler/testData/diagnostics/tests/testsWithJava15/*") {
+            defaultDirectives {
+                JDK_KIND with TestJdkKind.FULL_JDK_15
+                +WITH_STDLIB
+                +WITH_REFLECT
+            }
+        }
     }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt
index f5497d17639..fa45603261a 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTest.kt
@@ -6,14 +6,14 @@
 package org.jetbrains.kotlin.test.runners
 
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.COMPARE_WITH_LIGHT_TREE
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.USE_LIGHT_TREE
+import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.WITH_EXTENDED_CHECKERS
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_STDLIB
-import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
 import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
 import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
 import org.jetbrains.kotlin.test.frontend.fir.handlers.*
@@ -75,6 +75,20 @@ abstract class AbstractFirDiagnosticTest : AbstractKotlinCompilerTest() {
                 +WITH_STDLIB
             }
         }
+
+        forTestsMatching("compiler/fir/analysis-tests/testData/resolve/extendedCheckers/*") {
+            defaultDirectives {
+                +WITH_EXTENDED_CHECKERS
+            }
+        }
+
+        forTestsMatching("compiler/testData/diagnostics/tests/testsWithJava15/*") {
+            defaultDirectives {
+                JvmEnvironmentConfigurationDirectives.JDK_KIND with TestJdkKind.FULL_JDK_15
+                +WITH_STDLIB
+                +JvmEnvironmentConfigurationDirectives.WITH_REFLECT
+            }
+        }
     }
 }
 
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt
new file mode 100644
index 00000000000..666b071dae1
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractForeignAnnotationsTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2010-2020 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.test.runners
+
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.test.builders.Constructor
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_JVM_DIAGNOSTICS_ON_FRONTEND
+import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.SKIP_TXT
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.ANNOTATIONS_PATH
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SKIP_JAVA_SOURCES
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_JAVAC
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
+import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
+import org.jetbrains.kotlin.test.frontend.classic.handlers.DeclarationsDumpHandler
+import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor
+import org.jetbrains.kotlin.test.model.BackendKind
+import org.jetbrains.kotlin.test.model.DependencyKind
+import org.jetbrains.kotlin.test.model.FrontendKinds
+import org.jetbrains.kotlin.test.services.AdditionalDiagnosticsSourceFilesProvider
+import org.jetbrains.kotlin.test.services.CoroutineHelpersSourceFilesProvider
+import org.jetbrains.kotlin.test.services.configuration.JdkForeignAnnotationType
+import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
+import org.jetbrains.kotlin.test.services.configuration.JvmForeignAnnotationsAgainstCompiledJavaConfigurator
+import org.jetbrains.kotlin.test.services.configuration.JvmForeignAnnotationsConfigurator
+import org.jetbrains.kotlin.test.services.jvm.ForeignAnnotationAgainstCompiledJavaTestSuppressor
+
+abstract class AbstractForeignAnnotationsTestBase : AbstractKotlinCompilerTest() {
+    protected abstract val foreignAnnotationsConfigurator: Constructor<JvmForeignAnnotationsConfigurator>
+
+    override fun TestConfigurationBuilder.configuration() {
+        globalDefaults {
+            frontend = FrontendKinds.ClassicFrontend
+            backend = BackendKind.NoBackend
+            targetPlatform = JvmPlatforms.defaultJvmPlatform
+            dependencyKind = DependencyKind.Source
+        }
+
+        defaultDirectives {
+            +REPORT_JVM_DIAGNOSTICS_ON_FRONTEND
+        }
+
+        enableMetaInfoHandler()
+
+        useConfigurators(
+            ::JvmEnvironmentConfigurator,
+            foreignAnnotationsConfigurator
+        )
+
+        useMetaInfoProcessors(::OldNewInferenceMetaInfoProcessor)
+        useAdditionalSourceProviders(
+            ::AdditionalDiagnosticsSourceFilesProvider,
+            ::CoroutineHelpersSourceFilesProvider,
+        )
+
+        useFrontendFacades(::ClassicFrontendFacade)
+        useFrontendHandlers(
+            ::DeclarationsDumpHandler,
+            ::ClassicDiagnosticsHandler,
+        )
+
+        forTestsMatching("compiler/testData/foreignAnnotations/tests/*") {
+            defaultDirectives {
+                ANNOTATIONS_PATH with JdkForeignAnnotationType.Annotations
+            }
+        }
+
+        forTestsMatching("compiler/testData/foreignAnnotations/java8Tests/*") {
+            defaultDirectives {
+                ANNOTATIONS_PATH with JdkForeignAnnotationType.Jdk8Annotations
+            }
+        }
+    }
+}
+
+abstract class AbstractForeignAnnotationsTest : AbstractForeignAnnotationsTestBase() {
+    override val foreignAnnotationsConfigurator: Constructor<JvmForeignAnnotationsConfigurator>
+        get() = ::JvmForeignAnnotationsConfigurator
+}
+
+abstract class AbstractForeignAnnotationsNoAnnotationInClasspathTest : AbstractForeignAnnotationsTestBase() {
+    override val foreignAnnotationsConfigurator: Constructor<JvmForeignAnnotationsConfigurator>
+        get() = ::JvmForeignAnnotationsAgainstCompiledJavaConfigurator
+
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        with(builder) {
+            defaultDirectives {
+                +SKIP_JAVA_SOURCES
+                +SKIP_TXT
+            }
+
+            useMetaTestConfigurators(::ForeignAnnotationAgainstCompiledJavaTestSuppressor)
+        }
+    }
+}
+
+abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() {
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        with(builder) {
+            defaultDirectives {
+                +USE_PSI_CLASS_FILES_READING
+            }
+        }
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
index 8fa8ed5af84..cd2b1738609 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
+import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
 import org.jetbrains.kotlin.test.model.BackendKinds
@@ -38,7 +39,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
 
     override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {
         if (module.targetPlatform !in JvmPlatforms.allJvmPlatforms) return
-        val registeredDirectives = module.allRegisteredDirectives
+        val registeredDirectives = module.directives
         val targets = registeredDirectives[JvmEnvironmentConfigurationDirectives.JVM_TARGET]
         when (targets.size) {
             0 -> {}
@@ -62,6 +63,9 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
             TestJdkKind.FULL_JDK_9 -> {
                 configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk9Home())
             }
+            TestJdkKind.FULL_JDK_15 -> {
+                configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk15Home())
+            }
             TestJdkKind.FULL_JDK -> {
                 if (SystemInfo.IS_AT_LEAST_JAVA9) {
                     configuration.put(JVMConfigurationKeys.JDK_HOME, File(System.getProperty("java.home")))
@@ -96,12 +100,18 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
             configuration.addJvmClasspathRoot(ForTestCompileRuntime.androidAnnotationsForTests())
         }
 
+        if (LanguageSettingsDirectives.ENABLE_JVM_PREVIEW in module.directives) {
+            configuration.put(JVMConfigurationKeys.ENABLE_JVM_PREVIEW, true)
+        }
+
         val isIr = module.backendKind == BackendKinds.IrBackend
         configuration.put(JVMConfigurationKeys.IR, isIr)
 
-        module.javaFiles.takeIf { it.isNotEmpty() }?.let { javaFiles ->
-            javaFiles.forEach { testServices.sourceFileProvider.getRealFileForSourceFile(it) }
-            configuration.addJavaSourceRoot(testServices.sourceFileProvider.javaSourceDirectory)
+        if (JvmEnvironmentConfigurationDirectives.SKIP_JAVA_SOURCES !in module.directives) {
+            module.javaFiles.takeIf { it.isNotEmpty() }?.let { javaFiles ->
+                javaFiles.forEach { testServices.sourceFileProvider.getRealFileForSourceFile(it) }
+                configuration.addJavaSourceRoot(testServices.sourceFileProvider.javaSourceDirectory)
+            }
         }
 
         configuration.registerModuleDependencies(module)
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt
new file mode 100644
index 00000000000..3054825246e
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2010-2020 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.test.services.configuration
+
+import com.intellij.mock.MockProject
+import org.jetbrains.kotlin.cli.jvm.config.JvmContentRoot
+import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
+import org.jetbrains.kotlin.codegen.CodegenTestUtil
+import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
+import org.jetbrains.kotlin.config.AnalysisFlag
+import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.JvmAnalysisFlags
+import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.JSPECIFY_STATE
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.JSR305_GLOBAL_REPORT
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.JSR305_MIGRATION_REPORT
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.JSR305_SPECIAL_REPORT
+import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
+import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
+import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
+import org.jetbrains.kotlin.test.model.TestModule
+import org.jetbrains.kotlin.test.services.*
+import org.jetbrains.kotlin.test.util.KtTestUtil
+import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
+import org.jetbrains.kotlin.utils.ReportLevel
+import java.io.File
+
+enum class JdkForeignAnnotationType(val path: String) {
+    Annotations("third-party/annotations"),
+    Jdk8Annotations("third-party/jdk8-annotations");
+
+    companion object {
+        val FOREIGN_ANNOTATIONS_SOURCES_PATH = Annotations.path
+        val FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH = Jdk8Annotations.path
+    }
+}
+
+open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
+    companion object {
+        private const val TEST_ANNOTATIONS_SOURCE_PATH = "compiler/testData/foreignAnnotations/testAnnotations"
+    }
+
+    override val directivesContainers: List<DirectivesContainer>
+        get() = listOf(ForeignAnnotationsDirectives)
+
+    @OptIn(ExperimentalStdlibApi::class)
+    override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {
+        val extraClassPath = buildList {
+            val foreignAnnotations = createJarWithForeignAnnotations(module)
+            addAll(foreignAnnotations)
+            addAll(compileTestAnnotations(foreignAnnotations))
+        }
+        configuration.addJvmClasspathRoots(extraClassPath)
+    }
+
+    protected fun createJarWithForeignAnnotations(module: TestModule): List<File> {
+        val directive = ForeignAnnotationsDirectives.ANNOTATIONS_PATH
+        val annotationsPath = module.directives.singleOrZeroValue(directive)
+            ?.path
+            ?: error("${directive.name} should be specified in test or test runner")
+
+        return listOf(
+            MockLibraryUtil.compileJavaFilesLibraryToJar(annotationsPath, "foreign-annotations", assertions = JUnit5Assertions),
+            ForTestCompileRuntime.jvmAnnotationsForTests()
+        )
+    }
+
+    protected fun compileTestAnnotations(extraClassPath: List<File>): List<File> =
+        listOf(
+            MockLibraryUtil.compileJavaFilesLibraryToJar(
+                TEST_ANNOTATIONS_SOURCE_PATH,
+                "test-foreign-annotations",
+                extraOptions = listOf("-Xallow-kotlin-package"),
+                extraClasspath = extraClassPath.map { it.path },
+                assertions = JUnit5Assertions
+            )
+        )
+
+    override fun provideAdditionalAnalysisFlags(directives: RegisteredDirectives): Map<AnalysisFlag<*>, Any?> {
+        val globalState = directives.singleOrZeroValue(JSR305_GLOBAL_REPORT) ?: ReportLevel.STRICT
+        val migrationState = directives.singleOrZeroValue(JSR305_MIGRATION_REPORT)
+        val userAnnotationsState = directives[JSR305_SPECIAL_REPORT].mapNotNull {
+            val (name, stateDescription) = it.split(":").takeIf { it.size == 2 } ?: return@mapNotNull null
+            val state = ReportLevel.findByDescription(stateDescription) ?: return@mapNotNull null
+            name to state
+        }.toMap()
+        val jSpecifyReportLevel = directives.singleOrZeroValue(JSPECIFY_STATE) ?: ReportLevel.STRICT
+        return mapOf(
+            JvmAnalysisFlags.javaTypeEnhancementState to JavaTypeEnhancementState(
+                globalState,
+                migrationState,
+                userAnnotationsState,
+                jspecifyReportLevel = jSpecifyReportLevel
+            )
+        )
+    }
+}
+
+class JvmForeignAnnotationsAgainstCompiledJavaConfigurator(testServices: TestServices) : JvmForeignAnnotationsConfigurator(testServices) {
+    @OptIn(ExperimentalStdlibApi::class)
+    override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule, project: MockProject) {
+        val compiledJavaPath = KtTestUtil.tmpDir("java-compiled-files")
+
+        val foreignAnnotations = createJarWithForeignAnnotations(module)
+        val testAnnotations = compileTestAnnotations(foreignAnnotations)
+        val additionalClasspath = buildList {
+            addAll(foreignAnnotations)
+            addAll(testAnnotations)
+        }.map { it.path }
+
+        module.javaFiles.forEach { testServices.sourceFileProvider.getRealFileForSourceFile(it) }
+        CodegenTestUtil.compileJava(
+            CodegenTestUtil.findJavaSourcesInDirectory(testServices.sourceFileProvider.javaSourceDirectory),
+            additionalClasspath,
+            emptyList(),
+            compiledJavaPath,
+            JUnit5Assertions
+        )
+
+        val extraClassPath = buildList {
+            add(compiledJavaPath)
+            addAll(testAnnotations)
+        }
+
+        configuration.addJvmClasspathRoots(extraClassPath)
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
index e2724ea52a7..d4aba29e0f7 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/impl/ModuleStructureExtractorImpl.kt
@@ -24,7 +24,8 @@ import java.io.File
 
 class ModuleStructureExtractorImpl(
     testServices: TestServices,
-    additionalSourceProviders: List<AdditionalSourceProvider>
+    additionalSourceProviders: List<AdditionalSourceProvider>,
+    private val environmentConfigurators: List<EnvironmentConfigurator>
 ) : ModuleStructureExtractor(testServices, additionalSourceProviders) {
     companion object {
         private val allowedExtensionsForFiles = listOf(".kt", ".kts", ".java")
@@ -210,7 +211,7 @@ class ModuleStructureExtractorImpl(
         private fun finishModule() {
             finishFile()
             val moduleDirectives = directivesBuilder.build() + testServices.defaultDirectives + globalDirectives
-            currentModuleLanguageVersionSettingsBuilder.configureUsingDirectives(moduleDirectives)
+            currentModuleLanguageVersionSettingsBuilder.configureUsingDirectives(moduleDirectives, environmentConfigurators)
             val moduleName = currentModuleName ?: defaultModuleName
             val testModule = TestModule(
                 name = moduleName,
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/ForeignAnnotationAgainstCompiledJavaTestSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/ForeignAnnotationAgainstCompiledJavaTestSuppressor.kt
new file mode 100644
index 00000000000..c7403aca269
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/jvm/ForeignAnnotationAgainstCompiledJavaTestSuppressor.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2020 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.test.services.jvm
+
+import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives.SOURCE_RETENTION_ANNOTATIONS
+import org.jetbrains.kotlin.test.services.MetaTestConfigurator
+import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.moduleStructure
+import org.jetbrains.kotlin.test.utils.isDirectiveDefined
+
+class ForeignAnnotationAgainstCompiledJavaTestSuppressor(testServices: TestServices) : MetaTestConfigurator(testServices) {
+    override fun shouldSkipTest(): Boolean {
+        val testFile = testServices.moduleStructure.originalTestDataFiles.first()
+        return testFile.isDirectiveDefined("// ${SOURCE_RETENTION_ANNOTATIONS.name}")
+    }
+}
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt
index 3a881490d4e..f6f91eecff9 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/FileUtils.kt
@@ -32,3 +32,11 @@ fun File.withExtension(extension: String): File {
     val extension = extension.removePrefix(".")
     return parentFile.resolve("$nameWithoutExtension.$extension")
 }
+
+/*
+ * Please use this method only in places where `TestModule` is not accessible
+ * In other cases use testModule.directives
+ */
+fun File.isDirectiveDefined(directive: String): Boolean = this.useLines { line ->
+    line.any { it == directive }
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/TestExceptionsComparator.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/TestExceptionsComparator.kt
index 7a0c3cf4471..8909fd784fa 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/TestExceptionsComparator.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/TestExceptionsComparator.kt
@@ -8,47 +8,9 @@ package org.jetbrains.kotlin
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Assert
 import java.io.File
-import java.io.PrintStream
-import java.io.PrintWriter
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-enum class TestsExceptionType(val postfix: String) {
-    COMPILER_ERROR("compiler"),
-    COMPILETIME_ERROR("compiletime"),
-    RUNTIME_ERROR("runtime"),
-    INFRASTRUCTURE_ERROR("infrastructure");
-
-    companion object {
-        private val map = values().associateBy(TestsExceptionType::postfix)
-
-        fun fromValue(type: String) = map[type]
-    }
-}
-
-sealed class TestsError(val original: Throwable, val type: TestsExceptionType) : Error() {
-    override fun toString(): String = original.toString()
-    override fun getStackTrace(): Array<out StackTraceElement> = original.stackTrace
-    override fun initCause(cause: Throwable?): Throwable = original.initCause(cause)
-    override val cause: Throwable? get() = original.cause
-
-    // This function is called in the constructor of Throwable, where original is not yet initialized
-    override fun fillInStackTrace(): Throwable? = @Suppress("UNNECESSARY_SAFE_CALL") original?.fillInStackTrace()
-
-    override fun setStackTrace(stackTrace: Array<out StackTraceElement>?) {
-        original.stackTrace = stackTrace
-    }
-
-    override fun printStackTrace() = original.printStackTrace()
-    override fun printStackTrace(s: PrintStream?) = original.printStackTrace(s)
-    override fun printStackTrace(s: PrintWriter?) = original.printStackTrace(s)
-}
-
-class TestsCompilerError(original: Throwable) : TestsError(original, TestsExceptionType.COMPILER_ERROR)
-class TestsInfrastructureError(original: Throwable) : TestsError(original, TestsExceptionType.INFRASTRUCTURE_ERROR)
-class TestsCompiletimeError(original: Throwable) : TestsError(original, TestsExceptionType.COMPILETIME_ERROR)
-class TestsRuntimeError(original: Throwable) : TestsError(original, TestsExceptionType.RUNTIME_ERROR)
-
 private enum class ExceptionType {
     ANALYZING_EXPRESSION,
     UNKNOWN
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractJavacForeignAnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractJavacForeignAnnotationsTest.kt
deleted file mode 100644
index bb7700f0bbd..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractJavacForeignAnnotationsTest.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.checkers.javac
-
-import org.jetbrains.kotlin.checkers.AbstractForeignAnnotationsTest
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import java.io.File
-
-abstract class AbstractJavacForeignAnnotationsTest : AbstractForeignAnnotationsTest() {
-
-    override fun setupEnvironment(environment: KotlinCoreEnvironment, testDataFile: File, files: List<TestFile>) {
-        val groupedByModule = files.groupBy(TestFile::module)
-        val allKtFiles = groupedByModule.values.flatMap { getKtFiles(it, true) }
-        environment.registerJavac(kotlinFiles = allKtFiles)
-        environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
-    }
-}
\ No newline at end of file
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractJavacForeignJava8AnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractJavacForeignJava8AnnotationsTest.kt
deleted file mode 100644
index c282336e6d1..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractJavacForeignJava8AnnotationsTest.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.checkers.javac
-
-import org.jetbrains.kotlin.checkers.AbstractForeignJava8AnnotationsTest
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import java.io.File
-
-abstract class AbstractJavacForeignJava8AnnotationsTest : AbstractForeignJava8AnnotationsTest() {
-
-    override fun shouldSkipTest(wholeFile: File, files: List<TestFile>): Boolean {
-        return isSkipJavacTest(wholeFile)
-    }
-
-    override fun setupEnvironment(environment: KotlinCoreEnvironment, testDataFile: File, files: List<TestFile>) {
-        val groupedByModule = files.groupBy(TestFile::module)
-        val allKtFiles = groupedByModule.values.flatMap { getKtFiles(it, true) }
-        environment.registerJavac(kotlinFiles = allKtFiles)
-        environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
-    }
-
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
index 9848f73c4bd..9fd33aaf46c 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
@@ -80,6 +80,7 @@ import java.util.*
 import java.util.function.Predicate
 import java.util.regex.Pattern
 
+@Deprecated("Please use new test infrastructure from :compiler:tests-common:new. Check org.jetbrains.kotlin.test.runners.AbstractDiagnosticTest")
 abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
     override fun analyzeAndCheck(testDataFile: File, files: List<TestFile>) {
         try {
@@ -247,57 +248,12 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
         performAdditionalChecksAfterDiagnostics(
             testDataFile, files, groupedByModule, modules, moduleBindings, languageVersionSettingsByModule
         )
-        if (shouldValidateFirTestData(testDataFile)) {
-            checkFirTestdata(testDataFile, files)
-        }
     }
 
     protected open fun checkDiagnostics(actualText: String, testDataFile: File) {
         KotlinTestUtils.assertEqualsToFile(getExpectedDiagnosticsFile(testDataFile), actualText)
     }
 
-    private fun checkFirTestdata(testDataFile: File, files: List<TestFile>) {
-        val firTestDataFile = File(testDataFile.absolutePath.replace(".kt", ".fir.kt"))
-        val firFailFile = File(testDataFile.absolutePath.replace(".kt", ".fir.fail"))
-        when {
-            firFailFile.exists() -> return
-            firTestDataFile.exists() -> checkOriginalAndFirTestdataIdentity(testDataFile, firTestDataFile)
-            else -> runFirTestAndGenerateTestData(testDataFile, firTestDataFile, files)
-        }
-    }
-
-    private fun checkOriginalAndFirTestdataIdentity(testDataFile: File, firTestDataFile: File) {
-        val originalTestData = loadTestDataWithoutDiagnostics(testDataFile)
-        val firTestData = loadTestDataWithoutDiagnostics(firTestDataFile)
-        val message = "Original and fir test data aren't identical. " +
-                "Please, add changes from ${testDataFile.name} to ${firTestDataFile.name}"
-        TestCase.assertEquals(message, originalTestData, firTestData)
-    }
-
-    private fun runFirTestAndGenerateTestData(testDataFile: File, firTestDataFile: File, files: List<TestFile>) {
-        val testRunner = object : AbstractFirOldFrontendDiagnosticsTest() {
-            init {
-                environment = this@AbstractDiagnosticsTest.environment
-            }
-        }
-        if (testDataFile.readText().contains("// FIR_IDENTICAL")) {
-            try {
-                PsiElementFinder.EP.getPoint(environment.project).unregisterExtension(JavaElementFinder::class.java)
-                testRunner.analyzeAndCheckUnhandled(testDataFile, files)
-            } catch (e: FileComparisonFailure) {
-                println("Old FE & FIR produces different diagnostics for this file. Please remove FIR_IDENTICAL line manually")
-                throw FileComparisonFailure(
-                    "Old FE & FIR produces different diagnostics for this file. Please remove FIR_IDENTICAL line manually\n" +
-                            e.message,
-                    e.expected, e.actual, e.filePath, e.actualFilePath
-                )
-            }
-        } else {
-            FileUtil.copy(testDataFile, firTestDataFile)
-            testRunner.analyzeAndCheckUnhandled(firTestDataFile, files)
-        }
-    }
-
     private fun StringBuilder.cleanupInferenceDiagnostics(): String = replace(Regex("NI;([\\S]*), OI;\\1([,!])")) { it.groupValues[1] + it.groupValues[2] }
 
     protected open fun getExpectedDiagnosticsFile(testDataFile: File): File {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsCompiledJavaDiagnosticTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsCompiledJavaDiagnosticTest.kt
index 57be257095e..650a476a60a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsCompiledJavaDiagnosticTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsCompiledJavaDiagnosticTest.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.checkers
 
-import org.jetbrains.kotlin.test.MockLibraryUtil.compileJavaFilesLibraryToJar
+import org.jetbrains.kotlin.test.MockLibraryUtilExt.compileJavaFilesLibraryToJar
 import java.io.File
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.createTempDirectory
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt
deleted file mode 100644
index a08c193f54e..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.checkers
-
-import org.jetbrains.kotlin.codegen.CodegenTestUtil
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.util.KtTestUtil
-import java.io.File
-
-abstract class AbstractForeignAnnotationsNoAnnotationInClasspathTest : AbstractForeignAnnotationsTest() {
-    // This should be executed after setUp runs, since setUp changes the root folder
-    // for temporary files.
-    private val compiledJavaPath by lazy {
-        KtTestUtil.tmpDir("java-compiled-files")
-    }
-
-    override fun getExtraClasspath(): List<File> {
-        val foreignAnnotations = createJarWithForeignAnnotations()
-        val testAnnotations = compileTestAnnotations(foreignAnnotations)
-
-        val additionalClasspath = (foreignAnnotations + testAnnotations).map { it.path }
-        CodegenTestUtil.compileJava(
-                CodegenTestUtil.findJavaSourcesInDirectory(javaFilesDir),
-                additionalClasspath, emptyList(),
-                compiledJavaPath
-        )
-
-        return listOf(compiledJavaPath) + testAnnotations
-    }
-
-    override fun shouldSkipTest(wholeFile: File, files: List<TestFile>): Boolean {
-        return files.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SOURCE_RETENTION_ANNOTATIONS") }
-    }
-
-    override fun isJavaSourceRootNeeded() = false
-    override fun skipDescriptorsValidation() = true
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest.kt
deleted file mode 100644
index 139f74af206..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.checkers
-
-import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.config.JVMConfigurationKeys
-
-abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest :
-    AbstractForeignAnnotationsNoAnnotationInClasspathTest() {
-    override fun updateConfiguration(configuration: CompilerConfiguration) {
-        super.updateConfiguration(configuration)
-        configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true)
-    }
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt
deleted file mode 100644
index 40b66d1a4ee..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.checkers
-
-import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
-import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
-import org.jetbrains.kotlin.utils.ReportLevel
-import java.io.File
-
-const val FOREIGN_ANNOTATIONS_SOURCES_PATH = "third-party/annotations"
-const val FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH = "third-party/jdk8-annotations"
-const val TEST_ANNOTATIONS_SOURCE_PATH = "compiler/testData/foreignAnnotations/testAnnotations"
-
-abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() {
-    override fun getExtraClasspath(): List<File> {
-        val foreignAnnotations = createJarWithForeignAnnotations()
-        return foreignAnnotations + compileTestAnnotations(foreignAnnotations)
-    }
-
-    protected fun compileTestAnnotations(extraClassPath: List<File>): List<File> =
-        listOf(MockLibraryUtil.compileJavaFilesLibraryToJar(
-            TEST_ANNOTATIONS_SOURCE_PATH,
-            "test-foreign-annotations",
-            extraOptions = listOf("-Xallow-kotlin-package"),
-            extraClasspath = extraClassPath.map { it.path }
-        ))
-
-    protected fun createJarWithForeignAnnotations(): List<File> = listOf(
-        MockLibraryUtil.compileJavaFilesLibraryToJar(annotationsPath, "foreign-annotations"),
-        ForTestCompileRuntime.jvmAnnotationsForTests()
-    )
-
-    protected open val annotationsPath: String
-        get() = FOREIGN_ANNOTATIONS_SOURCES_PATH
-
-    override fun loadLanguageVersionSettings(module: List<TestFile>): LanguageVersionSettings {
-        val analysisFlags = loadAnalysisFlags(module)
-        return CompilerTestLanguageVersionSettings(
-            DEFAULT_DIAGNOSTIC_TESTS_FEATURES,
-            ApiVersion.LATEST_STABLE,
-            LanguageVersion.LATEST_STABLE,
-            analysisFlags = analysisFlags
-        )
-    }
-
-    private fun loadAnalysisFlags(module: List<TestFile>): Map<AnalysisFlag<*>, Any?> {
-        val globalState = module.getDirectiveValue(JSR305_GLOBAL_DIRECTIVE) ?: ReportLevel.STRICT
-        val migrationState = module.getDirectiveValue(JSR305_MIGRATION_DIRECTIVE)
-
-        val userAnnotationsState = module.flatMap {
-            InTextDirectivesUtils.findListWithPrefixes(it.expectedText, JSR305_SPECIAL_DIRECTIVE)
-        }.mapNotNull {
-            val (name, stateDescription) = it.split(":").takeIf { it.size == 2 } ?: return@mapNotNull null
-            val state = ReportLevel.findByDescription(stateDescription) ?: return@mapNotNull null
-
-            name to state
-        }.toMap()
-
-        val jspecifyReportLevel = module.getDirectiveValue(JSPECIFY_STATE_SPECIAL_DIRECTIVE) ?: ReportLevel.STRICT
-
-        return mapOf(
-            JvmAnalysisFlags.javaTypeEnhancementState to JavaTypeEnhancementState(
-                globalState,
-                migrationState,
-                userAnnotationsState,
-                jspecifyReportLevel = jspecifyReportLevel
-            )
-        )
-    }
-
-    private fun List<TestFile>.getDirectiveValue(directive: String): ReportLevel? = mapNotNull {
-        InTextDirectivesUtils.findLinesWithPrefixesRemoved(it.expectedText, directive).firstOrNull()
-    }.firstOrNull().let { ReportLevel.findByDescription(it) }
-
-    companion object {
-        private const val JSR305_GLOBAL_DIRECTIVE = "JSR305_GLOBAL_REPORT"
-        private const val JSR305_MIGRATION_DIRECTIVE = "JSR305_MIGRATION_REPORT"
-        private const val JSR305_SPECIAL_DIRECTIVE = "JSR305_SPECIAL_REPORT"
-        private const val JSPECIFY_STATE_SPECIAL_DIRECTIVE = "JSPECIFY_STATE"
-    }
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt
deleted file mode 100644
index b359b287ced..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignJava8AnnotationsTest.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.checkers
-
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import java.io.File
-
-abstract class AbstractForeignJava8AnnotationsTest : AbstractForeignAnnotationsTest() {
-    override val annotationsPath: String
-        get() = JAVA8_ANNOTATION_SOURCES_PATH
-}
-
-abstract class AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() {
-    override val annotationsPath: String
-        get() = JAVA8_ANNOTATION_SOURCES_PATH
-
-    override fun shouldSkipTest(wholeFile: File, files: List<TestFile>): Boolean {
-        return skipForCompiledVersion(files)
-    }
-}
-
-abstract class AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest :
-    AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest() {
-    override val annotationsPath: String
-        get() = JAVA8_ANNOTATION_SOURCES_PATH
-
-    override fun shouldSkipTest(wholeFile: File, files: List<TestFile>): Boolean {
-        return skipForCompiledVersion(files)
-    }
-}
-
-private fun skipForCompiledVersion(files: List<BaseDiagnosticsTest.TestFile>) =
-        files.any { file -> InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_COMPILED_JAVA") }
-
-
-private const val JAVA8_ANNOTATION_SOURCES_PATH = "third-party/jdk8-annotations"
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
index f4e9707b930..f702b80bf06 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
@@ -8,11 +8,13 @@ package org.jetbrains.kotlin.checkers
 import com.intellij.openapi.util.io.FileUtil
 import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import java.io.File
 import java.util.*
 import java.util.regex.Pattern
-import kotlin.io.path.*
+import kotlin.io.path.ExperimentalPathApi
+import kotlin.io.path.createTempFile
+import kotlin.io.path.writeText
 
 const val JSPECIFY_NULLNESS_MISMATCH_MARK = "jspecify_nullness_mismatch"
 
@@ -27,7 +29,7 @@ abstract class AbstractJspecifyAnnotationsTest : AbstractDiagnosticsTest() {
         super.doMultiFileTest(
             wholeFile,
             files,
-            MockLibraryUtil.compileJavaFilesLibraryToJar(FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH, "foreign-annotations"),
+            MockLibraryUtilExt.compileJavaFilesLibraryToJar(FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH, "foreign-annotations"),
             usePsiClassFilesReading = false,
             excludeNonTypeUseJetbrainsAnnotations = true
         )
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk15Test.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt
similarity index 60%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk15Test.kt
rename to compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt
index 186b4b836d9..1b7656ef343 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk15Test.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/ThirdPartyAnnotationPaths.kt
@@ -13,18 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.jetbrains.kotlin.checkers
 
-import org.jetbrains.kotlin.test.ConfigurationKind
-import org.jetbrains.kotlin.test.TestJdkKind
-
-abstract class AbstractDiagnosticsWithJdk15Test : AbstractDiagnosticsTest() {
-
-    override fun getTestJdkKind(files: List<TestFile>): TestJdkKind {
-        return TestJdkKind.FULL_JDK_15
-    }
-
-    override fun extractConfigurationKind(files: List<TestFile>): ConfigurationKind {
-        return ConfigurationKind.ALL
-    }
-}
+const val FOREIGN_ANNOTATIONS_SOURCES_PATH = "third-party/annotations"
+const val FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH = "third-party/jdk8-annotations"
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
index b3a317824a6..3e04797b1a8 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java
@@ -24,7 +24,7 @@ import kotlin.io.FilesKt;
 import kotlin.io.path.PathsKt;
 import kotlin.text.Charsets;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.checkers.AbstractForeignAnnotationsTestKt;
+import org.jetbrains.kotlin.checkers.ThirdPartyAnnotationPathsKt;
 import org.jetbrains.kotlin.cli.common.CLITool;
 import org.jetbrains.kotlin.cli.common.ExitCode;
 import org.jetbrains.kotlin.cli.common.Usage;
@@ -261,7 +261,7 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
                 .replace(TESTDATA_DIR, testDataDir)
                 .replace(
                         "$FOREIGN_ANNOTATIONS_DIR$",
-                        new File(AbstractForeignAnnotationsTestKt.FOREIGN_ANNOTATIONS_SOURCES_PATH).getPath()
+                        new File(ThirdPartyAnnotationPathsKt.FOREIGN_ANNOTATIONS_SOURCES_PATH).getPath()
                 ).replace(
                         "$JDK_15$",
                         KtTestUtil.getJdk15Home().getPath()
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
index 4a3ad7319b7..28f63b170d2 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxAgainstJavaCodegenTest.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.codegen
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JvmTarget
+import org.jetbrains.kotlin.test.util.JUnit4Assertions
 import java.io.File
 
 abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenTest() {
@@ -35,6 +36,7 @@ abstract class AbstractBlackBoxAgainstJavaCodegenTest : AbstractBlackBoxCodegenT
                     jvmTargets.firstOrNull(),
                     enablePreview,
                 ),
+                JUnit4Assertions
             )
         }
 
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
index fa0d92bdb95..e5a105425b4 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
@@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.TestsRuntimeError;
 import org.jetbrains.kotlin.backend.common.CodegenUtil;
-import org.jetbrains.kotlin.builtins.StandardNames;
 import org.jetbrains.kotlin.codegen.ir.AbstractFirBlackBoxCodegenTest;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
 import org.jetbrains.kotlin.psi.KtFile;
@@ -74,27 +73,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
         String text =
                 BytecodeListingTextCollectingVisitor.Companion.getText(
                         classFileFactory,
-                        new BytecodeListingTextCollectingVisitor.Filter() {
-                            @Override
-                            public boolean shouldWriteClass(int access, @NotNull String name) {
-                                return !name.startsWith("helpers/");
-                            }
-
-                            @Override
-                            public boolean shouldWriteMethod(int access, @NotNull String name, @NotNull String desc) {
-                                return true;
-                            }
-
-                            @Override
-                            public boolean shouldWriteField(int access, @NotNull String name, @NotNull String desc) {
-                                return true;
-                            }
-
-                            @Override
-                            public boolean shouldWriteInnerClass(@NotNull String name) {
-                                return true;
-                            }
-                        }
+                        BytecodeListingTextCollectingVisitor.Filter.ForCodegenTests.INSTANCE
                 );
 
         assertEqualsToFile(expectedFile, text);
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
index 701cb204048..efd37f75dec 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.codegen
 
-import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
 import org.jetbrains.kotlin.utils.sure
@@ -22,12 +21,7 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() {
             classFileFactory,
             withSignatures = isWithSignatures(wholeFile),
             withAnnotations = isWithAnnotations(wholeFile),
-            filter = object : BytecodeListingTextCollectingVisitor.Filter {
-                override fun shouldWriteClass(access: Int, name: String): Boolean = !name.startsWith("helpers/")
-                override fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean = true
-                override fun shouldWriteField(access: Int, name: String, desc: String): Boolean = true
-                override fun shouldWriteInnerClass(name: String): Boolean = true
-            }
+            filter = BytecodeListingTextCollectingVisitor.Filter.ForCodegenTests
         )
 
         val prefixes = when {
@@ -119,13 +113,20 @@ class BytecodeListingTextCollectingVisitor(
         fun shouldWriteClass(access: Int, name: String): Boolean
         fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean
         fun shouldWriteField(access: Int, name: String, desc: String): Boolean
-        fun shouldWriteInnerClass(name: String): Boolean
+        fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?): Boolean
 
         object EMPTY : Filter {
             override fun shouldWriteClass(access: Int, name: String) = true
             override fun shouldWriteMethod(access: Int, name: String, desc: String) = true
             override fun shouldWriteField(access: Int, name: String, desc: String) = true
-            override fun shouldWriteInnerClass(name: String) = true
+            override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?) = true
+        }
+
+        object ForCodegenTests : Filter {
+            override fun shouldWriteClass(access: Int, name: String): Boolean = !name.startsWith("helpers/")
+            override fun shouldWriteMethod(access: Int, name: String, desc: String): Boolean = true
+            override fun shouldWriteField(access: Int, name: String, desc: String): Boolean = true
+            override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?): Boolean = true
         }
     }
 
@@ -320,7 +321,7 @@ class BytecodeListingTextCollectingVisitor(
     }
 
     override fun visitInnerClass(name: String, outerName: String?, innerName: String?, access: Int) {
-        if (!filter.shouldWriteInnerClass(name)) {
+        if (!filter.shouldWriteInnerClass(name, outerName, innerName)) {
             return
         }
 
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt
index 7d61b2af0a5..682f56112a9 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.codegen
 
+import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.TestJdkKind
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import java.io.File
@@ -14,3 +15,8 @@ abstract class AbstractJdk9BlackBoxCodegenTest : AbstractCustomJDKBlackBoxCodege
     override fun getJdkHome(): File = KtTestUtil.getJdk9Home()
     override fun getPrefix(): String = "java9/box"
 }
+
+abstract class AbstractJdk9IrBlackBoxCodegenTest : AbstractJdk9BlackBoxCodegenTest() {
+    override val backend: TargetBackend
+        get() = TargetBackend.JVM_IR
+}
\ No newline at end of file
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
index 349e603f1d3..d2f583c2e14 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt
@@ -80,12 +80,12 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
                 return super.shouldWriteClass(access, name)
             }
 
-            override fun shouldWriteInnerClass(name: String): Boolean {
+            override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?): Boolean {
                 val classDescriptor = classInternalNames[name]
                 if (classDescriptor != null && shouldFilterClass(classDescriptor)) {
                     return false
                 }
-                return super.shouldWriteInnerClass(name)
+                return super.shouldWriteInnerClass(name, outerName, innerName)
             }
 
             private fun shouldFilterClass(descriptor: ClassDescriptor): Boolean {
@@ -117,6 +117,7 @@ abstract class AbstractLightAnalysisModeTest : CodegenTestCase() {
             else -> true
         }
 
-        override fun shouldWriteInnerClass(name: String) = true
+        override fun shouldWriteInnerClass(name: String, outerName: String?, innerName: String?) =
+            outerName != null && innerName != null
     }
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/ComposeLikeGenerationExtension.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/ComposeLikeGenerationExtension.kt
index b3140b4e942..9e424ed2334 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/ComposeLikeGenerationExtension.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/ComposeLikeGenerationExtension.kt
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
@@ -149,12 +148,11 @@ class ComposeLikeDefaultArgumentRewriter(
         declaration.valueParameters.forEach { param ->
             newParameters.add(
                 if (param.defaultValue != null) {
-                    val descriptor = WrappedValueParameterDescriptor()
                     val result = IrValueParameterImpl(
                         param.startOffset,
                         param.endOffset,
                         param.origin,
-                        IrValueParameterSymbolImpl(descriptor),
+                        IrValueParameterSymbolImpl(),
                         param.name,
                         index = param.index,
                         type = defaultParameterType(param),
@@ -167,7 +165,6 @@ class ComposeLikeDefaultArgumentRewriter(
                         it.defaultValue = param.defaultValue
                         it.parent = declaration
                     }
-                    descriptor.bind(result)
                     parameterMapping[param] = result
                     result
                 } else param
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractExtendedFirDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractExtendedFirDiagnosticsTest.kt
deleted file mode 100644
index 342e2c07234..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractExtendedFirDiagnosticsTest.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 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
-
-import org.jetbrains.kotlin.fir.checkers.registerExtendedCommonCheckers
-import org.jetbrains.kotlin.fir.session.FirSessionFactory
-
-abstract class AbstractExtendedFirDiagnosticsTest : AbstractFirDiagnosticsTest() {
-    override fun FirSessionFactory.FirSessionConfigurator.configureSession() {
-        registerExtendedCommonCheckers()
-    }
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractExtendedFirWithLightTreeDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractExtendedFirWithLightTreeDiagnosticsTest.kt
deleted file mode 100644
index 1c470f159b8..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractExtendedFirWithLightTreeDiagnosticsTest.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 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
-
-import org.jetbrains.kotlin.fir.checkers.registerExtendedCommonCheckers
-import org.jetbrains.kotlin.fir.session.FirSessionFactory
-
-abstract class AbstractExtendedFirWithLightTreeDiagnosticsTest : AbstractFirDiagnosticsWithLightTreeTest() {
-    override fun FirSessionFactory.FirSessionConfigurator.configureSession() {
-        registerExtendedCommonCheckers()
-    }
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
deleted file mode 100644
index ca2cbf49a4c..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2010-2019 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
-
-import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
-import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic
-import org.jetbrains.kotlin.fir.analysis.diagnostics.FirLightDiagnostic
-import org.jetbrains.kotlin.fir.declarations.FirFile
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.util.KtTestUtil
-import java.io.File
-import kotlin.math.abs
-
-abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsTest() {
-    override fun doTest(filePath: String) {
-        val file = createTestFileFromPath(filePath)
-        val expectedText = KtTestUtil.doLoadFile(file)
-        if (InTextDirectivesUtils.isDirectiveDefined(expectedText, "// IGNORE_LIGHT_TREE")) return
-
-        super.doTest(filePath)
-    }
-
-    override val useLightTree: Boolean
-        get() = true
-
-    override fun checkDiagnostics(file: File, testFiles: List<TestFile>, firFiles: List<FirFile>) {
-        val fileToDiagnostics = collectDiagnostics(firFiles)
-        val missingDiagnostics = mutableListOf<MissingDiagnostic>()
-        for (testFile in testFiles) {
-            val firFile = firFiles.firstOrNull { it.name == testFile.name } ?: continue
-            val ktFile = testFile.ktFile!!
-            val basicDiagnostics = fileToDiagnostics[firFile] ?: emptyList()
-            val debugInfoDiagnostics: List<FirDiagnostic<*>> =
-                collectDebugInfoDiagnostics(firFile, testFile.diagnosedRangesToDiagnosticNames)
-
-            val diagnostics = basicDiagnostics + debugInfoDiagnostics
-
-            val actualDiagnostics = diagnostics.groupBy {
-                require(it is FirLightDiagnostic)
-                it.element.startOffset
-            }.mapValues { (_, diagnostics) -> diagnostics.map { it.factory.name }.countEntries() }
-
-            val existingDiagnostics = testFile.diagnosedRanges.groupBy {
-                it.start
-            }.mapValues { (_, ranges) ->
-                ranges.flatMap { diagnosedRange ->
-                    diagnosedRange.getDiagnostics().filterNot { it.name.contains("DEBUG_INFO_") }.map { it.name }
-                }.countEntries()
-            }
-
-            for (startOffset in actualDiagnostics.keys + existingDiagnostics.keys) {
-                val expected = existingDiagnostics[startOffset] ?: emptyMap()
-                val actual = actualDiagnostics[startOffset] ?: emptyMap()
-                for (name in expected.keys + actual.keys) {
-                    if (name == null || name == "SYNTAX") continue
-                    val expectedCount = expected[name] ?: 0
-                    val actualCount = actual[name] ?: 0
-                    if (expectedCount != actualCount) {
-                        missingDiagnostics += MissingDiagnostic(startOffset, name, expectedCount - actualCount, ktFile)
-                    }
-                }
-            }
-
-            if (missingDiagnostics.isNotEmpty()) {
-                val wasExpected = missingDiagnostics.filter { it.kind == MissingDiagnostic.Kind.WasExpected }
-                val isActual = missingDiagnostics.filter { it.kind == MissingDiagnostic.Kind.IsActual }
-
-                if (wasExpected.sumBy { it.count } == isActual.sumBy { it.count }) return
-
-                val message = buildString {
-                    fun MissingDiagnostic.errorMessage(): String {
-                        val position = DiagnosticUtils.getLineAndColumnInPsiFile(ktFile, TextRange(startOffset, startOffset + 1))
-                        // I don't know why but somehow line is greater for 3 than line in real file
-                        return "  $count of $name at ${position.line - 3}:${position.column}"
-                    }
-
-                    if (wasExpected.isNotEmpty()) {
-                        appendLine("Some diagnostics was expected:")
-                        wasExpected.forEach {
-                            appendLine(it.errorMessage())
-                        }
-                    }
-                    if (isActual.isNotEmpty()) {
-                        appendLine("Some new diagnostics:")
-                        isActual.forEach {
-                            appendLine(it.errorMessage())
-                        }
-                    }
-
-                }
-                kotlin.test.fail(message)
-            }
-        }
-
-    }
-
-    private fun <T> List<T>.countEntries(): Map<T, Int> {
-        return groupBy { it }.mapValues { (_, value) -> value.size }
-    }
-
-    private class MissingDiagnostic(val startOffset: Int, val name: String, diff: Int, @Suppress("UNUSED_PARAMETER") ktFile: KtFile) {
-        val kind: Kind = if (diff > 0) Kind.WasExpected else Kind.IsActual
-        val count: Int = abs(diff)
-
-        enum class Kind {
-            WasExpected,
-            IsActual
-        }
-    }
-}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt
deleted file mode 100644
index ad7f2d8e4d8..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTestWithStdlib.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2019 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
-
-import org.jetbrains.kotlin.test.ConfigurationKind
-
-abstract class AbstractFirOldFrontendDiagnosticsTestWithStdlib : AbstractFirOldFrontendDiagnosticsTest() {
-    override fun extractConfigurationKind(files: List<TestFile>): ConfigurationKind {
-        return ConfigurationKind.NO_KOTLIN_REFLECT
-    }
-}
\ No newline at end of file
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
index f163f172535..f6a5f77c98d 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt
@@ -119,15 +119,17 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() {
             TestCase.assertEquals("IR dump mismatch after deep copy with symbols", actualTrees, copiedTrees)
             verify(irFileCopy)
 
-            val kotlinLikeDump = irFile.dumpKotlinLike(
-                KotlinLikeDumpOptions(
-                    printFileName = false,
-                    printFilePath = false,
-                    printFakeOverridesStrategy = FakeOverridesStrategy.NONE
+            if (!testFile.directives.contains("SKIP_KT_DUMP")) {
+                val kotlinLikeDump = irFile.dumpKotlinLike(
+                    KotlinLikeDumpOptions(
+                        printFileName = false,
+                        printFilePath = false,
+                        printFakeOverridesStrategy = FakeOverridesStrategy.NONE
+                    )
                 )
-            )
-            val kotlinLikeDumpExpectedFile = irTreeFileLabel.expectedTextFile.withReplacedExtensionOrNull(".txt", ".kt.txt")!!
-            KotlinTestUtils.assertEqualsToFile(kotlinLikeDumpExpectedFile, kotlinLikeDump)
+                val kotlinLikeDumpExpectedFile = irTreeFileLabel.expectedTextFile.withReplacedExtensionOrNull(".txt", ".kt.txt")!!
+                KotlinTestUtils.assertEqualsToFile(kotlinLikeDumpExpectedFile, kotlinLikeDump)
+            }
         }
 
         try {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java
index f387835d13f..62b3f6b1dcb 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java
@@ -53,7 +53,7 @@ import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static org.jetbrains.kotlin.checkers.AbstractForeignAnnotationsTestKt.FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH;
+import static org.jetbrains.kotlin.checkers.ThirdPartyAnnotationPathsKt.FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH;
 
 public class LoadDescriptorUtil {
     @NotNull
@@ -115,7 +115,7 @@ public class LoadDescriptorUtil {
         List<File> javaBinaryRoots = new ArrayList<>();
         // TODO: use the same additional binary roots as those were used for compilation
         if (withForeignAnnotations) {
-            javaBinaryRoots.add(MockLibraryUtil.compileJavaFilesLibraryToJar(FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH, "foreign-annotations"));
+            javaBinaryRoots.add(MockLibraryUtilExt.compileJavaFilesLibraryToJar(FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH, "foreign-annotations"));
         }
         javaBinaryRoots.add(KtTestUtil.getAnnotationsJar());
         javaBinaryRoots.add(ForTestCompileRuntime.jvmAnnotationsForTests());
@@ -164,7 +164,7 @@ public class LoadDescriptorUtil {
 
         classpath.add(ForTestCompileRuntime.runtimeJarForTests());
         if (useJetbrainsAnnotationsWithTypeUse) {
-            classpath.add(MockLibraryUtil.compileJavaFilesLibraryToJar(FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH, "foreign-annotations"));
+            classpath.add(MockLibraryUtilExt.compileJavaFilesLibraryToJar(FOREIGN_JDK8_ANNOTATIONS_SOURCES_PATH, "foreign-annotations"));
         }
         classpath.add(KtTestUtil.getAnnotationsJar());
 
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java
index 257b5cebd96..c5507e91362 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java
@@ -33,8 +33,6 @@ import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
 import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults;
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory;
-import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory;
-import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactoryImpl;
 import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.kotlin.resolve.scopes.ImportingScope;
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
index 8863c64da1b..aa821066581 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -50,18 +50,16 @@ import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtPsiFactoryKt;
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
+import org.jetbrains.kotlin.test.util.JUnit4Assertions;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.util.StringUtilsKt;
 import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 import org.junit.Assert;
 
-import javax.tools.*;
 import java.io.File;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.nio.charset.Charset;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -464,70 +462,15 @@ public class KotlinTestUtils {
     }
 
     private static boolean compileJavaFiles(@NotNull Collection<File> files, List<String> options, @Nullable File javaErrorFile) throws IOException {
-        JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
-        DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<>();
-        try (StandardJavaFileManager fileManager =
-                     javaCompiler.getStandardFileManager(diagnosticCollector, Locale.ENGLISH, Charset.forName("utf-8"))) {
-            Iterable<? extends JavaFileObject> javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(files);
-
-            JavaCompiler.CompilationTask task = javaCompiler.getTask(
-                    new StringWriter(), // do not write to System.err
-                    fileManager,
-                    diagnosticCollector,
-                    options,
-                    null,
-                    javaFileObjectsFromFiles);
-
-            Boolean success = task.call(); // do NOT inline this variable, call() should complete before errorsToString()
-            if (javaErrorFile == null || !javaErrorFile.exists()) {
-                Assert.assertTrue(errorsToString(diagnosticCollector, true), success);
-            }
-            else {
-                assertEqualsToFile(javaErrorFile, errorsToString(diagnosticCollector, false));
-            }
-            return success;
-        }
+        return JvmCompilationUtils.compileJavaFiles(files, options, javaErrorFile, JUnit4Assertions.INSTANCE);
     }
 
     public static boolean compileJavaFilesExternallyWithJava9(@NotNull Collection<File> files, @NotNull List<String> options) {
-        return compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home());
+        return JvmCompilationUtils.compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home());
     }
 
     public static boolean compileJavaFilesExternally(@NotNull Collection<File> files, @NotNull List<String> options, @NotNull File jdkHome) {
-        List<String> command = new ArrayList<>();
-        command.add(new File(jdkHome, "bin/javac").getPath());
-        command.addAll(options);
-        for (File file : files) {
-            command.add(file.getPath());
-        }
-
-        try {
-            Process process = new ProcessBuilder().command(command).inheritIO().start();
-            process.waitFor();
-            return process.exitValue() == 0;
-        }
-        catch (Exception e) {
-            throw ExceptionUtilsKt.rethrow(e);
-        }
-    }
-
-    @NotNull
-    private static String errorsToString(@NotNull DiagnosticCollector<JavaFileObject> diagnosticCollector, boolean humanReadable) {
-        StringBuilder builder = new StringBuilder();
-        for (javax.tools.Diagnostic<? extends JavaFileObject> diagnostic : diagnosticCollector.getDiagnostics()) {
-            if (diagnostic.getKind() != javax.tools.Diagnostic.Kind.ERROR) continue;
-
-            if (humanReadable) {
-                builder.append(diagnostic).append("\n");
-            }
-            else {
-                builder.append(new File(diagnostic.getSource().toUri()).getName()).append(":")
-                        .append(diagnostic.getLineNumber()).append(":")
-                        .append(diagnostic.getColumnNumber()).append(":")
-                        .append(diagnostic.getCode()).append("\n");
-            }
-        }
-        return builder.toString();
+        return JvmCompilationUtils.compileJavaFilesExternally(files, options, jdkHome);
     }
 
     public static String navigationMetadata(@TestDataFile String testFile) {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt
new file mode 100644
index 00000000000..9c7a18975a7
--- /dev/null
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtilExt.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2020 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.test
+
+import org.jetbrains.kotlin.test.util.JUnit4Assertions
+import java.io.File
+
+object MockLibraryUtilExt {
+    @JvmStatic
+    @JvmOverloads
+    fun compileJavaFilesLibraryToJar(
+        sourcesPath: String,
+        jarName: String,
+        addSources: Boolean = false,
+        extraOptions: List<String> = emptyList(),
+        extraClasspath: List<String> = emptyList(),
+    ): File {
+        return MockLibraryUtil.compileJavaFilesLibraryToJar(sourcesPath, jarName, addSources, extraOptions, extraClasspath, JUnit4Assertions)
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun compileJvmLibraryToJar(
+        sourcesPath: String,
+        jarName: String,
+        addSources: Boolean = false,
+        allowKotlinSources: Boolean = true,
+        extraOptions: List<String> = emptyList(),
+        extraClasspath: List<String> = emptyList(),
+        useJava9: Boolean = false,
+    ): File {
+        return MockLibraryUtil.compileJvmLibraryToJar(
+            sourcesPath,
+            jarName,
+            addSources,
+            allowKotlinSources,
+            extraOptions,
+            extraClasspath,
+            useJava9,
+            JUnit4Assertions
+        )
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun compileLibraryToJar(
+        sourcesPath: String,
+        contentDir: File,
+        jarName: String,
+        addSources: Boolean = false,
+        allowKotlinSources: Boolean = true,
+        extraOptions: List<String> = emptyList(),
+        extraClasspath: List<String> = emptyList(),
+        useJava9: Boolean = false
+    ): File {
+        return MockLibraryUtil.compileLibraryToJar(
+            sourcesPath,
+            contentDir,
+            jarName,
+            addSources,
+            allowKotlinSources,
+            extraOptions,
+            extraClasspath,
+            useJava9,
+            JUnit4Assertions
+        )
+    }
+
+}
diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts
index c9752ac4938..ce290e101bf 100644
--- a/compiler/tests-compiler-utils/build.gradle.kts
+++ b/compiler/tests-compiler-utils/build.gradle.kts
@@ -22,7 +22,9 @@ dependencies {
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:cli-js"))
     testCompile(project(":compiler:serialization"))
+    testCompile(project(":compiler:fir:entrypoint"))
     testCompile(projectTests(":compiler:test-infrastructure-utils"))
+    testCompile(project(":kotlin-preloader"))
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     testCompile(intellijDep()) {
diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/TestsError.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/TestsError.kt
new file mode 100644
index 00000000000..aab3e369c4f
--- /dev/null
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/TestsError.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2020 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
+
+import java.io.PrintStream
+import java.io.PrintWriter
+
+enum class TestsExceptionType(val postfix: String) {
+    COMPILER_ERROR("compiler"),
+    COMPILETIME_ERROR("compiletime"),
+    RUNTIME_ERROR("runtime"),
+    INFRASTRUCTURE_ERROR("infrastructure");
+
+    companion object {
+        private val map = values().associateBy(TestsExceptionType::postfix)
+
+        fun fromValue(type: String) = map[type]
+    }
+}
+
+sealed class TestsError(val original: Throwable, val type: TestsExceptionType) : Error() {
+    override fun toString(): String = original.toString()
+    override fun getStackTrace(): Array<out StackTraceElement> = original.stackTrace
+    override fun initCause(cause: Throwable?): Throwable = original.initCause(cause)
+    override val cause: Throwable? get() = original.cause
+
+    // This function is called in the constructor of Throwable, where original is not yet initialized
+    override fun fillInStackTrace(): Throwable? = @Suppress("UNNECESSARY_SAFE_CALL") original?.fillInStackTrace()
+
+    override fun setStackTrace(stackTrace: Array<out StackTraceElement>?) {
+        original.stackTrace = stackTrace
+    }
+
+    override fun printStackTrace() = original.printStackTrace()
+    override fun printStackTrace(s: PrintStream?) = original.printStackTrace(s)
+    override fun printStackTrace(s: PrintWriter?) = original.printStackTrace(s)
+}
+
+class TestsCompilerError(original: Throwable) : TestsError(original, TestsExceptionType.COMPILER_ERROR)
+class TestsInfrastructureError(original: Throwable) : TestsError(original, TestsExceptionType.INFRASTRUCTURE_ERROR)
+class TestsCompiletimeError(original: Throwable) : TestsError(original, TestsExceptionType.COMPILETIME_ERROR)
+class TestsRuntimeError(original: Throwable) : TestsError(original, TestsExceptionType.RUNTIME_ERROR)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
similarity index 100%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
similarity index 84%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
index 6b563937420..ee8c65e5d22 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 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.codegen;
@@ -24,7 +13,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.Assertions;
+import org.jetbrains.kotlin.test.JvmCompilationUtils;
+import org.jetbrains.kotlin.test.KtAssert;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 import org.jetbrains.kotlin.utils.StringsKt;
@@ -37,8 +28,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
-
 public class CodegenTestUtil {
     private CodegenTestUtil() {
     }
@@ -58,7 +47,7 @@ public class CodegenTestUtil {
         catch (InvocationTargetException ex) {
             caught = exceptionClass.isInstance(ex.getTargetException());
         }
-        assertTrue(caught);
+        KtAssert.assertTrue(String.format("Exception of class %s must be thrown", exceptionClass.getName()), caught);
     }
 
     @NotNull
@@ -83,11 +72,12 @@ public class CodegenTestUtil {
     public static File compileJava(
             @NotNull List<String> fileNames,
             @NotNull List<String> additionalClasspath,
-            @NotNull List<String> additionalOptions
+            @NotNull List<String> additionalOptions,
+            @NotNull Assertions assertions
     ) {
         try {
             File directory = KtTestUtil.tmpDir("java-classes");
-            compileJava(fileNames, additionalClasspath, additionalOptions, directory);
+            compileJava(fileNames, additionalClasspath, additionalOptions, directory, assertions);
             return directory;
         }
         catch (IOException e) {
@@ -99,11 +89,12 @@ public class CodegenTestUtil {
             @NotNull List<String> fileNames,
             @NotNull List<String> additionalClasspath,
             @NotNull List<String> additionalOptions,
-            @NotNull File outDirectory
+            @NotNull File outDirectory,
+            @NotNull Assertions assertions
     ) {
         try {
             List<String> options = prepareJavacOptions(additionalClasspath, additionalOptions, outDirectory);
-            KotlinTestUtils.compileJavaFiles(CollectionsKt.map(fileNames, File::new), options);
+            JvmCompilationUtils.compileJavaFiles(CollectionsKt.map(fileNames, File::new), options, assertions);
         }
         catch (IOException e) {
             throw ExceptionUtilsKt.rethrow(e);
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
similarity index 90%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
index 540eb80eb97..23e10301bca 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/GenerationUtils.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 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.codegen
@@ -42,7 +31,7 @@ import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.fir.analysis.FirAnalyzerFacade
 import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver
-import org.jetbrains.kotlin.fir.backend.jvm.FirMetadataSerializer
+import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension
 import org.jetbrains.kotlin.fir.createSession
 import org.jetbrains.kotlin.ir.backend.jvm.jvmResolveLibraries
 import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
@@ -142,10 +131,8 @@ object GenerationUtils {
 
         generationState.beforeCompile()
         codegenFactory.generateModuleInFrontendIRMode(
-            generationState, moduleFragment, symbolTable, sourceManager, extensions
-        ) { context, irClass, _, serializationBindings, parent ->
-            FirMetadataSerializer(session, context, irClass, serializationBindings, components, parent)
-        }
+            generationState, moduleFragment, symbolTable, sourceManager, extensions, FirJvmBackendExtension(session, components),
+        )
 
         generationState.factory.done()
         return generationState
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt
similarity index 100%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestModuleInfo.kt
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
similarity index 100%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/SessionTestUtils.kt
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt
similarity index 87%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt
index 204c8451c9a..b49b6d945e9 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 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.resolve.lazy
diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt
new file mode 100644
index 00000000000..ec832e7e1e1
--- /dev/null
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/JvmCompilationUtils.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010-2020 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.
+ */
+
+@file:JvmName("JvmCompilationUtils")
+
+package org.jetbrains.kotlin.test
+
+import org.jetbrains.kotlin.test.util.KtTestUtil
+import org.jetbrains.kotlin.utils.rethrow
+import java.io.File
+import java.io.IOException
+import java.io.StringWriter
+import java.nio.charset.Charset
+import java.util.*
+import javax.tools.Diagnostic
+import javax.tools.DiagnosticCollector
+import javax.tools.JavaFileObject
+import javax.tools.ToolProvider
+
+@JvmOverloads
+@Throws(IOException::class)
+fun compileJavaFiles(files: Collection<File>, options: List<String?>?, javaErrorFile: File? = null, assertions: Assertions): Boolean {
+    val javaCompiler = ToolProvider.getSystemJavaCompiler()
+    val diagnosticCollector = DiagnosticCollector<JavaFileObject>()
+    javaCompiler.getStandardFileManager(diagnosticCollector, Locale.ENGLISH, Charset.forName("utf-8")).use { fileManager ->
+        val javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(files)
+        val task = javaCompiler.getTask(
+            StringWriter(),  // do not write to System.err
+            fileManager,
+            diagnosticCollector,
+            options,
+            null,
+            javaFileObjectsFromFiles
+        )
+        val success = task.call() // do NOT inline this variable, call() should complete before errorsToString()
+        if (javaErrorFile == null || !javaErrorFile.exists()) {
+            assertions.assertTrue(success) { errorsToString(diagnosticCollector, true) }
+        } else {
+            assertions.assertEqualsToFile(javaErrorFile, errorsToString(diagnosticCollector, false))
+        }
+        return success
+    }
+}
+
+fun compileJavaFilesExternallyWithJava9(files: Collection<File>, options: List<String?>): Boolean {
+    return compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home())
+}
+
+fun compileJavaFilesExternally(files: Collection<File>, options: List<String?>, jdkHome: File): Boolean {
+    val command: MutableList<String?> = ArrayList()
+    command.add(File(jdkHome, "bin/javac").path)
+    command.addAll(options)
+    for (file in files) {
+        command.add(file.path)
+    }
+    return try {
+        val process = ProcessBuilder().command(command).inheritIO().start()
+        process.waitFor()
+        process.exitValue() == 0
+    } catch (e: Exception) {
+        throw rethrow(e)
+    }
+}
+
+private fun errorsToString(diagnosticCollector: DiagnosticCollector<JavaFileObject>, humanReadable: Boolean): String {
+    val builder = StringBuilder()
+    for (diagnostic in diagnosticCollector.diagnostics) {
+        if (diagnostic.kind != Diagnostic.Kind.ERROR) continue
+        if (humanReadable) {
+            builder.append(diagnostic).append("\n")
+        } else {
+            builder.append(File(diagnostic.source.toUri()).name).append(":")
+                .append(diagnostic.lineNumber).append(":")
+                .append(diagnostic.columnNumber).append(":")
+                .append(diagnostic.code).append("\n")
+        }
+    }
+    return builder.toString()
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
similarity index 66%
rename from compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
rename to compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
index b08bdb94603..0e7df93f0d0 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
+++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2010-2020 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.test
@@ -27,8 +16,6 @@ import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
 import org.jetbrains.kotlin.preloading.Preloader
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.PathUtil
-import org.junit.Assert
-import org.junit.Assert.assertEquals
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -42,54 +29,64 @@ object MockLibraryUtil {
     private var compilerClassLoader = SoftReference<ClassLoader>(null)
 
     @JvmStatic
-    @JvmOverloads
     fun compileJvmLibraryToJar(
-            sourcesPath: String,
-            jarName: String,
-            addSources: Boolean = false,
-            allowKotlinSources: Boolean = true,
-            extraOptions: List<String> = emptyList(),
-            extraClasspath: List<String> = emptyList(),
-            useJava9: Boolean = false
+        sourcesPath: String,
+        jarName: String,
+        addSources: Boolean = false,
+        allowKotlinSources: Boolean = true,
+        extraOptions: List<String> = emptyList(),
+        extraClasspath: List<String> = emptyList(),
+        useJava9: Boolean = false,
+        assertions: Assertions
     ): File {
         return compileLibraryToJar(
-            sourcesPath, KtTestUtil.tmpDirForReusableFolder("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath
-            , useJava9)}
-
-    @JvmStatic
-    @JvmOverloads
-    fun compileJavaFilesLibraryToJar(
-            sourcesPath: String,
-            jarName: String,
-            addSources: Boolean = false,
-            extraOptions: List<String> = emptyList(),
-            extraClasspath: List<String> = emptyList()
-    ): File {
-        return compileJvmLibraryToJar(
-                sourcesPath, jarName, addSources,
-                allowKotlinSources = false,
-                extraClasspath = extraClasspath, extraOptions = extraOptions
+            sourcesPath,
+            KtTestUtil.tmpDirForReusableFolder("testLibrary-$jarName"),
+            jarName,
+            addSources,
+            allowKotlinSources,
+            extraOptions,
+            extraClasspath,
+            useJava9,
+            assertions
+        )
+    }
+
+    @JvmStatic
+    fun compileJavaFilesLibraryToJar(
+        sourcesPath: String,
+        jarName: String,
+        addSources: Boolean = false,
+        extraOptions: List<String> = emptyList(),
+        extraClasspath: List<String> = emptyList(),
+        assertions: Assertions
+    ): File {
+        return compileJvmLibraryToJar(
+            sourcesPath, jarName, addSources,
+            allowKotlinSources = false,
+            extraClasspath = extraClasspath, extraOptions = extraOptions,
+            assertions = assertions
         )
     }
 
     @JvmStatic
-    @JvmOverloads
     fun compileLibraryToJar(
-            sourcesPath: String,
-            contentDir: File,
-            jarName: String,
-            addSources: Boolean = false,
-            allowKotlinSources: Boolean = true,
-            extraOptions: List<String> = emptyList(),
-            extraClasspath: List<String> = emptyList(),
-            useJava9: Boolean = false
+        sourcesPath: String,
+        contentDir: File,
+        jarName: String,
+        addSources: Boolean = false,
+        allowKotlinSources: Boolean = true,
+        extraOptions: List<String> = emptyList(),
+        extraClasspath: List<String> = emptyList(),
+        useJava9: Boolean = false,
+        assertions: Assertions
     ): File {
         val classesDir = File(contentDir, "classes")
 
         val srcFile = File(sourcesPath)
         val kotlinFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.kt"), srcFile)
         if (srcFile.isFile || kotlinFiles.isNotEmpty()) {
-            Assert.assertTrue("Only java files are expected", allowKotlinSources)
+            KtAssert.assertTrue("Only java files are expected", allowKotlinSources)
             compileKotlin(sourcesPath, classesDir, extraOptions, *extraClasspath.toTypedArray())
         }
 
@@ -103,19 +100,18 @@ object MockLibraryUtil {
             // Probably no kotlin files were present, so dir might not have been created after kotlin compiler
             if (classesDir.exists()) {
                 classpath += classesDir.path
-            }
-            else {
+            } else {
                 FileUtil.createDirectory(classesDir)
             }
 
             val options = listOf(
-                    "-classpath", classpath.joinToString(File.pathSeparator),
-                    "-d", classesDir.path
+                "-classpath", classpath.joinToString(File.pathSeparator),
+                "-d", classesDir.path
             )
 
             val compile =
-                    if (useJava9) KotlinTestUtils::compileJavaFilesExternallyWithJava9
-                    else KotlinTestUtils::compileJavaFiles
+                if (useJava9) ::compileJavaFilesExternallyWithJava9
+                else { files, opts -> compileJavaFiles(files, opts, assertions = assertions) }
 
             val success = compile(javaFiles, options)
             if (!success) {
@@ -128,17 +124,18 @@ object MockLibraryUtil {
 
     @JvmStatic
     fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List<String> = emptyList()): File {
-        val contentDir = KtTestUtil.tmpDirForReusableFolder("testLibrary-" + jarName)
+        val contentDir = KtTestUtil.tmpDirForReusableFolder("testLibrary-$jarName")
 
         val outDir = File(contentDir, "out")
-        val outputFile = File(outDir, jarName + ".js")
+        val outputFile = File(outDir, "$jarName.js")
         compileKotlin2JS(sourcesPath, outputFile, extraOptions)
 
         return createJarFile(contentDir, outDir, jarName, sourcesPath.takeIf { addSources })
     }
 
+    @JvmStatic
     fun createJarFile(contentDir: File, dirToAdd: File, jarName: String, sourcesPath: String? = null): File {
-        val jarFile = File(contentDir, jarName + ".jar")
+        val jarFile = File(contentDir, "$jarName.jar")
 
         ZipOutputStream(FileOutputStream(jarFile)).use { zip ->
             ZipUtil.addDirToZipRecursively(zip, jarFile, dirToAdd, "", null, null)
@@ -164,16 +161,16 @@ object MockLibraryUtil {
         val compiler = compilerClass.newInstance()
         val execMethod = compilerClass.getMethod("exec", PrintStream::class.java, Array<String>::class.java)
         val invocationResult = execMethod.invoke(compiler, PrintStream(outStream), args.toTypedArray()) as Enum<*>
-        assertEquals(String(outStream.toByteArray()), ExitCode.OK.name, invocationResult.name)
+        KtAssert.assertEquals(String(outStream.toByteArray()), ExitCode.OK.name, invocationResult.name)
     }
 
     @JvmStatic
     @JvmOverloads
     fun compileKotlin(
-            sourcesPath: String,
-            outDir: File,
-            extraOptions: List<String> = emptyList(),
-            vararg extraClasspath: String
+        sourcesPath: String,
+        outDir: File,
+        extraOptions: List<String> = emptyList(),
+        vararg extraClasspath: String
     ) {
         val classpath = mutableListOf<String>()
         if (File(sourcesPath).isDirectory) {
@@ -182,9 +179,9 @@ object MockLibraryUtil {
         classpath += extraClasspath
 
         val args = mutableListOf(
-                sourcesPath,
-                "-d", outDir.absolutePath,
-                "-classpath", classpath.joinToString(File.pathSeparator)
+            sourcesPath,
+            "-d", outDir.absolutePath,
+            "-classpath", classpath.joinToString(File.pathSeparator)
         ) + extraOptions
 
         runJvmCompiler(args)
@@ -215,8 +212,8 @@ object MockLibraryUtil {
     @Synchronized
     private fun createCompilerClassLoader(): ClassLoader {
         return ClassPreloadingUtils.preloadClasses(
-                listOf(PathUtil.kotlinPathsForDistDirectory.compilerPath),
-                Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE, null, null
+            listOf(PathUtil.kotlinPathsForDistDirectory.compilerPath),
+            Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE, null, null
         )
     }
 }
diff --git a/compiler/tests-for-compiler-generator/build.gradle.kts b/compiler/tests-for-compiler-generator/build.gradle.kts
new file mode 100644
index 00000000000..7decb6567f0
--- /dev/null
+++ b/compiler/tests-for-compiler-generator/build.gradle.kts
@@ -0,0 +1,35 @@
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    testRuntimeOnly(intellijDep()) // Should come before compiler, because of "progarded" stuff needed for tests
+    testImplementation(kotlinStdlib())
+
+    testImplementation(platform("org.junit:junit-bom:5.7.0"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation(projectTests(":compiler:tests-common"))
+    testImplementation(projectTests(":compiler:tests-common-new"))
+    testImplementation(projectTests(":compiler:tests-common"))
+    testImplementation(projectTests(":compiler"))
+    testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
+    testImplementation(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
+    testImplementation(projectTests(":compiler:fir:fir2ir"))
+    testImplementation(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
+    testImplementation(projectTests(":compiler:visualizer"))
+    testImplementation(projectTests(":generators:test-generator"))
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testRuntimeOnly(project(":kotlin-reflect"))
+}
+
+sourceSets {
+    "main" {}
+    "test" { projectDefault() }
+}
+
+val generateTests by generator("org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt") {
+    dependsOn(":compiler:generateTestData")
+}
+
+testsJar()
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateCompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateCompilerTests.kt
new file mode 100644
index 00000000000..bebe8383f90
--- /dev/null
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateCompilerTests.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 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.test.generators
+
+fun main(args: Array<String>) {
+    System.setProperty("java.awt.headless", "true")
+
+    generateJUnit3CompilerTests(args)
+    generateJUnit5CompilerTests(args)
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
similarity index 93%
rename from compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
rename to compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
index 8bad7ab7bbe..3dc993713a4 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.generators.tests
+package org.jetbrains.kotlin.test.generators
 
 import org.jetbrains.kotlin.asJava.AbstractCompilerLightClassTest
 import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
 import org.jetbrains.kotlin.cfg.AbstractDataFlowTest
 import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest
 import org.jetbrains.kotlin.checkers.*
-import org.jetbrains.kotlin.checkers.javac.*
 import org.jetbrains.kotlin.cli.AbstractCliTest
 import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.debugInformation.AbstractIrLocalVariableTest
@@ -62,39 +61,17 @@ import org.jetbrains.kotlin.types.AbstractTypeBindingTest
 import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizer
 import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizer
 
-fun main(args: Array<String>) {
-    System.setProperty("java.awt.headless", "true")
-
+fun generateJUnit3CompilerTests(args: Array<String>) {
     generateTestGroupSuite(args) {
         testGroup("compiler/tests-gen", "compiler/testData") {
             testClass<AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation> {
                 model("diagnostics/testsWithJsStdLibAndBackendCompilation")
             }
 
-            testClass<AbstractDiagnosticsWithJdk15Test> {
-                model("diagnostics/testsWithJava15")
-            }
-
             testClass<AbstractMultiPlatformIntegrationTest> {
                 model("multiplatform", extension = null, recursive = true, excludeParentDirs = true)
             }
 
-            testClass<AbstractForeignAnnotationsTest> {
-                model("foreignAnnotations/tests")
-            }
-
-            testClass<AbstractForeignAnnotationsNoAnnotationInClasspathTest> {
-                model("foreignAnnotations/tests")
-            }
-
-            testClass<AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest> {
-                model("foreignAnnotations/tests")
-            }
-
-            testClass<AbstractJavacForeignAnnotationsTest> {
-                model("foreignAnnotations/tests")
-            }
-
             testClass<AbstractResolveTest> {
                 model("resolve", extension = "resolve")
             }
@@ -155,6 +132,10 @@ fun main(args: Array<String>) {
                 model("codegen/java9/box")
             }
 
+            testClass<AbstractJdk9IrBlackBoxCodegenTest> {
+                model("codegen/java9/box", targetBackend = TargetBackend.JVM_IR)
+            }
+
             testClass<AbstractScriptCodegenTest> {
                 model("codegen/script", extension = "kts")
             }
@@ -602,31 +583,31 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/legacy-fir-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractLazyBodyIsNotTouchedTilContractsPhaseTest> {
                 model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME)
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
+        testGroup("compiler/fir/analysis-tests/legacy-fir-tests/tests-gen", "compiler/testData") {
             testClass<AbstractFirLoadCompiledKotlin> {
                 model("loadJava/compiledKotlin", extension = "kt")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
+        testGroup("compiler/fir/analysis-tests/legacy-fir-tests/tests-gen", "compiler/testData") {
             testClass<AbstractFirTypeEnhancementTest> {
                 model("loadJava/compiledJava", extension = "java")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/legacy-fir-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractOwnFirTypeEnhancementTest> {
                 model("enhancement", extension = "java")
             }
         }
 
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
+        testGroup("compiler/fir/analysis-tests/legacy-fir-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractFirOldFrontendLightClassesTest> {
                 model("lightClasses")
             }
@@ -661,17 +642,5 @@ fun main(args: Array<String>) {
                 model("uncommonCases/testFiles", testMethod = "doUncommonCasesTest")
             }
         }
-
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
-            testClass<AbstractExtendedFirDiagnosticsTest> {
-                model("extendedCheckers", pattern = KT_WITHOUT_DOTS_IN_NAME)
-            }
-        }
-
-        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
-            testClass<AbstractExtendedFirWithLightTreeDiagnosticsTest> {
-                model("extendedCheckers", pattern = KT_WITHOUT_DOTS_IN_NAME)
-            }
-        }
     }
 }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
similarity index 54%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
rename to compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index 113823e1fe5..aa9bad515eb 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/generators/GenerateNewCompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -5,15 +5,15 @@
 
 package org.jetbrains.kotlin.test.generators
 
-import org.jetbrains.kotlin.generators.util.TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME
+import org.jetbrains.kotlin.generators.util.TestGeneratorUtil
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.runners.*
 
-fun main(args: Array<String>) {
+fun generateJUnit5CompilerTests(args: Array<String>) {
     val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$"
 
-    generateNewTestGroupSuite(args) {
-        testGroup("compiler/tests-common-new/tests-gen", "compiler/testData") {
+    generateTestGroupSuiteWithJUnit5(args) {
+        testGroup(testsRoot = "compiler/tests-common-new/tests-gen", testDataRoot = "compiler/testData") {
             testClass<AbstractDiagnosticTest> {
                 model("diagnostics/tests", pattern = "^(.*)\\.kts?$", excludedPattern = excludedFirTestdataPattern)
                 model("diagnostics/testsWithStdLib", excludedPattern = excludedFirTestdataPattern)
@@ -23,11 +23,6 @@ fun main(args: Array<String>) {
                 model("diagnostics/tests/javac", pattern = "^(.*)\\.kts?$", excludedPattern = excludedFirTestdataPattern)
             }
 
-            testClass<AbstractFirDiagnosticTest>(suiteTestClassName = "FirOldFrontendDiagnosticsTestGenerated") {
-                model("diagnostics/tests", excludedPattern = excludedFirTestdataPattern)
-                model("diagnostics/testsWithStdLib", excludedPattern = excludedFirTestdataPattern)
-            }
-
             testClass<AbstractDiagnosticsTestWithJsStdLib> {
                 model("diagnostics/testsWithJsStdLib")
             }
@@ -43,19 +38,42 @@ fun main(args: Array<String>) {
             testClass<AbstractDiagnosticsNativeTest> {
                 model("diagnostics/nativeTests")
             }
+
+            testClass<AbstractForeignAnnotationsTest> {
+                model("foreignAnnotations/tests")
+                model("foreignAnnotations/java8Tests", excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava"))
+            }
+
+            testClass<AbstractForeignAnnotationsNoAnnotationInClasspathTest> {
+                model("foreignAnnotations/tests")
+                model("foreignAnnotations/java8Tests", excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava"))
+            }
+
+            testClass<AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest> {
+                model("foreignAnnotations/tests")
+                model("foreignAnnotations/java8Tests", excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava"))
+            }
         }
 
-        testGroup("compiler/tests-common-new/tests-gen", "compiler/fir/analysis-tests/testData") {
+        // ---------------------------------------------- FIR tests ----------------------------------------------
+
+        testGroup(testsRoot = "compiler/fir/analysis-tests/tests-gen", testDataRoot = "compiler/testData") {
+            testClass<AbstractFirDiagnosticTest>(suiteTestClassName = "FirOldFrontendDiagnosticsTestGenerated") {
+                model("diagnostics/tests", excludedPattern = excludedFirTestdataPattern)
+                model("diagnostics/testsWithStdLib", excludedPattern = excludedFirTestdataPattern)
+            }
+        }
+
+        testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {
             testClass<AbstractFirDiagnosticTest> {
-                model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME)
-                model("resolveWithStdlib", pattern = KT_WITHOUT_DOTS_IN_NAME)
+                model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
+                model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
             }
 
             testClass<AbstractFirDiagnosticsWithLightTreeTest> {
-                model("resolve", pattern = KT_WITHOUT_DOTS_IN_NAME)
+                model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
             }
         }
     }
-}
 
-const val TEST_GENERATOR_NAME = "GenerateNewCompilerTests.kt"
+}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsWithJdk15TestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsWithJdk15TestGenerated.java
deleted file mode 100644
index 275adc5c870..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsWithJdk15TestGenerated.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/diagnostics/testsWithJava15")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class DiagnosticsWithJdk15TestGenerated extends AbstractDiagnosticsWithJdk15Test {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTestsWithJava15() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava15"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("compiler/testData/diagnostics/testsWithJava15/jvmRecord")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class JvmRecord extends AbstractDiagnosticsWithJdk15Test {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJvmRecord() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava15/jvmRecord"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("diagnostics.kt")
-        public void testDiagnostics() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/jvmRecord/diagnostics.kt");
-        }
-
-        @TestMetadata("disabledFeature.kt")
-        public void testDisabledFeature() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/jvmRecord/disabledFeature.kt");
-        }
-
-        @TestMetadata("irrelevantFields.kt")
-        public void testIrrelevantFields() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/jvmRecord/irrelevantFields.kt");
-        }
-
-        @TestMetadata("jvmRecordDescriptorStructure.kt")
-        public void testJvmRecordDescriptorStructure() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/jvmRecord/jvmRecordDescriptorStructure.kt");
-        }
-
-        @TestMetadata("simpleRecords.kt")
-        public void testSimpleRecords() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/jvmRecord/simpleRecords.kt");
-        }
-
-        @TestMetadata("supertypesCheck.kt")
-        public void testSupertypesCheck() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/jvmRecord/supertypesCheck.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/diagnostics/testsWithJava15/sealedClasses")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class SealedClasses extends AbstractDiagnosticsWithJdk15Test {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInSealedClasses() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava15/sealedClasses"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("javaSealedClassExhaustiveness.kt")
-        public void testJavaSealedClassExhaustiveness() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedClassExhaustiveness.kt");
-        }
-
-        @TestMetadata("javaSealedInterfaceExhaustiveness.kt")
-        public void testJavaSealedInterfaceExhaustiveness() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/sealedClasses/javaSealedInterfaceExhaustiveness.kt");
-        }
-
-        @TestMetadata("kotlinInheritsJavaClass.kt")
-        public void testKotlinInheritsJavaClass() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaClass.kt");
-        }
-
-        @TestMetadata("kotlinInheritsJavaInterface.kt")
-        public void testKotlinInheritsJavaInterface() throws Exception {
-            runTest("compiler/testData/diagnostics/testsWithJava15/sealedClasses/kotlinInheritsJavaInterface.kt");
-        }
-    }
-}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java
deleted file mode 100644
index 16dd45aa7ac..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathTestGenerated.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotations/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ForeignAnnotationsNoAnnotationInClasspathTestGenerated extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("androidRecently.kt")
-    public void testAndroidRecently() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
-    }
-
-    @TestMetadata("androidSdk.kt")
-    public void testAndroidSdk() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
-    }
-
-    @TestMetadata("android_support.kt")
-    public void testAndroid_support() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
-    }
-
-    @TestMetadata("androidx.kt")
-    public void testAndroidx() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
-    }
-
-    @TestMetadata("aosp.kt")
-    public void testAosp() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
-    }
-
-    @TestMetadata("findBugsSimple.kt")
-    public void testFindBugsSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
-    }
-
-    @TestMetadata("irrelevantQualifierNicknames.kt")
-    public void testIrrelevantQualifierNicknames() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
-    }
-
-    @TestMetadata("lombokSimple.kt")
-    public void testLombokSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
-    }
-
-    @TestMetadata("rxjava.kt")
-    public void testRxjava() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("nonNullNever.kt")
-        public void testNonNullNever() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
-        }
-
-        @TestMetadata("nullabilityNicknames.kt")
-        public void testNullabilityNicknames() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
-        }
-
-        @TestMetadata("strange.kt")
-        public void testStrange() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ignore extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIgnore() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInNullabilityWarnings() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("elvis.kt")
-            public void testElvis() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
-            }
-
-            @TestMetadata("localInference.kt")
-            public void testLocalInference() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
-            }
-
-            @TestMetadata("nullabilityGenerics.kt")
-            public void testNullabilityGenerics() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
-            }
-
-            @TestMetadata("nullabilityNicknames.kt")
-            public void testNullabilityNicknames() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
-            }
-
-            @TestMetadata("safeCalls.kt")
-            public void testSafeCalls() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
-            }
-
-            @TestMetadata("simple.kt")
-            public void testSimple() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
-            }
-
-            @TestMetadata("strange.kt")
-            public void testStrange() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class FromPlatformTypes extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInFromPlatformTypes() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("arithmetic.kt")
-                public void testArithmetic() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
-                }
-
-                @TestMetadata("array.kt")
-                public void testArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
-                }
-
-                @TestMetadata("assignToVar.kt")
-                public void testAssignToVar() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
-                }
-
-                @TestMetadata("conditions.kt")
-                public void testConditions() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
-                }
-
-                @TestMetadata("dataFlowInfo.kt")
-                public void testDataFlowInfo() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
-                }
-
-                @TestMetadata("defaultParameters.kt")
-                public void testDefaultParameters() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
-                }
-
-                @TestMetadata("delegatedProperties.kt")
-                public void testDelegatedProperties() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
-                }
-
-                @TestMetadata("delegation.kt")
-                public void testDelegation() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
-                }
-
-                @TestMetadata("derefenceExtension.kt")
-                public void testDerefenceExtension() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
-                }
-
-                @TestMetadata("derefenceMember.kt")
-                public void testDerefenceMember() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
-                }
-
-                @TestMetadata("expectedType.kt")
-                public void testExpectedType() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
-                }
-
-                @TestMetadata("for.kt")
-                public void testFor() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
-                }
-
-                @TestMetadata("functionArguments.kt")
-                public void testFunctionArguments() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
-                }
-
-                @TestMetadata("invoke.kt")
-                public void testInvoke() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
-                }
-
-                @TestMetadata("kt6829.kt")
-                public void testKt6829() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
-                }
-
-                @TestMetadata("multiDeclaration.kt")
-                public void testMultiDeclaration() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
-                }
-
-                @TestMetadata("passToJava.kt")
-                public void testPassToJava() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
-                }
-
-                @TestMetadata("primitiveArray.kt")
-                public void testPrimitiveArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
-                }
-
-                @TestMetadata("throw.kt")
-                public void testThrow() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
-                }
-
-                @TestMetadata("uselessElvisRightIsNull.kt")
-                public void testUselessElvisRightIsNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
-                }
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("equalsOnNonNull.kt")
-                public void testEqualsOnNonNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
-                }
-
-                @TestMetadata("fieldsAreNullable.kt")
-                public void testFieldsAreNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
-                }
-
-                @TestMetadata("nullabilityFromOverridden.kt")
-                public void testNullabilityFromOverridden() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
-                }
-
-                @TestMetadata("overridingDefaultQualifier.kt")
-                public void testOverridingDefaultQualifier() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefault.kt")
-                public void testParametersAreNonnullByDefault() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-                public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-                }
-
-                @TestMetadata("springNullable.kt")
-                public void testSpringNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
-                }
-
-                @TestMetadata("springNullablePackage.kt")
-                public void testSpringNullablePackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
-                }
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("fieldsAreNullable.kt")
-            public void testFieldsAreNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
-            }
-
-            @TestMetadata("forceFlexibility.kt")
-            public void testForceFlexibility() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
-            }
-
-            @TestMetadata("forceFlexibleOverOverrides.kt")
-            public void testForceFlexibleOverOverrides() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
-            }
-
-            @TestMetadata("nullabilityFromOverridden.kt")
-            public void testNullabilityFromOverridden() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
-            }
-
-            @TestMetadata("overridingDefaultQualifier.kt")
-            public void testOverridingDefaultQualifier() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-            public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-            }
-
-            @TestMetadata("springNullable.kt")
-            public void testSpringNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
-            }
-
-            @TestMetadata("springNullablePackage.kt")
-            public void testSpringNullablePackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Migration extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInMigration() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("customMigration.kt")
-            public void testCustomMigration() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
-            }
-
-            @TestMetadata("globalIgnore.kt")
-            public void testGlobalIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
-            }
-
-            @TestMetadata("globalWarningMigrationIgnore.kt")
-            public void testGlobalWarningMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationError.kt")
-            public void testMigrationError() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
-            }
-
-            @TestMetadata("migrationIgnore.kt")
-            public void testMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationWarning.kt")
-            public void testMigrationWarning() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
-            }
-
-            @TestMetadata("overrideConflicts.kt")
-            public void testOverrideConflicts() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
-            }
-
-            @TestMetadata("specialCollision.kt")
-            public void testSpecialCollision() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
-            }
-
-            @TestMetadata("stateRefinement.kt")
-            public void testStateRefinement() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
-        public void testDefaultAndNicknameMigrationPolicy() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
-        }
-    }
-}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
deleted file mode 100644
index d104f7a21e4..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotations/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("androidRecently.kt")
-    public void testAndroidRecently() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
-    }
-
-    @TestMetadata("androidSdk.kt")
-    public void testAndroidSdk() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
-    }
-
-    @TestMetadata("android_support.kt")
-    public void testAndroid_support() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
-    }
-
-    @TestMetadata("androidx.kt")
-    public void testAndroidx() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
-    }
-
-    @TestMetadata("aosp.kt")
-    public void testAosp() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
-    }
-
-    @TestMetadata("findBugsSimple.kt")
-    public void testFindBugsSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
-    }
-
-    @TestMetadata("irrelevantQualifierNicknames.kt")
-    public void testIrrelevantQualifierNicknames() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
-    }
-
-    @TestMetadata("lombokSimple.kt")
-    public void testLombokSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
-    }
-
-    @TestMetadata("rxjava.kt")
-    public void testRxjava() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("nonNullNever.kt")
-        public void testNonNullNever() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
-        }
-
-        @TestMetadata("nullabilityNicknames.kt")
-        public void testNullabilityNicknames() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
-        }
-
-        @TestMetadata("strange.kt")
-        public void testStrange() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ignore extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIgnore() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInNullabilityWarnings() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("elvis.kt")
-            public void testElvis() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
-            }
-
-            @TestMetadata("localInference.kt")
-            public void testLocalInference() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
-            }
-
-            @TestMetadata("nullabilityGenerics.kt")
-            public void testNullabilityGenerics() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
-            }
-
-            @TestMetadata("nullabilityNicknames.kt")
-            public void testNullabilityNicknames() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
-            }
-
-            @TestMetadata("safeCalls.kt")
-            public void testSafeCalls() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
-            }
-
-            @TestMetadata("simple.kt")
-            public void testSimple() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
-            }
-
-            @TestMetadata("strange.kt")
-            public void testStrange() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class FromPlatformTypes extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInFromPlatformTypes() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("arithmetic.kt")
-                public void testArithmetic() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
-                }
-
-                @TestMetadata("array.kt")
-                public void testArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
-                }
-
-                @TestMetadata("assignToVar.kt")
-                public void testAssignToVar() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
-                }
-
-                @TestMetadata("conditions.kt")
-                public void testConditions() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
-                }
-
-                @TestMetadata("dataFlowInfo.kt")
-                public void testDataFlowInfo() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
-                }
-
-                @TestMetadata("defaultParameters.kt")
-                public void testDefaultParameters() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
-                }
-
-                @TestMetadata("delegatedProperties.kt")
-                public void testDelegatedProperties() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
-                }
-
-                @TestMetadata("delegation.kt")
-                public void testDelegation() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
-                }
-
-                @TestMetadata("derefenceExtension.kt")
-                public void testDerefenceExtension() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
-                }
-
-                @TestMetadata("derefenceMember.kt")
-                public void testDerefenceMember() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
-                }
-
-                @TestMetadata("expectedType.kt")
-                public void testExpectedType() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
-                }
-
-                @TestMetadata("for.kt")
-                public void testFor() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
-                }
-
-                @TestMetadata("functionArguments.kt")
-                public void testFunctionArguments() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
-                }
-
-                @TestMetadata("invoke.kt")
-                public void testInvoke() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
-                }
-
-                @TestMetadata("kt6829.kt")
-                public void testKt6829() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
-                }
-
-                @TestMetadata("multiDeclaration.kt")
-                public void testMultiDeclaration() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
-                }
-
-                @TestMetadata("passToJava.kt")
-                public void testPassToJava() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
-                }
-
-                @TestMetadata("primitiveArray.kt")
-                public void testPrimitiveArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
-                }
-
-                @TestMetadata("throw.kt")
-                public void testThrow() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
-                }
-
-                @TestMetadata("uselessElvisRightIsNull.kt")
-                public void testUselessElvisRightIsNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
-                }
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("equalsOnNonNull.kt")
-                public void testEqualsOnNonNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
-                }
-
-                @TestMetadata("fieldsAreNullable.kt")
-                public void testFieldsAreNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
-                }
-
-                @TestMetadata("nullabilityFromOverridden.kt")
-                public void testNullabilityFromOverridden() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
-                }
-
-                @TestMetadata("overridingDefaultQualifier.kt")
-                public void testOverridingDefaultQualifier() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefault.kt")
-                public void testParametersAreNonnullByDefault() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-                public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-                }
-
-                @TestMetadata("springNullable.kt")
-                public void testSpringNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
-                }
-
-                @TestMetadata("springNullablePackage.kt")
-                public void testSpringNullablePackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
-                }
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("fieldsAreNullable.kt")
-            public void testFieldsAreNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
-            }
-
-            @TestMetadata("forceFlexibility.kt")
-            public void testForceFlexibility() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
-            }
-
-            @TestMetadata("forceFlexibleOverOverrides.kt")
-            public void testForceFlexibleOverOverrides() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
-            }
-
-            @TestMetadata("nullabilityFromOverridden.kt")
-            public void testNullabilityFromOverridden() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
-            }
-
-            @TestMetadata("overridingDefaultQualifier.kt")
-            public void testOverridingDefaultQualifier() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-            public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-            }
-
-            @TestMetadata("springNullable.kt")
-            public void testSpringNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
-            }
-
-            @TestMetadata("springNullablePackage.kt")
-            public void testSpringNullablePackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Migration extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInMigration() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("customMigration.kt")
-            public void testCustomMigration() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
-            }
-
-            @TestMetadata("globalIgnore.kt")
-            public void testGlobalIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
-            }
-
-            @TestMetadata("globalWarningMigrationIgnore.kt")
-            public void testGlobalWarningMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationError.kt")
-            public void testMigrationError() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
-            }
-
-            @TestMetadata("migrationIgnore.kt")
-            public void testMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationWarning.kt")
-            public void testMigrationWarning() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
-            }
-
-            @TestMetadata("overrideConflicts.kt")
-            public void testOverrideConflicts() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
-            }
-
-            @TestMetadata("specialCollision.kt")
-            public void testSpecialCollision() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
-            }
-
-            @TestMetadata("stateRefinement.kt")
-            public void testStateRefinement() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeQualifierDefault extends AbstractForeignAnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
-        public void testDefaultAndNicknameMigrationPolicy() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
-        }
-    }
-}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsTestGenerated.java
deleted file mode 100644
index ab7127e5112..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/ForeignAnnotationsTestGenerated.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotations/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ForeignAnnotationsTestGenerated extends AbstractForeignAnnotationsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("androidRecently.kt")
-    public void testAndroidRecently() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
-    }
-
-    @TestMetadata("androidSdk.kt")
-    public void testAndroidSdk() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
-    }
-
-    @TestMetadata("android_support.kt")
-    public void testAndroid_support() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
-    }
-
-    @TestMetadata("androidx.kt")
-    public void testAndroidx() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
-    }
-
-    @TestMetadata("aosp.kt")
-    public void testAosp() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
-    }
-
-    @TestMetadata("findBugsSimple.kt")
-    public void testFindBugsSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
-    }
-
-    @TestMetadata("irrelevantQualifierNicknames.kt")
-    public void testIrrelevantQualifierNicknames() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
-    }
-
-    @TestMetadata("lombokSimple.kt")
-    public void testLombokSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
-    }
-
-    @TestMetadata("rxjava.kt")
-    public void testRxjava() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractForeignAnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("nonNullNever.kt")
-        public void testNonNullNever() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
-        }
-
-        @TestMetadata("nullabilityNicknames.kt")
-        public void testNullabilityNicknames() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
-        }
-
-        @TestMetadata("strange.kt")
-        public void testStrange() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ignore extends AbstractForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIgnore() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NullabilityWarnings extends AbstractForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInNullabilityWarnings() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("elvis.kt")
-            public void testElvis() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
-            }
-
-            @TestMetadata("localInference.kt")
-            public void testLocalInference() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
-            }
-
-            @TestMetadata("nullabilityGenerics.kt")
-            public void testNullabilityGenerics() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
-            }
-
-            @TestMetadata("nullabilityNicknames.kt")
-            public void testNullabilityNicknames() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
-            }
-
-            @TestMetadata("safeCalls.kt")
-            public void testSafeCalls() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
-            }
-
-            @TestMetadata("simple.kt")
-            public void testSimple() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
-            }
-
-            @TestMetadata("strange.kt")
-            public void testStrange() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class FromPlatformTypes extends AbstractForeignAnnotationsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInFromPlatformTypes() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("arithmetic.kt")
-                public void testArithmetic() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
-                }
-
-                @TestMetadata("array.kt")
-                public void testArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
-                }
-
-                @TestMetadata("assignToVar.kt")
-                public void testAssignToVar() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
-                }
-
-                @TestMetadata("conditions.kt")
-                public void testConditions() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
-                }
-
-                @TestMetadata("dataFlowInfo.kt")
-                public void testDataFlowInfo() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
-                }
-
-                @TestMetadata("defaultParameters.kt")
-                public void testDefaultParameters() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
-                }
-
-                @TestMetadata("delegatedProperties.kt")
-                public void testDelegatedProperties() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
-                }
-
-                @TestMetadata("delegation.kt")
-                public void testDelegation() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
-                }
-
-                @TestMetadata("derefenceExtension.kt")
-                public void testDerefenceExtension() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
-                }
-
-                @TestMetadata("derefenceMember.kt")
-                public void testDerefenceMember() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
-                }
-
-                @TestMetadata("expectedType.kt")
-                public void testExpectedType() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
-                }
-
-                @TestMetadata("for.kt")
-                public void testFor() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
-                }
-
-                @TestMetadata("functionArguments.kt")
-                public void testFunctionArguments() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
-                }
-
-                @TestMetadata("invoke.kt")
-                public void testInvoke() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
-                }
-
-                @TestMetadata("kt6829.kt")
-                public void testKt6829() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
-                }
-
-                @TestMetadata("multiDeclaration.kt")
-                public void testMultiDeclaration() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
-                }
-
-                @TestMetadata("passToJava.kt")
-                public void testPassToJava() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
-                }
-
-                @TestMetadata("primitiveArray.kt")
-                public void testPrimitiveArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
-                }
-
-                @TestMetadata("throw.kt")
-                public void testThrow() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
-                }
-
-                @TestMetadata("uselessElvisRightIsNull.kt")
-                public void testUselessElvisRightIsNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
-                }
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class TypeQualifierDefault extends AbstractForeignAnnotationsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("equalsOnNonNull.kt")
-                public void testEqualsOnNonNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
-                }
-
-                @TestMetadata("fieldsAreNullable.kt")
-                public void testFieldsAreNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
-                }
-
-                @TestMetadata("nullabilityFromOverridden.kt")
-                public void testNullabilityFromOverridden() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
-                }
-
-                @TestMetadata("overridingDefaultQualifier.kt")
-                public void testOverridingDefaultQualifier() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefault.kt")
-                public void testParametersAreNonnullByDefault() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-                public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-                }
-
-                @TestMetadata("springNullable.kt")
-                public void testSpringNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
-                }
-
-                @TestMetadata("springNullablePackage.kt")
-                public void testSpringNullablePackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
-                }
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class TypeQualifierDefault extends AbstractForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("fieldsAreNullable.kt")
-            public void testFieldsAreNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
-            }
-
-            @TestMetadata("forceFlexibility.kt")
-            public void testForceFlexibility() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
-            }
-
-            @TestMetadata("forceFlexibleOverOverrides.kt")
-            public void testForceFlexibleOverOverrides() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
-            }
-
-            @TestMetadata("nullabilityFromOverridden.kt")
-            public void testNullabilityFromOverridden() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
-            }
-
-            @TestMetadata("overridingDefaultQualifier.kt")
-            public void testOverridingDefaultQualifier() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-            public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-            }
-
-            @TestMetadata("springNullable.kt")
-            public void testSpringNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
-            }
-
-            @TestMetadata("springNullablePackage.kt")
-            public void testSpringNullablePackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305NullabilityWarnings extends AbstractForeignAnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Migration extends AbstractForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInMigration() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("customMigration.kt")
-            public void testCustomMigration() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
-            }
-
-            @TestMetadata("globalIgnore.kt")
-            public void testGlobalIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
-            }
-
-            @TestMetadata("globalWarningMigrationIgnore.kt")
-            public void testGlobalWarningMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationError.kt")
-            public void testMigrationError() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
-            }
-
-            @TestMetadata("migrationIgnore.kt")
-            public void testMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationWarning.kt")
-            public void testMigrationWarning() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
-            }
-
-            @TestMetadata("overrideConflicts.kt")
-            public void testOverrideConflicts() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
-            }
-
-            @TestMetadata("specialCollision.kt")
-            public void testSpecialCollision() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
-            }
-
-            @TestMetadata("stateRefinement.kt")
-            public void testStateRefinement() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeQualifierDefault extends AbstractForeignAnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
-        public void testDefaultAndNicknameMigrationPolicy() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
-        }
-    }
-}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/JavacForeignAnnotationsTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/JavacForeignAnnotationsTestGenerated.java
deleted file mode 100644
index d71e182c849..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/javac/JavacForeignAnnotationsTestGenerated.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers.javac;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotations/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class JavacForeignAnnotationsTestGenerated extends AbstractJavacForeignAnnotationsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("androidRecently.kt")
-    public void testAndroidRecently() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidRecently.kt");
-    }
-
-    @TestMetadata("androidSdk.kt")
-    public void testAndroidSdk() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidSdk.kt");
-    }
-
-    @TestMetadata("android_support.kt")
-    public void testAndroid_support() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/android_support.kt");
-    }
-
-    @TestMetadata("androidx.kt")
-    public void testAndroidx() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/androidx.kt");
-    }
-
-    @TestMetadata("aosp.kt")
-    public void testAosp() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/aosp.kt");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/eclipse.kt");
-    }
-
-    @TestMetadata("findBugsSimple.kt")
-    public void testFindBugsSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/findBugsSimple.kt");
-    }
-
-    @TestMetadata("irrelevantQualifierNicknames.kt")
-    public void testIrrelevantQualifierNicknames() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/irrelevantQualifierNicknames.kt");
-    }
-
-    @TestMetadata("lombokSimple.kt")
-    public void testLombokSimple() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/lombokSimple.kt");
-    }
-
-    @TestMetadata("rxjava.kt")
-    public void testRxjava() throws Exception {
-        runTest("compiler/testData/foreignAnnotations/tests/rxjava.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractJavacForeignAnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("nonNullNever.kt")
-        public void testNonNullNever() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nonNullNever.kt");
-        }
-
-        @TestMetadata("nullabilityNicknames.kt")
-        public void testNullabilityNicknames() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityNicknames.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/simple.kt");
-        }
-
-        @TestMetadata("strange.kt")
-        public void testStrange() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/jsr305/strange.kt");
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/ignore")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Ignore extends AbstractJavacForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInIgnore() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/ignore"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt");
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class NullabilityWarnings extends AbstractJavacForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInNullabilityWarnings() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("elvis.kt")
-            public void testElvis() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/elvis.kt");
-            }
-
-            @TestMetadata("localInference.kt")
-            public void testLocalInference() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/localInference.kt");
-            }
-
-            @TestMetadata("nullabilityGenerics.kt")
-            public void testNullabilityGenerics() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt");
-            }
-
-            @TestMetadata("nullabilityNicknames.kt")
-            public void testNullabilityNicknames() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt");
-            }
-
-            @TestMetadata("safeCalls.kt")
-            public void testSafeCalls() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/safeCalls.kt");
-            }
-
-            @TestMetadata("simple.kt")
-            public void testSimple() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt");
-            }
-
-            @TestMetadata("strange.kt")
-            public void testStrange() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt");
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class FromPlatformTypes extends AbstractJavacForeignAnnotationsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInFromPlatformTypes() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("arithmetic.kt")
-                public void testArithmetic() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt");
-                }
-
-                @TestMetadata("array.kt")
-                public void testArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt");
-                }
-
-                @TestMetadata("assignToVar.kt")
-                public void testAssignToVar() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt");
-                }
-
-                @TestMetadata("conditions.kt")
-                public void testConditions() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt");
-                }
-
-                @TestMetadata("dataFlowInfo.kt")
-                public void testDataFlowInfo() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt");
-                }
-
-                @TestMetadata("defaultParameters.kt")
-                public void testDefaultParameters() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt");
-                }
-
-                @TestMetadata("delegatedProperties.kt")
-                public void testDelegatedProperties() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt");
-                }
-
-                @TestMetadata("delegation.kt")
-                public void testDelegation() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt");
-                }
-
-                @TestMetadata("derefenceExtension.kt")
-                public void testDerefenceExtension() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt");
-                }
-
-                @TestMetadata("derefenceMember.kt")
-                public void testDerefenceMember() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt");
-                }
-
-                @TestMetadata("expectedType.kt")
-                public void testExpectedType() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt");
-                }
-
-                @TestMetadata("for.kt")
-                public void testFor() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt");
-                }
-
-                @TestMetadata("functionArguments.kt")
-                public void testFunctionArguments() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt");
-                }
-
-                @TestMetadata("invoke.kt")
-                public void testInvoke() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt");
-                }
-
-                @TestMetadata("kt6829.kt")
-                public void testKt6829() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt");
-                }
-
-                @TestMetadata("multiDeclaration.kt")
-                public void testMultiDeclaration() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt");
-                }
-
-                @TestMetadata("passToJava.kt")
-                public void testPassToJava() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt");
-                }
-
-                @TestMetadata("primitiveArray.kt")
-                public void testPrimitiveArray() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt");
-                }
-
-                @TestMetadata("throw.kt")
-                public void testThrow() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt");
-                }
-
-                @TestMetadata("uselessElvisRightIsNull.kt")
-                public void testUselessElvisRightIsNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt");
-                }
-            }
-
-            @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class TypeQualifierDefault extends AbstractJavacForeignAnnotationsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-                }
-
-                @TestMetadata("equalsOnNonNull.kt")
-                public void testEqualsOnNonNull() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/equalsOnNonNull.kt");
-                }
-
-                @TestMetadata("fieldsAreNullable.kt")
-                public void testFieldsAreNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt");
-                }
-
-                @TestMetadata("nullabilityFromOverridden.kt")
-                public void testNullabilityFromOverridden() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt");
-                }
-
-                @TestMetadata("overridingDefaultQualifier.kt")
-                public void testOverridingDefaultQualifier() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefault.kt")
-                public void testParametersAreNonnullByDefault() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-                }
-
-                @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-                public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-                }
-
-                @TestMetadata("springNullable.kt")
-                public void testSpringNullable() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt");
-                }
-
-                @TestMetadata("springNullablePackage.kt")
-                public void testSpringNullablePackage() throws Exception {
-                    runTest("compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt");
-                }
-            }
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class TypeQualifierDefault extends AbstractJavacForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("fieldsAreNullable.kt")
-            public void testFieldsAreNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/fieldsAreNullable.kt");
-            }
-
-            @TestMetadata("forceFlexibility.kt")
-            public void testForceFlexibility() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibility.kt");
-            }
-
-            @TestMetadata("forceFlexibleOverOverrides.kt")
-            public void testForceFlexibleOverOverrides() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/forceFlexibleOverOverrides.kt");
-            }
-
-            @TestMetadata("nullabilityFromOverridden.kt")
-            public void testNullabilityFromOverridden() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/nullabilityFromOverridden.kt");
-            }
-
-            @TestMetadata("overridingDefaultQualifier.kt")
-            public void testOverridingDefaultQualifier() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/overridingDefaultQualifier.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefault.kt")
-            public void testParametersAreNonnullByDefault() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefault.kt");
-            }
-
-            @TestMetadata("parametersAreNonnullByDefaultPackage.kt")
-            public void testParametersAreNonnullByDefaultPackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt");
-            }
-
-            @TestMetadata("springNullable.kt")
-            public void testSpringNullable() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullable.kt");
-            }
-
-            @TestMetadata("springNullablePackage.kt")
-            public void testSpringNullablePackage() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305/typeQualifierDefault/springNullablePackage.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305NullabilityWarnings extends AbstractJavacForeignAnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305NullabilityWarnings() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Migration extends AbstractJavacForeignAnnotationsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInMigration() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration"), Pattern.compile("^(.+)\\.kt$"), null, true);
-            }
-
-            @TestMetadata("customMigration.kt")
-            public void testCustomMigration() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt");
-            }
-
-            @TestMetadata("globalIgnore.kt")
-            public void testGlobalIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt");
-            }
-
-            @TestMetadata("globalWarningMigrationIgnore.kt")
-            public void testGlobalWarningMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationError.kt")
-            public void testMigrationError() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt");
-            }
-
-            @TestMetadata("migrationIgnore.kt")
-            public void testMigrationIgnore() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt");
-            }
-
-            @TestMetadata("migrationWarning.kt")
-            public void testMigrationWarning() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt");
-            }
-
-            @TestMetadata("overrideConflicts.kt")
-            public void testOverrideConflicts() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt");
-            }
-
-            @TestMetadata("specialCollision.kt")
-            public void testSpecialCollision() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt");
-            }
-
-            @TestMetadata("stateRefinement.kt")
-            public void testStateRefinement() throws Exception {
-                runTest("compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt");
-            }
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotations/tests/typeQualifierDefault")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeQualifierDefault extends AbstractJavacForeignAnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeQualifierDefault() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/tests/typeQualifierDefault"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAndNicknameMigrationPolicy.kt")
-        public void testDefaultAndNicknameMigrationPolicy() throws Exception {
-            runTest("compiler/testData/foreignAnnotations/tests/typeQualifierDefault/defaultAndNicknameMigrationPolicy.kt");
-        }
-    }
-}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
index 0811666f4d4..a9f999cda90 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -27,6 +27,16 @@ public class CliTestGenerated extends AbstractCliTest {
             KotlinTestUtils.runTest(this::doJvmTest, this, testDataFilePath);
         }
 
+        @TestMetadata("abiStabilityIncorrectValue.args")
+        public void testAbiStabilityIncorrectValue() throws Exception {
+            runTest("compiler/testData/cli/jvm/abiStabilityIncorrectValue.args");
+        }
+
+        @TestMetadata("abiStabilityUnstableWithOldBackend.args")
+        public void testAbiStabilityUnstableWithOldBackend() throws Exception {
+            runTest("compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args");
+        }
+
         public void testAllFilesPresentInJvm() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), null, false);
         }
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
index 86566d0a845..84d19bdf9fa 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -147,6 +147,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/annotations/kt10136.kt");
         }
 
+        @TestMetadata("kt25489.kt")
+        public void testKt25489() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/kt25489.kt");
+        }
+
         @TestMetadata("mustBeDocumented.kt")
         public void testMustBeDocumented() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/mustBeDocumented.kt");
@@ -1504,6 +1509,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/bridges/kt1959.kt");
         }
 
+        @TestMetadata("kt24193.kt")
+        public void testKt24193() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt24193.kt");
+        }
+
         @TestMetadata("kt2498.kt")
         public void testKt2498() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt2498.kt");
@@ -1733,49 +1743,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractBlackBoxCodegenTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-
-        @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
-        public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2050,6 +2017,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/callableReference/javaField.kt");
         }
 
+        @TestMetadata("kt16752.kt")
+        public void testKt16752() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt16752.kt");
+        }
+
+        @TestMetadata("kt21014.kt")
+        public void testKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void testKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
+        @TestMetadata("kt21092b.kt")
+        public void testKt21092b() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092b.kt");
+        }
+
         @TestMetadata("kt37604.kt")
         public void testKt37604() throws Exception {
             runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
@@ -13434,6 +13421,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
         public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
             runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
@@ -13448,6 +13440,79 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractBlackBoxCodegenTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
+            public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -16305,6 +16370,21 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator.kt");
             }
 
+            @TestMetadata("kt18911.kt")
+            public void testKt18911() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt");
+            }
+
+            @TestMetadata("kt24258.kt")
+            public void testKt24258() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt");
+            }
+
+            @TestMetadata("kt24258nn.kt")
+            public void testKt24258nn() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt");
+            }
+
             @TestMetadata("localEntities.kt")
             public void testLocalEntities() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/localEntities.kt");
@@ -17678,6 +17758,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/jvmName/functionWithDefault.kt");
         }
 
+        @TestMetadata("kt23974.kt")
+        public void testKt23974() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmName/kt23974.kt");
+        }
+
         @TestMetadata("loadJvmName.kt")
         public void testLoadJvmName() throws Exception {
             runTest("compiler/testData/codegen/box/jvmName/loadJvmName.kt");
@@ -18272,6 +18357,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -18317,6 +18407,16 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -19844,6 +19944,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -19859,6 +19964,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -22086,6 +22196,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt");
             }
 
+            @TestMetadata("kt30548.kt")
+            public void testKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("compiler/testData/codegen/box/properties/lateinit/localClass.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
index 42e3cc1e7ac..090ed7ad0b9 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java
@@ -1007,6 +1007,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
         }
 
+        @TestMetadata("genericChild.kt")
+        public void testGenericChild() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.kt");
+        }
+
         @TestMetadata("inlineCharSequence.kt")
         public void testInlineCharSequence() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.kt");
@@ -1543,6 +1548,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.kt");
         }
 
+        @TestMetadata("kt16650.kt")
+        public void testKt16650() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/sam/kt16650.kt");
+        }
+
         @TestMetadata("lambdaGenericFunInterface.kt")
         public void testLambdaGenericFunInterface() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.kt");
@@ -1563,6 +1573,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             runTest("compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.kt");
         }
 
+        @TestMetadata("reusedSamWrapperClasses.kt")
+        public void testReusedSamWrapperClasses() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.kt");
+        }
+
         @TestMetadata("samAdapterAndInlinedOne.kt")
         public void testSamAdapterAndInlinedOne() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.kt");
@@ -1577,6 +1592,11 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
         public void testSpecializedSamInterface() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.kt");
         }
+
+        @TestMetadata("wrapperInlinedFromAnotherClass.kt")
+        public void testWrapperInlinedFromAnotherClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/specialBridges")
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
index 268bb258845..8d99bdb9531 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
@@ -1515,6 +1515,16 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/simple.kt");
             }
 
+            @TestMetadata("twoRefs.kt")
+            public void testTwoRefs() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/twoRefs.kt");
+            }
+
+            @TestMetadata("unusedParamNotSpill.kt")
+            public void testUnusedParamNotSpill() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/unusedParamNotSpill.kt");
+            }
+
             @TestMetadata("when.kt")
             public void testWhen() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/when.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9BlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9BlackBoxCodegenTestGenerated.java
index 527f0f839e1..8e0a4b59837 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9BlackBoxCodegenTestGenerated.java
@@ -64,6 +64,11 @@ public class Jdk9BlackBoxCodegenTestGenerated extends AbstractJdk9BlackBoxCodege
         runTest("compiler/testData/codegen/java9/box/concatDynamicWithInline.kt");
     }
 
+    @TestMetadata("kt36984.kt")
+    public void testKt36984() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/kt36984.kt");
+    }
+
     @TestMetadata("varHandle.kt")
     public void testVarHandle() throws Exception {
         runTest("compiler/testData/codegen/java9/box/varHandle.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9IrBlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9IrBlackBoxCodegenTestGenerated.java
new file mode 100644
index 00000000000..56d97d3ea33
--- /dev/null
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/Jdk9IrBlackBoxCodegenTestGenerated.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2020 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.codegen;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("compiler/testData/codegen/java9/box")
+@TestDataPath("$PROJECT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public class Jdk9IrBlackBoxCodegenTestGenerated extends AbstractJdk9IrBlackBoxCodegenTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+    }
+
+    public void testAllFilesPresentInBox() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/java9/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+    }
+
+    @TestMetadata("concatDynamic.kt")
+    public void testConcatDynamic() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamic.kt");
+    }
+
+    @TestMetadata("concatDynamic200.kt")
+    public void testConcatDynamic200() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamic200.kt");
+    }
+
+    @TestMetadata("concatDynamic201.kt")
+    public void testConcatDynamic201() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamic201.kt");
+    }
+
+    @TestMetadata("concatDynamicIndy200.kt")
+    public void testConcatDynamicIndy200() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamicIndy200.kt");
+    }
+
+    @TestMetadata("concatDynamicIndy201.kt")
+    public void testConcatDynamicIndy201() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamicIndy201.kt");
+    }
+
+    @TestMetadata("concatDynamicInlineClasses.kt")
+    public void testConcatDynamicInlineClasses() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamicInlineClasses.kt");
+    }
+
+    @TestMetadata("concatDynamicWithInline.kt")
+    public void testConcatDynamicWithInline() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/concatDynamicWithInline.kt");
+    }
+
+    @TestMetadata("kt36984.kt")
+    public void testKt36984() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/kt36984.kt");
+    }
+
+    @TestMetadata("varHandle.kt")
+    public void testVarHandle() throws Exception {
+        runTest("compiler/testData/codegen/java9/box/varHandle.kt");
+    }
+}
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index d68bdc6c5c5..fcca375efda 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -147,6 +147,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/annotations/kt10136.kt");
         }
 
+        @TestMetadata("kt25489.kt")
+        public void testKt25489() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/kt25489.kt");
+        }
+
         @TestMetadata("mustBeDocumented.kt")
         public void testMustBeDocumented() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/mustBeDocumented.kt");
@@ -1371,6 +1376,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Bridges extends AbstractLightAnalysisModeTest {
+        @TestMetadata("kt24193.kt")
+        public void ignoreKt24193() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt24193.kt");
+        }
+
         private void runTest(String testDataFilePath) throws Exception {
             KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
@@ -1733,49 +1743,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractLightAnalysisModeTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-
-        @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
-        public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2017,6 +1984,26 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CallableReference extends AbstractLightAnalysisModeTest {
+        @TestMetadata("kt16752.kt")
+        public void ignoreKt16752() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt16752.kt");
+        }
+
+        @TestMetadata("kt21014.kt")
+        public void ignoreKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void ignoreKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
+        @TestMetadata("kt21092b.kt")
+        public void ignoreKt21092b() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092b.kt");
+        }
+
         private void runTest(String testDataFilePath) throws Exception {
             KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
         }
@@ -13434,6 +13421,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
         public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
             runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
@@ -13448,6 +13440,79 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractLightAnalysisModeTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
+            public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -13464,11 +13529,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassWithCustomEquals.kt");
         }
 
-        @TestMetadata("multifileClass.kt")
-        public void ignoreMultifileClass() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/multifileClass.kt");
-        }
-
         @TestMetadata("simpleSecondaryConstructor.kt")
         public void ignoreSimpleSecondaryConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/simpleSecondaryConstructor.kt");
@@ -14117,6 +14177,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/inlineClasses/mappingOfBoxedFlexibleInlineClassType.kt");
         }
 
+        @TestMetadata("multifileClass.kt")
+        public void testMultifileClass() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/multifileClass.kt");
+        }
+
         @TestMetadata("nestedInlineClass.kt")
         public void testNestedInlineClass() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/nestedInlineClass.kt");
@@ -16262,6 +16327,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NotNullAssertions extends AbstractLightAnalysisModeTest {
+            @TestMetadata("kt24258.kt")
+            public void ignoreKt24258() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
@@ -16305,6 +16375,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator.kt");
             }
 
+            @TestMetadata("kt18911.kt")
+            public void testKt18911() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt");
+            }
+
+            @TestMetadata("kt24258nn.kt")
+            public void testKt24258nn() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt");
+            }
+
             @TestMetadata("localEntities.kt")
             public void testLocalEntities() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/localEntities.kt");
@@ -17678,6 +17758,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/jvmName/functionWithDefault.kt");
         }
 
+        @TestMetadata("kt23974.kt")
+        public void testKt23974() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmName/kt23974.kt");
+        }
+
         @TestMetadata("loadJvmName.kt")
         public void testLoadJvmName() throws Exception {
             runTest("compiler/testData/codegen/box/jvmName/loadJvmName.kt");
@@ -18249,6 +18334,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class LocalClasses extends AbstractLightAnalysisModeTest {
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void ignoreCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void ignoreClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -18259,6 +18349,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/localClasses/closureWithSelfInstantiation.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void ignoreKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void ignoreKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("subclassingExtensionReceiverClass.kt")
         public void ignoreSubclassingExtensionReceiverClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/subclassingExtensionReceiverClass.kt");
@@ -19844,6 +19944,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -19859,6 +19964,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -22053,6 +22163,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Lateinit extends AbstractLightAnalysisModeTest {
+            @TestMetadata("kt30548.kt")
+            public void ignoreKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
index 749b7f10298..d211a6110df 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -147,6 +147,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/annotations/kt10136.kt");
         }
 
+        @TestMetadata("kt25489.kt")
+        public void testKt25489() throws Exception {
+            runTest("compiler/testData/codegen/box/annotations/kt25489.kt");
+        }
+
         @TestMetadata("mustBeDocumented.kt")
         public void testMustBeDocumented() throws Exception {
             runTest("compiler/testData/codegen/box/annotations/mustBeDocumented.kt");
@@ -1504,6 +1509,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/bridges/kt1959.kt");
         }
 
+        @TestMetadata("kt24193.kt")
+        public void testKt24193() throws Exception {
+            runTest("compiler/testData/codegen/box/bridges/kt24193.kt");
+        }
+
         @TestMetadata("kt2498.kt")
         public void testKt2498() throws Exception {
             runTest("compiler/testData/codegen/box/bridges/kt2498.kt");
@@ -1733,49 +1743,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractIrBlackBoxCodegenTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-
-        @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
-        public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -2050,6 +2017,26 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/callableReference/javaField.kt");
         }
 
+        @TestMetadata("kt16752.kt")
+        public void testKt16752() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt16752.kt");
+        }
+
+        @TestMetadata("kt21014.kt")
+        public void testKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void testKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
+        @TestMetadata("kt21092b.kt")
+        public void testKt21092b() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092b.kt");
+        }
+
         @TestMetadata("kt37604.kt")
         public void testKt37604() throws Exception {
             runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
@@ -13434,6 +13421,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
         public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
             runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
@@ -13448,6 +13440,79 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractIrBlackBoxCodegenTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substituteTypeVariableIntolambdaParameterDescriptor.kt")
+            public void testSubstituteTypeVariableIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteTypeVariableIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -16305,6 +16370,21 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator.kt");
             }
 
+            @TestMetadata("kt18911.kt")
+            public void testKt18911() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt18911.kt");
+            }
+
+            @TestMetadata("kt24258.kt")
+            public void testKt24258() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258.kt");
+            }
+
+            @TestMetadata("kt24258nn.kt")
+            public void testKt24258nn() throws Exception {
+                runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/kt24258nn.kt");
+            }
+
             @TestMetadata("localEntities.kt")
             public void testLocalEntities() throws Exception {
                 runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/localEntities.kt");
@@ -17678,6 +17758,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/jvmName/functionWithDefault.kt");
         }
 
+        @TestMetadata("kt23974.kt")
+        public void testKt23974() throws Exception {
+            runTest("compiler/testData/codegen/box/jvmName/kt23974.kt");
+        }
+
         @TestMetadata("loadJvmName.kt")
         public void testLoadJvmName() throws Exception {
             runTest("compiler/testData/codegen/box/jvmName/loadJvmName.kt");
@@ -18272,6 +18357,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -18317,6 +18407,16 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -19844,6 +19944,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -19859,6 +19964,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -21720,6 +21830,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt");
             }
 
+            @TestMetadata("kt30548.kt")
+            public void testKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("compiler/testData/codegen/box/properties/lateinit/localClass.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
index d4881292cd6..aa513fd43fb 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeListingTestGenerated.java
@@ -1007,6 +1007,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.kt");
         }
 
+        @TestMetadata("genericChild.kt")
+        public void testGenericChild() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/genericChild.kt");
+        }
+
         @TestMetadata("inlineCharSequence.kt")
         public void testInlineCharSequence() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.kt");
@@ -1543,6 +1548,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/sam/genericSamInterface.kt");
         }
 
+        @TestMetadata("kt16650.kt")
+        public void testKt16650() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/sam/kt16650.kt");
+        }
+
         @TestMetadata("lambdaGenericFunInterface.kt")
         public void testLambdaGenericFunInterface() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/sam/lambdaGenericFunInterface.kt");
@@ -1563,6 +1573,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             runTest("compiler/testData/codegen/bytecodeListing/sam/lambdaSpecializedSamInterface.kt");
         }
 
+        @TestMetadata("reusedSamWrapperClasses.kt")
+        public void testReusedSamWrapperClasses() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/sam/reusedSamWrapperClasses.kt");
+        }
+
         @TestMetadata("samAdapterAndInlinedOne.kt")
         public void testSamAdapterAndInlinedOne() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/sam/samAdapterAndInlinedOne.kt");
@@ -1577,6 +1592,11 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         public void testSpecializedSamInterface() throws Exception {
             runTest("compiler/testData/codegen/bytecodeListing/sam/specializedSamInterface.kt");
         }
+
+        @TestMetadata("wrapperInlinedFromAnotherClass.kt")
+        public void testWrapperInlinedFromAnotherClass() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeListing/sam/wrapperInlinedFromAnotherClass.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/bytecodeListing/specialBridges")
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
index 1b1cecdfd78..66456ca60bd 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrBytecodeTextTestGenerated.java
@@ -1525,6 +1525,16 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/simple.kt");
             }
 
+            @TestMetadata("twoRefs.kt")
+            public void testTwoRefs() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/twoRefs.kt");
+            }
+
+            @TestMetadata("unusedParamNotSpill.kt")
+            public void testUnusedParamNotSpill() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/unusedParamNotSpill.kt");
+            }
+
             @TestMetadata("when.kt")
             public void testWhen() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeText/coroutines/cleanup/when.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/ir/IrSourceRangesTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/ir/IrSourceRangesTestCaseGenerated.java
index 0aa0e7fed4d..fa93993bc8d 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/ir/IrSourceRangesTestCaseGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/ir/IrSourceRangesTestCaseGenerated.java
@@ -44,6 +44,11 @@ public class IrSourceRangesTestCaseGenerated extends AbstractIrSourceRangesTestC
         runTest("compiler/testData/ir/sourceRanges/kt17108.kt");
     }
 
+    @TestMetadata("kt24258.kt")
+    public void testKt24258() throws Exception {
+        runTest("compiler/testData/ir/sourceRanges/kt24258.kt");
+    }
+
     @TestMetadata("compiler/testData/ir/sourceRanges/declarations")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
index c9d9cac3e7f..5223278165b 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java
@@ -196,6 +196,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt");
         }
 
+        @TestMetadata("kt19306.kt")
+        public void testKt19306() throws Exception {
+            runTest("compiler/testData/ir/irText/classes/kt19306.kt");
+        }
+
         @TestMetadata("kt31649.kt")
         public void testKt31649() throws Exception {
             runTest("compiler/testData/ir/irText/classes/kt31649.kt");
@@ -1847,6 +1852,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/firProblems/putIfAbsent.kt");
         }
 
+        @TestMetadata("readWriteProperty.kt")
+        public void testReadWriteProperty() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/readWriteProperty.kt");
+        }
+
         @TestMetadata("recursiveCapturedTypeInPropertyReference.kt")
         public void testRecursiveCapturedTypeInPropertyReference() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/recursiveCapturedTypeInPropertyReference.kt");
@@ -1862,11 +1872,21 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase {
             runTest("compiler/testData/ir/irText/firProblems/SignatureClash.kt");
         }
 
+        @TestMetadata("SyntheticSetterType.kt")
+        public void testSyntheticSetterType() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/SyntheticSetterType.kt");
+        }
+
         @TestMetadata("throwableStackTrace.kt")
         public void testThrowableStackTrace() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/throwableStackTrace.kt");
         }
 
+        @TestMetadata("typeParameterFromJavaClass.kt")
+        public void testTypeParameterFromJavaClass() throws Exception {
+            runTest("compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.kt");
+        }
+
         @TestMetadata("typeVariableAfterBuildMap.kt")
         public void testTypeVariableAfterBuildMap() throws Exception {
             runTest("compiler/testData/ir/irText/firProblems/typeVariableAfterBuildMap.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java
index e1581e98ba7..9ace12ccd68 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java
@@ -2273,6 +2273,11 @@ public class ParsingTestGenerated extends AbstractParsingTest {
                 runTest("compiler/testData/psi/recovery/kt2172.kt");
             }
 
+            @TestMetadata("kt24158.kt")
+            public void testKt24158() throws Exception {
+                runTest("compiler/testData/psi/recovery/kt24158.kt");
+            }
+
             @TestMetadata("kt5102.kt")
             public void testKt5102() throws Exception {
                 runTest("compiler/testData/psi/recovery/kt5102.kt");
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsCompiledJavaDiagnosticTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsCompiledJavaDiagnosticTestGenerated.java
index 4116daf3dd9..71bec715cd4 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsCompiledJavaDiagnosticTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignAnnotationsCompiledJavaDiagnosticTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava")
+@TestMetadata("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ForeignAnnotationsCompiledJavaDiagnosticTestGenerated extends AbstractForeignAnnotationsCompiledJavaDiagnosticTest {
@@ -26,36 +26,36 @@ public class ForeignAnnotationsCompiledJavaDiagnosticTestGenerated extends Abstr
     }
 
     public void testAllFilesPresentInTypeEnhancementOnCompiledJava() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
     @TestMetadata("ClassTypeParameterBound.kt")
     public void testClassTypeParameterBound() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.kt");
+        runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBound.kt");
     }
 
     @TestMetadata("ClassTypeParameterBoundWithWarnings.kt")
     public void testClassTypeParameterBoundWithWarnings() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.kt");
+        runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ClassTypeParameterBoundWithWarnings.kt");
     }
 
     @TestMetadata("ReturnType.kt")
     public void testReturnType() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnType.kt");
+        runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnType.kt");
     }
 
     @TestMetadata("ReturnTypeWithWarnings.kt")
     public void testReturnTypeWithWarnings() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.kt");
+        runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ReturnTypeWithWarnings.kt");
     }
 
     @TestMetadata("ValueParameter.kt")
     public void testValueParameter() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameter.kt");
+        runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameter.kt");
     }
 
     @TestMetadata("ValueParameterWithWarnings.kt")
     public void testValueParameterWithWarnings() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.kt");
+        runTest("compiler/testData/foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava/ValueParameterWithWarnings.kt");
     }
 }
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java
deleted file mode 100644
index 75fd2eb2ba1..00000000000
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ForeignJava8AnnotationsNoAnnotationInClasspathTestGenerated extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt");
-    }
-
-    @TestMetadata("typeUseOnObject.kt")
-    public void testTypeUseOnObject() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToType.kt")
-        public void testDefaultAnnotationAppliedToType() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt");
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
-        public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
-        }
-
-        @TestMetadata("springNullableWithTypeUse.kt")
-        public void testSpringNullableWithTypeUse() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.kt");
-        }
-
-        @TestMetadata("typeArguments.kt")
-        public void testTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
-        }
-
-        @TestMetadata("typeUseVsMethodConflict.kt")
-        public void testTypeUseVsMethodConflict() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeEnhancement extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeEnhancement() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("annotatedTypeArguments.kt")
-        public void testAnnotatedTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.kt");
-        }
-
-        @TestMetadata("methodWithTypeParameter.kt")
-        public void testMethodWithTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.kt");
-        }
-
-        @TestMetadata("notNullVarargsOverrides.kt")
-        public void testNotNullVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt");
-        }
-
-        @TestMetadata("nullableVarargsOverrides.kt")
-        public void testNullableVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt");
-        }
-
-        @TestMetadata("returnTypeDifferentConstructor.kt")
-        public void testReturnTypeDifferentConstructor() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.kt");
-        }
-
-        @TestMetadata("returnTypeOverrideInKotlin.kt")
-        public void testReturnTypeOverrideInKotlin() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.kt");
-        }
-    }
-}
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
deleted file mode 100644
index ae58e4e1528..00000000000
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTestGenerated extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt");
-    }
-
-    @TestMetadata("typeUseOnObject.kt")
-    public void testTypeUseOnObject() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToType.kt")
-        public void testDefaultAnnotationAppliedToType() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt");
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
-        public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
-        }
-
-        @TestMetadata("springNullableWithTypeUse.kt")
-        public void testSpringNullableWithTypeUse() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.kt");
-        }
-
-        @TestMetadata("typeArguments.kt")
-        public void testTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
-        }
-
-        @TestMetadata("typeUseVsMethodConflict.kt")
-        public void testTypeUseVsMethodConflict() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeEnhancement extends AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeEnhancement() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("annotatedTypeArguments.kt")
-        public void testAnnotatedTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.kt");
-        }
-
-        @TestMetadata("methodWithTypeParameter.kt")
-        public void testMethodWithTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.kt");
-        }
-
-        @TestMetadata("notNullVarargsOverrides.kt")
-        public void testNotNullVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt");
-        }
-
-        @TestMetadata("nullableVarargsOverrides.kt")
-        public void testNullableVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt");
-        }
-
-        @TestMetadata("returnTypeDifferentConstructor.kt")
-        public void testReturnTypeDifferentConstructor() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.kt");
-        }
-
-        @TestMetadata("returnTypeOverrideInKotlin.kt")
-        public void testReturnTypeOverrideInKotlin() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.kt");
-        }
-    }
-}
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java
deleted file mode 100644
index 4eb268efc01..00000000000
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/ForeignJava8AnnotationsTestGenerated.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class ForeignJava8AnnotationsTestGenerated extends AbstractForeignJava8AnnotationsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt");
-    }
-
-    @TestMetadata("typeUseOnObject.kt")
-    public void testTypeUseOnObject() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractForeignJava8AnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToType.kt")
-        public void testDefaultAnnotationAppliedToType() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt");
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
-        public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
-        }
-
-        @TestMetadata("springNullableWithTypeUse.kt")
-        public void testSpringNullableWithTypeUse() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.kt");
-        }
-
-        @TestMetadata("typeArguments.kt")
-        public void testTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
-        }
-
-        @TestMetadata("typeUseVsMethodConflict.kt")
-        public void testTypeUseVsMethodConflict() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeEnhancement extends AbstractForeignJava8AnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeEnhancement() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("annotatedTypeArguments.kt")
-        public void testAnnotatedTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.kt");
-        }
-
-        @TestMetadata("methodWithTypeParameter.kt")
-        public void testMethodWithTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.kt");
-        }
-
-        @TestMetadata("notNullVarargsOverrides.kt")
-        public void testNotNullVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt");
-        }
-
-        @TestMetadata("nullableVarargsOverrides.kt")
-        public void testNullableVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt");
-        }
-
-        @TestMetadata("returnTypeDifferentConstructor.kt")
-        public void testReturnTypeDifferentConstructor() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.kt");
-        }
-
-        @TestMetadata("returnTypeOverrideInKotlin.kt")
-        public void testReturnTypeOverrideInKotlin() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.kt");
-        }
-    }
-}
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/JspecifyAnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/JspecifyAnnotationsTestGenerated.java
index dc862175c93..b9dfd07191f 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/JspecifyAnnotationsTestGenerated.java
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/JspecifyAnnotationsTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin")
+@TestMetadata("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class JspecifyAnnotationsTestGenerated extends AbstractJspecifyAnnotationsTest {
@@ -26,10 +26,10 @@ public class JspecifyAnnotationsTestGenerated extends AbstractJspecifyAnnotation
     }
 
     public void testAllFilesPresentInKotlin() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode")
+    @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class StrictMode extends AbstractJspecifyAnnotationsTest {
@@ -38,61 +38,61 @@ public class JspecifyAnnotationsTestGenerated extends AbstractJspecifyAnnotation
         }
 
         public void testAllFilesPresentInStrictMode() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
         @TestMetadata("AnnotatedBoundsOfWildcard.kt")
         public void testAnnotatedBoundsOfWildcard() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/AnnotatedBoundsOfWildcard.kt");
         }
 
         @TestMetadata("Defaults.kt")
         public void testDefaults() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Defaults.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Defaults.kt");
         }
 
         @TestMetadata("IgnoreAnnotations.kt")
         public void testIgnoreAnnotations() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/IgnoreAnnotations.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/IgnoreAnnotations.kt");
         }
 
         @TestMetadata("NonPlatformTypeParameter.kt")
         public void testNonPlatformTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NonPlatformTypeParameter.kt");
         }
 
         @TestMetadata("NullnessUnspecifiedTypeParameter.kt")
         public void testNullnessUnspecifiedTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/NullnessUnspecifiedTypeParameter.kt");
         }
 
         @TestMetadata("SelfType.kt")
         public void testSelfType() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/SelfType.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/SelfType.kt");
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/Simple.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/Simple.kt");
         }
 
         @TestMetadata("TypeArgumentsFromParameterBounds.kt")
         public void testTypeArgumentsFromParameterBounds() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeArgumentsFromParameterBounds.kt");
         }
 
         @TestMetadata("TypeParameterBounds.kt")
         public void testTypeParameterBounds() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/TypeParameterBounds.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/TypeParameterBounds.kt");
         }
 
         @TestMetadata("WildcardsWithDefault.kt")
         public void testWildcardsWithDefault() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/strictMode/WildcardsWithDefault.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/strictMode/WildcardsWithDefault.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode")
+    @TestMetadata("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WarnMode extends AbstractJspecifyAnnotationsTest {
@@ -101,57 +101,57 @@ public class JspecifyAnnotationsTestGenerated extends AbstractJspecifyAnnotation
         }
 
         public void testAllFilesPresentInWarnMode() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
         @TestMetadata("AnnotatedBoundsOfWildcard.kt")
         public void testAnnotatedBoundsOfWildcard() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/AnnotatedBoundsOfWildcard.kt");
         }
 
         @TestMetadata("Defaults.kt")
         public void testDefaults() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Defaults.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Defaults.kt");
         }
 
         @TestMetadata("IgnoreAnnotations.kt")
         public void testIgnoreAnnotations() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/IgnoreAnnotations.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/IgnoreAnnotations.kt");
         }
 
         @TestMetadata("NonPlatformTypeParameter.kt")
         public void testNonPlatformTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NonPlatformTypeParameter.kt");
         }
 
         @TestMetadata("NullnessUnspecifiedTypeParameter.kt")
         public void testNullnessUnspecifiedTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/NullnessUnspecifiedTypeParameter.kt");
         }
 
         @TestMetadata("SelfType.kt")
         public void testSelfType() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/SelfType.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/SelfType.kt");
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/Simple.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/Simple.kt");
         }
 
         @TestMetadata("TypeArgumentsFromParameterBounds.kt")
         public void testTypeArgumentsFromParameterBounds() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeArgumentsFromParameterBounds.kt");
         }
 
         @TestMetadata("TypeParameterBounds.kt")
         public void testTypeParameterBounds() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/TypeParameterBounds.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/TypeParameterBounds.kt");
         }
 
         @TestMetadata("WildcardsWithDefault.kt")
         public void testWildcardsWithDefault() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jspecify/kotlin/warnMode/WildcardsWithDefault.kt");
+            runTest("compiler/testData/foreignAnnotations/java8Tests/jspecify/kotlin/warnMode/WildcardsWithDefault.kt");
         }
     }
 }
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java
deleted file mode 100644
index 0f3fbf48add..00000000000
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/checkers/javac/JavacForeignJava8AnnotationsTestGenerated.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010-2020 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.checkers.javac;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/foreignAnnotationsJava8/tests")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class JavacForeignJava8AnnotationsTestGenerated extends AbstractJavacForeignJava8AnnotationsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTests() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests"), Pattern.compile("^(.+)\\.kt$"), null, true, "jspecify", "typeEnhancementOnCompiledJava");
-    }
-
-    @TestMetadata("checkerFramework.kt")
-    public void testCheckerFramework() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/checkerFramework.kt");
-    }
-
-    @TestMetadata("eclipse.kt")
-    public void testEclipse() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/eclipse.kt");
-    }
-
-    @TestMetadata("typeUseOnObject.kt")
-    public void testTypeUseOnObject() throws Exception {
-        runTest("compiler/testData/foreignAnnotationsJava8/tests/typeUseOnObject.kt");
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/jsr305")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jsr305 extends AbstractJavacForeignJava8AnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInJsr305() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/jsr305"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToType.kt")
-        public void testDefaultAnnotationAppliedToType() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToType.kt");
-        }
-
-        @TestMetadata("defaultAnnotationAppliedToTypeForCompiledJava.kt")
-        public void testDefaultAnnotationAppliedToTypeForCompiledJava() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/defaultAnnotationAppliedToTypeForCompiledJava.kt");
-        }
-
-        @TestMetadata("springNullableWithTypeUse.kt")
-        public void testSpringNullableWithTypeUse() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/springNullableWithTypeUse.kt");
-        }
-
-        @TestMetadata("typeArguments.kt")
-        public void testTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeArguments.kt");
-        }
-
-        @TestMetadata("typeUseVsMethodConflict.kt")
-        public void testTypeUseVsMethodConflict() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/jsr305/typeUseVsMethodConflict.kt");
-        }
-    }
-
-    @TestMetadata("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeEnhancement extends AbstractJavacForeignJava8AnnotationsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInTypeEnhancement() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), null, true);
-        }
-
-        @TestMetadata("annotatedTypeArguments.kt")
-        public void testAnnotatedTypeArguments() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/annotatedTypeArguments.kt");
-        }
-
-        @TestMetadata("methodWithTypeParameter.kt")
-        public void testMethodWithTypeParameter() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/methodWithTypeParameter.kt");
-        }
-
-        @TestMetadata("notNullVarargsOverrides.kt")
-        public void testNotNullVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/notNullVarargsOverrides.kt");
-        }
-
-        @TestMetadata("nullableVarargsOverrides.kt")
-        public void testNullableVarargsOverrides() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/nullableVarargsOverrides.kt");
-        }
-
-        @TestMetadata("returnTypeDifferentConstructor.kt")
-        public void testReturnTypeDifferentConstructor() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeDifferentConstructor.kt");
-        }
-
-        @TestMetadata("returnTypeOverrideInKotlin.kt")
-        public void testReturnTypeOverrideInKotlin() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/returnTypeOverrideInKotlin.kt");
-        }
-
-        @TestMetadata("simple.kt")
-        public void testSimple() throws Exception {
-            runTest("compiler/testData/foreignAnnotationsJava8/tests/typeEnhancement/simple.kt");
-        }
-    }
-}
diff --git a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt
index aead7323de0..0035537738c 100644
--- a/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt
+++ b/compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.generators.tests
 
 import org.jetbrains.kotlin.checkers.*
-import org.jetbrains.kotlin.checkers.javac.AbstractJavacForeignJava8AnnotationsTest
 import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
 import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8Test
 import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJava8WithPsiClassReadingTest
@@ -29,31 +28,12 @@ fun main(args: Array<String>) {
 
     generateTestGroupSuite(args) {
         testGroup("compiler/tests-java8/tests", "compiler/testData") {
-            testClass<AbstractForeignJava8AnnotationsTest> {
-                model("foreignAnnotationsJava8/tests", excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava"))
-            }
-
-            testClass<AbstractJavacForeignJava8AnnotationsTest> {
-                model("foreignAnnotationsJava8/tests", excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava"))
-            }
-
-            testClass<AbstractForeignJava8AnnotationsNoAnnotationInClasspathTest> {
-                model("foreignAnnotationsJava8/tests", excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava"))
-            }
-
-            testClass<AbstractForeignJava8AnnotationsNoAnnotationInClasspathWithPsiClassReadingTest> {
-                model(
-                    "foreignAnnotationsJava8/tests",
-                    excludeDirs = listOf("jspecify", "typeEnhancementOnCompiledJava")
-                )
-            }
-
             testClass<AbstractJspecifyAnnotationsTest> {
-                model("foreignAnnotationsJava8/tests/jspecify/kotlin")
+                model("foreignAnnotations/java8Tests/jspecify/kotlin")
             }
 
             testClass<AbstractForeignAnnotationsCompiledJavaDiagnosticTest> {
-                model("foreignAnnotationsJava8/tests/typeEnhancementOnCompiledJava")
+                model("foreignAnnotations/java8Tests/typeEnhancementOnCompiledJava")
             }
 
             testClass<AbstractLoadJava8Test> {
diff --git a/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt b/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt
index 70772272a60..d076aa4d9b8 100644
--- a/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt
+++ b/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/MutedTestsSync.kt
@@ -58,7 +58,7 @@ object Bunches {
     }
 
     private fun readAllRulesFromFile(): List<String> {
-        val file = File("../..", ".bunch")
+        val file = File("../../..", ".bunch")
         if (!file.exists()) {
             throw BunchException("Can't build list of rules. File '${file.canonicalPath}' doesn't exist")
         }
@@ -93,7 +93,7 @@ class LocallyMutedTests {
 
     private fun getMutedTestsFromDatabase(): Map<String, List<MutedTest>> {
         val mutedTestsMap = mutableMapOf<String, List<MutedTest>>()
-        val databaseDir = "../../tests"
+        val databaseDir = "../../../tests"
 
         val commonDatabaseFile = File(databaseDir, "mute-common.csv")
         mutedTestsMap[muteCommonTestKey] = flakyTests(commonDatabaseFile)
diff --git a/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt b/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt
index 871db830617..c245c1a9f24 100644
--- a/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt
+++ b/compiler/tests-mutes/tc-integration/src/org/jetbrains/kotlin/test/mutes/TeamCityInteraction.kt
@@ -12,6 +12,7 @@ private val headers = mapOf("Content-type" to "application/json", "Accept" to "a
 private val authUser = object : Authorization {
     override val header = "Authorization" to "Bearer ${getMandatoryProperty("org.jetbrains.kotlin.test.mutes.teamcity.server.token")}"
 }
+private const val customTimeout = DEFAULT_TIMEOUT * 4
 
 
 internal fun getMutedTestsOnTeamcityForRootProject(rootScopeId: String): List<MuteTestJson> {
@@ -33,7 +34,7 @@ private fun traverseAll(requestHref: String, requestParams: Map<String, String>)
     val jsonResponses = mutableListOf<JsonNode>()
 
     fun request(url: String, params: Map<String, String>): String {
-        val currentResponse = khttp.get(url, headers, params, auth = authUser)
+        val currentResponse = khttp.get(url, headers, params, auth = authUser, timeout = customTimeout)
         checkResponseAndLog(currentResponse)
         val currentJsonResponse = jsonObjectMapper.readTree(currentResponse.text)
         jsonResponses.add(currentJsonResponse)
@@ -54,7 +55,8 @@ internal fun uploadMutedTests(uploadMap: Map<String, MuteTestJson>) {
             "$buildServerUrl/app/rest/mutes",
             headers = headers,
             data = jsonObjectMapper.writeValueAsString(muteTestJson),
-            auth = authUser
+            auth = authUser,
+            timeout = customTimeout
         )
         checkResponseAndLog(response)
     }
@@ -66,7 +68,7 @@ internal fun deleteMutedTests(deleteMap: Map<String, MuteTestJson>) {
             "$buildServerUrl/app/rest/mutes/id:${muteTestJson.id}",
             headers = headers,
             auth = authUser,
-            timeout = DEFAULT_TIMEOUT * 2
+            timeout = customTimeout
         )
         try {
             checkResponseAndLog(response)
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt
index 4c7af495269..f7867067d90 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt
@@ -29,8 +29,8 @@ fun case_1(value_1: Int, value_2: EmptyClass, value_3: Int, value_4: Any): Strin
  */
 fun case_2(value_1: Int, value_3: Nothing) {
     when (value_1) {
-        <!OVERLOAD_RESOLUTION_AMBIGUITY, TYPE_MISMATCH_IN_RANGE, UNREACHABLE_CODE!>in<!> value_3 -> <!UNREACHABLE_CODE!>{}<!>
-        <!UNREACHABLE_CODE!><!OVERLOAD_RESOLUTION_AMBIGUITY, TYPE_MISMATCH_IN_RANGE!>in<!> throw Exception() -> {}<!>
-        <!UNREACHABLE_CODE!><!OVERLOAD_RESOLUTION_AMBIGUITY, TYPE_MISMATCH_IN_RANGE!>in<!> return -> {}<!>
+        <!OVERLOAD_RESOLUTION_AMBIGUITY, UNREACHABLE_CODE!>in<!> value_3 -> <!UNREACHABLE_CODE!>{}<!>
+        <!UNREACHABLE_CODE!><!OVERLOAD_RESOLUTION_AMBIGUITY!>in<!> throw Exception() -> {}<!>
+        <!UNREACHABLE_CODE!><!OVERLOAD_RESOLUTION_AMBIGUITY!>in<!> return -> {}<!>
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
index bffde6c6c83..46263b1f886 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.name.SpecialNames;
 import org.jetbrains.kotlin.test.ConfigurationKind;
+import org.jetbrains.kotlin.test.util.JUnit4Assertions;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.utils.StringsKt;
 import org.jetbrains.org.objectweb.asm.ClassReader;
@@ -158,7 +159,8 @@ public class OuterClassGenTest extends CodegenTestCase {
         File javaOut = CodegenTestUtil.compileJava(
                 Collections.singletonList(KtTestUtil.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + testDataFile + ".java"),
                 Collections.emptyList(),
-                Collections.emptyList()
+                Collections.emptyList(),
+                JUnit4Assertions.INSTANCE
         );
 
         String javaClassPath = javaClassName.replace('.', File.separatorChar) + ".class";
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
index 3b5c02d2a9b..f6c05bc2bea 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt
@@ -669,29 +669,45 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration
         classLoader.loadClass("SourceKt").getDeclaredMethod("main").invoke(null)
     }
 
-    fun testJvmIrAgainstJvmIr() {
-        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-ir"))
-        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xuse-ir"))
+    fun testFirAgainstFir() {
+        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-fir"))
+        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xuse-fir"))
     }
 
-    fun testJvmIrAgainstOld() {
+    fun testFirAgainstOldJvm() {
         val library = compileLibrary("library")
-        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xuse-ir"))
+        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xuse-fir"))
     }
 
-    fun testOldAgainstJvmIr() {
+    fun testOldJvmAgainstJvmIr() {
         val library = compileLibrary("library", additionalOptions = listOf("-Xuse-ir"))
         compileKotlin("source.kt", tmpdir, listOf(library))
+
+        val library2 = compileLibrary("library", additionalOptions = listOf("-Xuse-ir", "-Xabi-stability=stable"))
+        compileKotlin("source.kt", tmpdir, listOf(library2))
+    }
+
+    fun testOldJvmAgainstFir() {
+        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-fir"))
+        compileKotlin("source.kt", tmpdir, listOf(library))
+
+        val library2 = compileLibrary("library", additionalOptions = listOf("-Xuse-fir", "-Xabi-stability=unstable"))
+        compileKotlin("source.kt", tmpdir, listOf(library2))
+    }
+
+    fun testOldJvmAgainstJvmIrWithUnstableAbi() {
+        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-ir", "-Xabi-stability=unstable"))
+        compileKotlin("source.kt", tmpdir, listOf(library))
     }
 
-    fun testOldAgainstJvmIrWithStableAbi() {
-        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-ir", "-Xir-binary-with-stable-abi"))
+    fun testOldJvmAgainstFirWithStableAbi() {
+        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-fir", "-Xabi-stability=stable"))
         compileKotlin("source.kt", tmpdir, listOf(library))
     }
 
-    fun testOldAgainstJvmIrWithAllowIrDependencies() {
-        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-ir"))
-        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xallow-jvm-ir-dependencies"))
+    fun testOldJvmAgainstFirWithAllowUnstableDependencies() {
+        val library = compileLibrary("library", additionalOptions = listOf("-Xuse-fir"))
+        compileKotlin("source.kt", tmpdir, listOf(library), additionalOptions = listOf("-Xallow-unstable-dependencies"))
     }
 
     fun testSealedClassesAndInterfaces() {
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt
index ebe3e34f39e..caa6d004817 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt
@@ -26,10 +26,7 @@ import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
-import org.jetbrains.kotlin.test.ConfigurationKind
-import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
-import org.jetbrains.kotlin.test.TestJdkKind
+import org.jetbrains.kotlin.test.*
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
@@ -108,5 +105,5 @@ class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() {
     }
 
     private fun prepareJar() =
-            MockLibraryUtil.compileJavaFilesLibraryToJar(TEST_DATA_PATH, "result.jar")
+        MockLibraryUtilExt.compileJavaFilesLibraryToJar(TEST_DATA_PATH, "result.jar")
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt
index f900b4a1bb3..2e1afc1d3a0 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt
@@ -33,10 +33,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.renderer.AnnotationArgumentsRenderingPolicy
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
-import org.jetbrains.kotlin.test.ConfigurationKind
-import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
-import org.jetbrains.kotlin.test.TestJdkKind
+import org.jetbrains.kotlin.test.*
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
@@ -90,7 +87,7 @@ class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() {
             ConfigurationKind.ALL, TestJdkKind.FULL_JDK,
             listOf(
                     KtTestUtil.getAnnotationsJar(),
-                    MockLibraryUtil.compileJavaFilesLibraryToJar(
+                    MockLibraryUtilExt.compileJavaFilesLibraryToJar(
                                 FOREIGN_ANNOTATIONS_SOURCES_PATH,
                                 "foreign-annotations"
                         )
diff --git a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java
index 5ef7efb779d..290aa357b42 100644
--- a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java
@@ -163,7 +163,8 @@ public class StorageManagerTest extends TestCase {
             fail();
         }
         catch (AssertionError e) {
-            assertTrue(e.getMessage().startsWith("Recursion detected on input: !!!"));
+            String message = e.getMessage();
+            assertTrue("Expected message starting with \"Recursion detected\", got: " + message, message.startsWith("Recursion detected on input: !!!"));
         }
     }
 
@@ -213,7 +214,7 @@ public class StorageManagerTest extends TestCase {
             new C().rec.invoke();
             fail();
         }
-        catch (IllegalStateException e) {
+        catch (AssertionError e) {
             // OK
         }
     }
@@ -232,7 +233,7 @@ public class StorageManagerTest extends TestCase {
             new C().rec.invoke();
             fail();
         }
-        catch (IllegalStateException e) {
+        catch (AssertionError e) {
             // OK
         }
     }
@@ -284,7 +285,7 @@ public class StorageManagerTest extends TestCase {
             new C().rec.invoke();
             fail();
         }
-        catch (IllegalStateException e) {
+        catch (AssertionError e) {
             // OK
         }
     }
diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts
index d3c477e48af..612da8d9f25 100644
--- a/compiler/visualizer/build.gradle.kts
+++ b/compiler/visualizer/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
     testCompile(commonDep("junit:junit"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:fir:analysis-tests"))
+    testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
 }
 
 val generationRoot = projectDir.resolve("tests-gen")
diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
index fbd565b2b17..f5897f1ba1a 100644
--- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
+++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
@@ -46,6 +46,7 @@ public final class JvmAnnotationNames {
     public static final int METADATA_STRICT_VERSION_SEMANTICS_FLAG = 1 << 3;
     public static final int METADATA_JVM_IR_FLAG = 1 << 4;
     public static final int METADATA_JVM_IR_STABLE_ABI_FLAG = 1 << 5;
+    public static final int METADATA_FIR_FLAG = 1 << 6;
 
     public static final Name DEFAULT_ANNOTATION_MEMBER_NAME = Name.identifier("value");
 
diff --git a/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt b/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
index 28748ed8c7e..e3ee7f218df 100644
--- a/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
+++ b/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
@@ -17,9 +17,22 @@ interface DeserializedContainerSource : SourceElement {
 
     // True iff this container was compiled by the new IR backend, this compiler is not using the IR backend right now,
     // and no additional flags to override this behavior were specified.
-    val isInvisibleIrDependency: Boolean
+    val abiStability: DeserializedContainerAbiStability
 
     // This string should only be used in error messages
     val presentableString: String
 }
 
+enum class DeserializedContainerAbiStability {
+    // Either the container is stable, or this compiler is configured to ignore ABI stability of dependencies.
+    STABLE,
+
+    // The container is unstable because it is compiled with FIR, and this compiler is _not_ configured to ignore that.
+    FIR_UNSTABLE,
+
+    // The container is unstable because either:
+    // 1) it is compiled with JVM IR prior to 1.4.30, or
+    // 2) it is compiled with JVM IR >= 1.4.30 with the `-Xabi-stability=unstable` compiler option,
+    // and this compiler is _not_ configured to ignore that.
+    IR_UNSTABLE,
+}
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltIns.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltIns.kt
index 5eabfdc18f7..67306bf3b4f 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltIns.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltIns.kt
@@ -53,25 +53,35 @@ class JvmBuiltIns(storageManager: StorageManager, kind: Kind) : KotlinBuiltIns(s
         FALLBACK,
     }
 
-    // Module containing JDK classes or having them among dependencies
-    private var ownerModuleDescriptor: ModuleDescriptor? = null
-    private var isAdditionalBuiltInsFeatureSupported: Boolean = true
+    class Settings(
+        // Module containing JDK classes or having them among dependencies
+        val ownerModuleDescriptor: ModuleDescriptor,
+        val isAdditionalBuiltInsFeatureSupported: Boolean,
+    )
 
-    fun initialize(moduleDescriptor: ModuleDescriptor, isAdditionalBuiltInsFeatureSupported: Boolean) {
-        assert(ownerModuleDescriptor == null) { "JvmBuiltins repeated initialization" }
-        this.ownerModuleDescriptor = moduleDescriptor
-        this.isAdditionalBuiltInsFeatureSupported = isAdditionalBuiltInsFeatureSupported
+    private var settingsComputation: (() -> Settings)? = null
+
+    fun setPostponedSettingsComputation(computation: () -> Settings) {
+        assert(settingsComputation == null) { "JvmBuiltins repeated initialization" }
+        settingsComputation = computation
     }
 
-    val settings: JvmBuiltInsSettings by storageManager.createLazyValue {
-        JvmBuiltInsSettings(
-            builtInsModule, storageManager,
-            { ownerModuleDescriptor.sure { "JvmBuiltins has not been initialized properly" } },
-            {
-                ownerModuleDescriptor.sure { "JvmBuiltins has not been initialized properly" }
-                isAdditionalBuiltInsFeatureSupported
-            }
-        )
+    fun initialize(moduleDescriptor: ModuleDescriptor, isAdditionalBuiltInsFeatureSupported: Boolean) {
+        setPostponedSettingsComputation {
+            Settings(moduleDescriptor, isAdditionalBuiltInsFeatureSupported)
+        }
+    }
+
+    val customizer: JvmBuiltInsCustomizer by storageManager.createLazyValue {
+        JvmBuiltInsCustomizer(
+            builtInsModule, storageManager
+        ) {
+            settingsComputation
+                .sure { "JvmBuiltins instance has not been initialized properly" }
+                .invoke().also {
+                    settingsComputation = null
+                }
+        }
     }
 
     init {
@@ -83,9 +93,9 @@ class JvmBuiltIns(storageManager: StorageManager, kind: Kind) : KotlinBuiltIns(s
         }
     }
 
-    override fun getPlatformDependentDeclarationFilter(): PlatformDependentDeclarationFilter = settings
+    override fun getPlatformDependentDeclarationFilter(): PlatformDependentDeclarationFilter = customizer
 
-    override fun getAdditionalClassPartsProvider(): AdditionalClassPartsProvider = settings
+    override fun getAdditionalClassPartsProvider(): AdditionalClassPartsProvider = customizer
 
     override fun getClassDescriptorFactories() =
         super.getClassDescriptorFactories() + JvmBuiltInClassDescriptorFactory(storageManager, builtInsModule)
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsCustomizer.kt
similarity index 94%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt
rename to core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsCustomizer.kt
index 736eb21bf7a..386b4a3720d 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsCustomizer.kt
@@ -45,22 +45,22 @@ import org.jetbrains.kotlin.utils.DFS
 import org.jetbrains.kotlin.utils.SmartSet
 import java.util.*
 
-open class JvmBuiltInsSettings(
+// This class is worth splitting into two implementations of AdditionalClassPartsProvider and PlatformDependentDeclarationFilter
+// But currently, they shares a piece of code and probably it's better to postpone it
+class JvmBuiltInsCustomizer(
     private val moduleDescriptor: ModuleDescriptor,
     storageManager: StorageManager,
-    deferredOwnerModuleDescriptor: () -> ModuleDescriptor,
-    isAdditionalBuiltInsFeatureSupported: () -> Boolean
+    settingsComputation: () -> JvmBuiltIns.Settings,
 ) : AdditionalClassPartsProvider, PlatformDependentDeclarationFilter {
     private val j2kClassMapper = JavaToKotlinClassMapper
 
-    private val ownerModuleDescriptor: ModuleDescriptor by lazy(deferredOwnerModuleDescriptor)
-    private val isAdditionalBuiltInsFeatureSupported: Boolean by lazy(isAdditionalBuiltInsFeatureSupported)
+    private val settings by storageManager.createLazyValue(settingsComputation)
 
     private val mockSerializableType = storageManager.createMockJavaIoSerializableType()
     private val cloneableType by storageManager.createLazyValue {
-        ownerModuleDescriptor.findNonGenericClassAcrossDependencies(
+        settings.ownerModuleDescriptor.findNonGenericClassAcrossDependencies(
             JvmBuiltInClassDescriptorFactory.CLONEABLE_CLASS_ID,
-            NotFoundClasses(storageManager, ownerModuleDescriptor)
+            NotFoundClasses(storageManager, settings.ownerModuleDescriptor)
         ).defaultType
     }
 
@@ -117,7 +117,7 @@ open class JvmBuiltInsSettings(
             )
         }
 
-        if (!isAdditionalBuiltInsFeatureSupported) return emptyList()
+        if (!settings.isAdditionalBuiltInsFeatureSupported) return emptyList()
 
         return getAdditionalFunctions(classDescriptor) {
             it.getContributedFunctions(name, NoLookupLocation.FROM_BUILTINS)
@@ -156,7 +156,7 @@ open class JvmBuiltInsSettings(
     }
 
     override fun getFunctionsNames(classDescriptor: ClassDescriptor): Set<Name> {
-        if (!isAdditionalBuiltInsFeatureSupported) return emptySet()
+        if (!settings.isAdditionalBuiltInsFeatureSupported) return emptySet()
         // NB: It's just an approximation that could be calculated relatively fast
         // More precise computation would look like `getAdditionalFunctions` (and the measurements show that it would be rather slow)
         return classDescriptor.getJavaAnalogue()?.unsubstitutedMemberScope?.getFunctionNames() ?: emptySet()
@@ -268,11 +268,11 @@ open class JvmBuiltInsSettings(
         if (!fqName.isSafe) return null
         val javaAnalogueFqName = JavaToKotlinClassMap.mapKotlinToJava(fqName)?.asSingleFqName() ?: return null
 
-        return ownerModuleDescriptor.resolveClassByFqName(javaAnalogueFqName, NoLookupLocation.FROM_BUILTINS) as? LazyJavaClassDescriptor
+        return settings.ownerModuleDescriptor.resolveClassByFqName(javaAnalogueFqName, NoLookupLocation.FROM_BUILTINS) as? LazyJavaClassDescriptor
     }
 
     override fun getConstructors(classDescriptor: ClassDescriptor): Collection<ClassConstructorDescriptor> {
-        if (classDescriptor.kind != ClassKind.CLASS || !isAdditionalBuiltInsFeatureSupported) return emptyList()
+        if (classDescriptor.kind != ClassKind.CLASS || !settings.isAdditionalBuiltInsFeatureSupported) return emptyList()
 
         val javaAnalogueDescriptor = classDescriptor.getJavaAnalogue() ?: return emptyList()
 
@@ -315,7 +315,7 @@ open class JvmBuiltInsSettings(
         val javaAnalogueClassDescriptor = classDescriptor.getJavaAnalogue() ?: return true
 
         if (!functionDescriptor.annotations.hasAnnotation(PLATFORM_DEPENDENT_ANNOTATION_FQ_NAME)) return true
-        if (!isAdditionalBuiltInsFeatureSupported) return false
+        if (!settings.isAdditionalBuiltInsFeatureSupported) return false
 
         val jvmDescriptor = functionDescriptor.computeJvmDescriptor()
         return javaAnalogueClassDescriptor
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt
index 70060296e77..46c75c46533 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt
@@ -53,8 +53,8 @@ class DeserializationComponentsForJava(
             storageManager, moduleDescriptor, configuration, classDataFinder, annotationAndConstantLoader, packageFragmentProvider,
             LocalClassifierTypeSettings.Default, errorReporter, lookupTracker, JavaFlexibleTypeDeserializer,
             emptyList(), notFoundClasses, contractDeserializer,
-            additionalClassPartsProvider = jvmBuiltIns?.settings ?: AdditionalClassPartsProvider.None,
-            platformDependentDeclarationFilter = jvmBuiltIns?.settings ?: PlatformDependentDeclarationFilter.NoPlatformDependent,
+            additionalClassPartsProvider = jvmBuiltIns?.customizer ?: AdditionalClassPartsProvider.None,
+            platformDependentDeclarationFilter = jvmBuiltIns?.customizer ?: PlatformDependentDeclarationFilter.NoPlatformDependent,
             extensionRegistryLite = JvmProtoBufUtil.EXTENSION_REGISTRY,
             kotlinTypeChecker = kotlinTypeChecker, samConversionResolver = SamConversionResolverImpl(storageManager, emptyList())
         )
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt
index 65278113123..5195c89b22b 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.deserialization.ClassData
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import javax.inject.Inject
 
@@ -53,7 +54,7 @@ class DeserializedDescriptorResolver {
             JvmProtoBufUtil.readClassDataFrom(data, strings)
         } ?: return null
         val source = KotlinJvmBinarySourceElement(
-            kotlinClass, kotlinClass.incompatibility, kotlinClass.isPreReleaseInvisible, kotlinClass.isInvisibleJvmIrDependency
+            kotlinClass, kotlinClass.incompatibility, kotlinClass.isPreReleaseInvisible, kotlinClass.abiStability
         )
         return ClassData(nameResolver, classProto, kotlinClass.classHeader.metadataVersion, source)
     }
@@ -66,7 +67,7 @@ class DeserializedDescriptorResolver {
         } ?: return null
         val source = JvmPackagePartSource(
             kotlinClass, packageProto, nameResolver, kotlinClass.incompatibility, kotlinClass.isPreReleaseInvisible,
-            kotlinClass.isInvisibleJvmIrDependency
+            kotlinClass.abiStability
         )
         return DeserializedPackageMemberScope(
             descriptor, packageProto, nameResolver, kotlinClass.classHeader.metadataVersion, source, components
@@ -97,8 +98,13 @@ class DeserializedDescriptorResolver {
         get() = !components.configuration.skipPrereleaseCheck &&
                 classHeader.isPreRelease && classHeader.metadataVersion == KOTLIN_1_3_M1_METADATA_VERSION
 
-    private val KotlinJvmBinaryClass.isInvisibleJvmIrDependency: Boolean
-        get() = components.configuration.reportErrorsOnIrDependencies && classHeader.isUnstableJvmIrBinary
+    private val KotlinJvmBinaryClass.abiStability: DeserializedContainerAbiStability
+        get() = when {
+            components.configuration.allowUnstableDependencies -> DeserializedContainerAbiStability.STABLE
+            classHeader.isUnstableFirBinary -> DeserializedContainerAbiStability.FIR_UNSTABLE
+            classHeader.isUnstableJvmIrBinary -> DeserializedContainerAbiStability.IR_UNSTABLE
+            else -> DeserializedContainerAbiStability.STABLE
+        }
 
     private fun readData(kotlinClass: KotlinJvmBinaryClass, expectedKinds: Set<KotlinClassHeader.Kind>): Array<String>? {
         val header = kotlinClass.classHeader
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt
index eaa3b5c795f..6864c7686cb 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/inlineClassManglingRules.kt
@@ -35,7 +35,7 @@ fun requiresFunctionNameManglingForParameterTypes(descriptor: CallableMemberDesc
 fun requiresFunctionNameManglingForReturnType(descriptor: CallableMemberDescriptor): Boolean {
     if (descriptor.containingDeclaration !is ClassDescriptor) return false
     val returnType = descriptor.returnType ?: return false
-    return returnType.isInlineClassType()
+    return returnType.isInlineClassType() || returnType.isTypeParameterWithUpperBoundThatRequiresMangling()
 }
 
 fun DeclarationDescriptor.isInlineClassThatRequiresMangling(): Boolean =
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt
index 2d976a2ede2..bcf70256ced 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt
@@ -85,7 +85,7 @@ class RuntimeModuleData private constructor(
             // .kotlin_builtins files should be found by the same class loader that loaded stdlib classes
             val stdlibClassLoader = Unit::class.java.classLoader
             val builtinsProvider = JvmBuiltInsPackageFragmentProvider(
-                storageManager, ReflectKotlinClassFinder(stdlibClassLoader), module, notFoundClasses, builtIns.settings, builtIns.settings,
+                storageManager, ReflectKotlinClassFinder(stdlibClassLoader), module, notFoundClasses, builtIns.customizer, builtIns.customizer,
                 DeserializationConfiguration.Default, NewKotlinTypeChecker.Default, SamConversionResolverImpl(storageManager, emptyList())
             )
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
index 44a5838c22b..90beb46f1ac 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
@@ -79,6 +79,23 @@ class FilteredAnnotations(
         }
 }
 
+class FilteredByPredicateAnnotations(
+    private val delegate: Annotations,
+    private val filter: (AnnotationDescriptor) -> Boolean
+) : Annotations {
+    override fun isEmpty(): Boolean {
+        return !iterator().hasNext()
+    }
+
+    override fun iterator(): Iterator<AnnotationDescriptor> {
+        return delegate.filter(filter).iterator()
+    }
+
+    override fun findAnnotation(fqName: FqName): AnnotationDescriptor? {
+        return super.findAnnotation(fqName)?.takeIf(filter)
+    }
+}
+
 class CompositeAnnotations(
     private val delegates: List<Annotations>
 ) : Annotations {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java
index df56e1e7249..a2a04279f70 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java
@@ -21,10 +21,12 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor;
 import org.jetbrains.kotlin.descriptors.annotations.Annotations;
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
+import org.jetbrains.kotlin.types.KotlinType;
+import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt;
 
 public class ReceiverParameterDescriptorImpl extends AbstractReceiverParameterDescriptor {
     private final DeclarationDescriptor containingDeclaration;
-    private final ReceiverValue value;
+    private ReceiverValue value;
 
     public ReceiverParameterDescriptorImpl(
             @NotNull DeclarationDescriptor containingDeclaration,
@@ -53,4 +55,9 @@ public class ReceiverParameterDescriptorImpl extends AbstractReceiverParameterDe
     public ReceiverParameterDescriptor copy(@NotNull DeclarationDescriptor newOwner) {
         return new ReceiverParameterDescriptorImpl(newOwner, value, getAnnotations());
     }
+
+    public void setOutType(@NotNull KotlinType outType) {
+        assert TypeUtilsKt.shouldBeSubstituted(this.value.getType());
+        this.value = value.replaceType(outType);
+    }
 }
diff --git a/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
index fd24fcd2342..418779741af 100644
--- a/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
+++ b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 
 class JvmPackagePartSource(
@@ -25,7 +26,7 @@ class JvmPackagePartSource(
     nameResolver: NameResolver,
     override val incompatibility: IncompatibleVersionErrorData<JvmMetadataVersion>? = null,
     override val isPreReleaseInvisible: Boolean = false,
-    override val isInvisibleIrDependency: Boolean = false,
+    override val abiStability: DeserializedContainerAbiStability = DeserializedContainerAbiStability.STABLE,
     val knownJvmBinaryClass: KotlinJvmBinaryClass? = null
 ) : DeserializedContainerSource {
     constructor(
@@ -34,7 +35,7 @@ class JvmPackagePartSource(
         nameResolver: NameResolver,
         incompatibility: IncompatibleVersionErrorData<JvmMetadataVersion>? = null,
         isPreReleaseInvisible: Boolean = false,
-        isInvisibleIrDependency: Boolean = false
+        abiStability: DeserializedContainerAbiStability = DeserializedContainerAbiStability.STABLE,
     ) : this(
         JvmClassName.byClassId(kotlinClass.classId),
         kotlinClass.classHeader.multifileClassName?.let {
@@ -44,7 +45,7 @@ class JvmPackagePartSource(
         nameResolver,
         incompatibility,
         isPreReleaseInvisible,
-        isInvisibleIrDependency,
+        abiStability,
         kotlinClass
     )
 
diff --git a/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
index 9d088888b7a..27114c687b2 100644
--- a/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
+++ b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt
@@ -19,13 +19,14 @@ package org.jetbrains.kotlin.load.kotlin
 import org.jetbrains.kotlin.descriptors.SourceFile
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
 import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 
 class KotlinJvmBinarySourceElement(
     val binaryClass: KotlinJvmBinaryClass,
     override val incompatibility: IncompatibleVersionErrorData<JvmMetadataVersion>? = null,
     override val isPreReleaseInvisible: Boolean = false,
-    override val isInvisibleIrDependency: Boolean = false
+    override val abiStability: DeserializedContainerAbiStability = DeserializedContainerAbiStability.STABLE,
 ) : DeserializedContainerSource {
     override val presentableString: String
         get() = "Class '${binaryClass.classId.asSingleFqName().asString()}'"
diff --git a/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
index 9bd443d5d69..6a8bc7a8eaf 100644
--- a/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
+++ b/core/deserialization.common.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.load.kotlin.header
 
-import org.jetbrains.kotlin.load.java.JvmAnnotationNames
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames.*
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.MultifileClassKind.DELEGATING
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.MultifileClassKind.INHERITING
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion
@@ -54,21 +54,25 @@ class KotlinClassHeader(
     @Suppress("unused")
     val multifileClassKind: MultifileClassKind?
         get() = if (kind == Kind.MULTIFILE_CLASS || kind == Kind.MULTIFILE_CLASS_PART) {
-            if ((extraInt and JvmAnnotationNames.METADATA_MULTIFILE_PARTS_INHERIT_FLAG) != 0)
+            if (extraInt.has(METADATA_MULTIFILE_PARTS_INHERIT_FLAG))
                 INHERITING
             else
                 DELEGATING
         } else null
 
     val isUnstableJvmIrBinary: Boolean
-        get() = (extraInt and JvmAnnotationNames.METADATA_JVM_IR_FLAG) != 0 &&
-                (extraInt and JvmAnnotationNames.METADATA_JVM_IR_STABLE_ABI_FLAG == 0)
+        get() = extraInt.has(METADATA_JVM_IR_FLAG) && !extraInt.has(METADATA_JVM_IR_STABLE_ABI_FLAG)
+
+    val isUnstableFirBinary: Boolean
+        get() = extraInt.has(METADATA_FIR_FLAG) && !extraInt.has(METADATA_JVM_IR_STABLE_ABI_FLAG)
 
     val isPreRelease: Boolean
-        get() = (extraInt and JvmAnnotationNames.METADATA_PRE_RELEASE_FLAG) != 0
+        get() = extraInt.has(METADATA_PRE_RELEASE_FLAG)
 
     val isScript: Boolean
-        get() = (extraInt and JvmAnnotationNames.METADATA_SCRIPT_FLAG) != 0
+        get() = extraInt.has(METADATA_SCRIPT_FLAG)
 
     override fun toString() = "$kind version=$metadataVersion"
+
+    private fun Int.has(flag: Int): Boolean = (this and flag) != 0
 }
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializationConfiguration.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializationConfiguration.kt
index 84050087374..0de6b01882e 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializationConfiguration.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializationConfiguration.kt
@@ -15,7 +15,7 @@ interface DeserializationConfiguration {
     val reportErrorsOnPreReleaseDependencies: Boolean
         get() = false
 
-    val reportErrorsOnIrDependencies: Boolean
+    val allowUnstableDependencies: Boolean
         get() = false
 
     val typeAliasesAllowed: Boolean
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
index 5ae93d8ca57..14aad06748c 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
+++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.storage;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
+import kotlin.jvm.functions.Function2;
 import kotlin.text.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -56,7 +57,7 @@ public class LockBasedStorageManager implements StorageManager {
     public static final StorageManager NO_LOCKS = new LockBasedStorageManager("NO_LOCKS", ExceptionHandlingStrategy.THROW, EmptySimpleLock.INSTANCE) {
         @NotNull
         @Override
-        protected <T> RecursionDetectedResult<T> recursionDetectedDefault() {
+        protected <K, V> RecursionDetectedResult<V> recursionDetectedDefault(@NotNull String source, K input) {
             return RecursionDetectedResult.fallThrough();
         }
     };
@@ -123,6 +124,15 @@ public class LockBasedStorageManager implements StorageManager {
         return createMemoizedFunction(compute, LockBasedStorageManager.<K>createConcurrentHashMap());
     }
 
+    @NotNull
+    @Override
+    public <K, V> MemoizedFunctionToNotNull<K, V> createMemoizedFunction(
+            @NotNull Function1<? super K, ? extends V> compute,
+            @NotNull Function2<? super K, ? super Boolean, ? extends V> onRecursiveCall
+    ) {
+        return createMemoizedFunction(compute, onRecursiveCall, LockBasedStorageManager.<K>createConcurrentHashMap());
+    }
+
     @NotNull
     @Override
     public <K, V> MemoizedFunctionToNotNull<K, V> createMemoizedFunction(
@@ -132,6 +142,22 @@ public class LockBasedStorageManager implements StorageManager {
         return new MapBasedMemoizedFunctionToNotNull<K, V>(this, map, compute);
     }
 
+    @NotNull
+    @Override
+    public <K, V> MemoizedFunctionToNotNull<K, V> createMemoizedFunction(
+            @NotNull Function1<? super K, ? extends V> compute,
+            @NotNull final Function2<? super K, ? super Boolean, ? extends V> onRecursiveCall,
+            @NotNull ConcurrentMap<K, Object> map
+    ) {
+        return new MapBasedMemoizedFunctionToNotNull<K, V>(this, map, compute) {
+            @NotNull
+            @Override
+            protected RecursionDetectedResult<V> recursionDetected(K input, boolean firstTime) {
+                return RecursionDetectedResult.value(onRecursiveCall.invoke(input, firstTime));
+            }
+        };
+    }
+
     @NotNull
     @Override
     public <K, V> MemoizedFunctionToNullable<K, V> createMemoizedFunctionWithNullableValues(@NotNull Function1<? super K, ? extends V> compute) {
@@ -278,8 +304,15 @@ public class LockBasedStorageManager implements StorageManager {
     }
 
     @NotNull
-    protected <T> RecursionDetectedResult<T> recursionDetectedDefault() {
-        throw sanitizeStackTrace(new IllegalStateException("Recursive call in a lazy value under " + this));
+    protected <K, V> RecursionDetectedResult<V> recursionDetectedDefault(@NotNull String source, K input) {
+        throw sanitizeStackTrace(
+                new AssertionError("Recursion detected " + source +
+                        (input == null
+                         ? ""
+                         : "on input: " + input
+                         ) + " under " + this
+                )
+        );
     }
 
     private static class RecursionDetectedResult<T> {
@@ -406,7 +439,7 @@ public class LockBasedStorageManager implements StorageManager {
          */
         @NotNull
         protected RecursionDetectedResult<T> recursionDetected(boolean firstTime) {
-            return storageManager.recursionDetectedDefault();
+            return storageManager.recursionDetectedDefault("in a lazy value", null);
         }
 
         protected void postCompute(T value) {
@@ -521,9 +554,22 @@ public class LockBasedStorageManager implements StorageManager {
             storageManager.lock.lock();
             try {
                 value = cache.get(input);
+
                 if (value == NotValue.COMPUTING) {
-                    throw recursionDetected(input);
+                    value = NotValue.RECURSION_WAS_DETECTED;
+                    RecursionDetectedResult<V> result = recursionDetected(input, /*firstTime = */ true);
+                    if (!result.isFallThrough()) {
+                        return result.getValue();
+                    }
                 }
+
+                if (value == NotValue.RECURSION_WAS_DETECTED) {
+                    RecursionDetectedResult<V> result = recursionDetected(input, /*firstTime = */ false);
+                    if (!result.isFallThrough()) {
+                        return result.getValue();
+                    }
+                }
+
                 if (value != null) return WrappedValues.unescapeExceptionOrNull(value);
 
                 AssertionError error = null;
@@ -567,10 +613,8 @@ public class LockBasedStorageManager implements StorageManager {
         }
 
         @NotNull
-        private AssertionError recursionDetected(K input) {
-            return sanitizeStackTrace(
-                    new AssertionError("Recursion detected on input: " + input + " under " + storageManager)
-            );
+        protected RecursionDetectedResult<V> recursionDetected(K input, boolean firstTime) {
+            return storageManager.recursionDetectedDefault("", input);
         }
 
         @NotNull
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/ObservableStorageManager.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/ObservableStorageManager.kt
index 24cf4933923..141299df18d 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/storage/ObservableStorageManager.kt
+++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/ObservableStorageManager.kt
@@ -26,6 +26,10 @@ abstract class ObservableStorageManager(private val delegate: StorageManager) :
         return delegate.createMemoizedFunction(compute.observable)
     }
 
+    override fun <K, V : Any> createMemoizedFunction(compute: (K) -> V, onRecursiveCall: (K, Boolean) -> V): MemoizedFunctionToNotNull<K, V> {
+        return delegate.createMemoizedFunction(compute.observable, onRecursiveCall)
+    }
+
     override fun <K, V: Any> createMemoizedFunctionWithNullableValues(compute: (K) -> V?): MemoizedFunctionToNullable<K, V> {
         return delegate.createMemoizedFunctionWithNullableValues(compute.observable)
     }
@@ -34,6 +38,10 @@ abstract class ObservableStorageManager(private val delegate: StorageManager) :
         return delegate.createMemoizedFunction(compute.observable, map)
     }
 
+    override fun <K, V : Any> createMemoizedFunction(compute: (K) -> V, onRecursiveCall: (K, Boolean) -> V, map: ConcurrentMap<K, Any>): MemoizedFunctionToNotNull<K, V> {
+        return delegate.createMemoizedFunction(compute.observable, onRecursiveCall, map)
+    }
+
     override fun <K, V: Any> createMemoizedFunctionWithNullableValues(compute: (K) -> V, map: ConcurrentMap<K, Any>): MemoizedFunctionToNullable<K, V> {
         return delegate.createMemoizedFunctionWithNullableValues(compute.observable, map)
     }
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt b/core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt
index 83e8f11d6eb..b517f0a5063 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt
+++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/StorageManager.kt
@@ -29,6 +29,8 @@ interface StorageManager {
      */
     fun <K, V : Any> createMemoizedFunction(compute: (K) -> V): MemoizedFunctionToNotNull<K, V>
 
+    fun <K, V : Any> createMemoizedFunction(compute: (K) -> V, onRecursiveCall: (K, Boolean) -> V): MemoizedFunctionToNotNull<K, V>
+
     fun <K, V : Any> createMemoizedFunctionWithNullableValues(compute: (K) -> V?): MemoizedFunctionToNullable<K, V>
 
     fun <K, V : Any> createCacheWithNullableValues(): CacheWithNullableValues<K, V>
@@ -36,6 +38,8 @@ interface StorageManager {
 
     fun <K, V : Any> createMemoizedFunction(compute: (K) -> V, map: ConcurrentMap<K, Any>): MemoizedFunctionToNotNull<K, V>
 
+    fun <K, V : Any> createMemoizedFunction(compute: (K) -> V, onRecursiveCall: (K, Boolean) -> V, map: ConcurrentMap<K, Any>): MemoizedFunctionToNotNull<K, V>
+
     fun <K, V : Any> createMemoizedFunctionWithNullableValues(compute: (K) -> V, map: ConcurrentMap<K, Any>): MemoizedFunctionToNullable<K, V>
 
     fun <T : Any> createLazyValue(computable: () -> T): NotNullLazyValue<T>
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt
index 74b023e01cb..1e193ce59b4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CommonPlatformKindResolution.kt
@@ -14,6 +14,7 @@ import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters
 import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory
+import org.jetbrains.kotlin.analyzer.ResolverForProject
 import org.jetbrains.kotlin.analyzer.common.CommonAnalysisParameters
 import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
@@ -22,6 +23,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.caches.project.SdkInfo
 import org.jetbrains.kotlin.idea.caches.resolve.BuiltInsCacheKey
@@ -53,7 +55,12 @@ class CommonPlatformKindResolution : IdePlatformKindResolution {
 
     override fun getKeyForBuiltIns(moduleInfo: ModuleInfo, sdkInfo: SdkInfo?): BuiltInsCacheKey = BuiltInsCacheKey.DefaultBuiltInsKey
 
-    override fun createBuiltIns(moduleInfo: ModuleInfo, projectContext: ProjectContext, sdkDependency: SdkInfo?): KotlinBuiltIns {
+    override fun createBuiltIns(
+        moduleInfo: IdeaModuleInfo,
+        projectContext: ProjectContext,
+        resolverForProject: ResolverForProject<IdeaModuleInfo>,
+        sdkDependency: SdkInfo?
+    ): KotlinBuiltIns {
         return DefaultBuiltIns.Instance
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt
index 5026d5e1968..3e0e51e0144 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt
@@ -23,12 +23,14 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters
 import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory
+import org.jetbrains.kotlin.analyzer.ResolverForProject
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
 import org.jetbrains.kotlin.extensions.ApplicationExtensionDescriptor
+import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.caches.project.SdkInfo
 import org.jetbrains.kotlin.idea.caches.resolve.BuiltInsCacheKey
@@ -41,7 +43,12 @@ interface IdePlatformKindResolution {
     val kind: IdePlatformKind<*>
 
     fun getKeyForBuiltIns(moduleInfo: ModuleInfo, sdkInfo: SdkInfo?): BuiltInsCacheKey
-    fun createBuiltIns(moduleInfo: ModuleInfo, projectContext: ProjectContext, sdkDependency: SdkInfo?): KotlinBuiltIns
+    fun createBuiltIns(
+        moduleInfo: IdeaModuleInfo,
+        projectContext: ProjectContext,
+        resolverForProject: ResolverForProject<IdeaModuleInfo>,
+        sdkDependency: SdkInfo?
+    ): KotlinBuiltIns
 
     fun createResolverForModuleFactory(
         settings: PlatformAnalysisParameters,
@@ -88,4 +95,4 @@ interface IdePlatformKindResolution {
 }
 
 val IdePlatformKind<*>.resolution: IdePlatformKindResolution
-    get() = IdePlatformKindResolution.getResolution(this)
\ No newline at end of file
+    get() = IdePlatformKindResolution.getResolution(this)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt
index be7bbd93739..28a99bcefb2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JsPlatformKindResolution.kt
@@ -14,12 +14,14 @@ import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters
 import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory
+import org.jetbrains.kotlin.analyzer.ResolverForProject
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.caches.project.SdkInfo
 import org.jetbrains.kotlin.idea.caches.resolve.BuiltInsCacheKey
@@ -53,7 +55,12 @@ class JsPlatformKindResolution : IdePlatformKindResolution {
         return BuiltInsCacheKey.DefaultBuiltInsKey
     }
 
-    override fun createBuiltIns(moduleInfo: ModuleInfo, projectContext: ProjectContext, sdkDependency: SdkInfo?): KotlinBuiltIns {
+    override fun createBuiltIns(
+        moduleInfo: IdeaModuleInfo,
+        projectContext: ProjectContext,
+        resolverForProject: ResolverForProject<IdeaModuleInfo>,
+        sdkDependency: SdkInfo?
+    ): KotlinBuiltIns {
         return DefaultBuiltIns.Instance
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt
index 4c0d94ca12e..7494a075a35 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/JvmPlatformKindResolution.kt
@@ -13,13 +13,16 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters
 import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory
+import org.jetbrains.kotlin.analyzer.ResolverForProject
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.context.ProjectContext
+import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.caches.project.SdkInfo
 import org.jetbrains.kotlin.idea.caches.resolve.BuiltInsCacheKey
+import org.jetbrains.kotlin.idea.caches.resolve.supportsAdditionalBuiltInsMembers
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
@@ -52,9 +55,23 @@ class JvmPlatformKindResolution : IdePlatformKindResolution {
         return if (sdkInfo != null) CacheKeyBySdk(sdkInfo.sdk) else BuiltInsCacheKey.DefaultBuiltInsKey
     }
 
-    override fun createBuiltIns(moduleInfo: ModuleInfo, projectContext: ProjectContext, sdkDependency: SdkInfo?): KotlinBuiltIns {
+    override fun createBuiltIns(
+        moduleInfo: IdeaModuleInfo,
+        projectContext: ProjectContext,
+        resolverForProject: ResolverForProject<IdeaModuleInfo>,
+        sdkDependency: SdkInfo?
+    ): KotlinBuiltIns {
         return if (sdkDependency != null)
-            JvmBuiltIns(projectContext.storageManager, JvmBuiltIns.Kind.FROM_CLASS_LOADER)
+            JvmBuiltIns(projectContext.storageManager, JvmBuiltIns.Kind.FROM_CLASS_LOADER).apply {
+                setPostponedSettingsComputation {
+                    // SDK should be present, otherwise we wouldn't have created JvmBuiltIns in createBuiltIns
+                    val sdkDescriptor = resolverForProject.descriptorForModule(sdkDependency)
+
+                    val isAdditionalBuiltInsFeaturesSupported =
+                        moduleInfo.supportsAdditionalBuiltInsMembers(projectContext.project)
+                    JvmBuiltIns.Settings(sdkDescriptor, isAdditionalBuiltInsFeaturesSupported)
+                }
+            }
         else
             DefaultBuiltIns.Instance
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
index 805f6ed485b..20e854c418d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
@@ -276,11 +276,10 @@ open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSu
         val relativeFqName = getClassRelativeName(decompiledClassOrObject) ?: return null
         val iterator = relativeFqName.pathSegments().iterator()
         val base = iterator.next()
-        assert(rootLightClassForDecompiledFile.name == base.asString()) {
-            "Light class for file:\n" + decompiledClassOrObject.containingKtFile.virtualFile.canonicalPath +
-                    "\nwas expected to have name: " + base.asString() +
-                    "\n Actual: " + rootLightClassForDecompiledFile.name
-        }
+
+        // In case class files have been obfuscated (i.e., SomeClass belongs to a.class file), just ignore them
+        if (rootLightClassForDecompiledFile.name != base.asString()) return null
+
         var current: KtLightClassForDecompiledDeclaration = rootLightClassForDecompiledFile
         while (iterator.hasNext()) {
             val name = iterator.next()
@@ -349,4 +348,4 @@ open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSu
 
 internal fun PsiElement.getModuleInfoPreferringJvmPlatform(): IdeaModuleInfo {
     return getPlatformModuleInfo(JvmPlatforms.unspecifiedJvmPlatform) ?: getModuleInfo()
-}
\ No newline at end of file
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
index 10e7d6de911..1aa494cd018 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt
@@ -10,7 +10,6 @@ import com.intellij.openapi.util.ModificationTracker
 import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.analyzer.common.CommonAnalysisParameters
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.caches.resolve.CompositeAnalyzerServices
 import org.jetbrains.kotlin.caches.resolve.CompositeResolverForModuleFactory
 import org.jetbrains.kotlin.caches.resolve.KotlinCacheService
@@ -145,21 +144,12 @@ class IdeaResolverForProject(
             val cachedBuiltIns = cache[key]
             if (cachedBuiltIns != null) return@compute cachedBuiltIns
 
-            // Note #1: we can't use .getOrPut, because we have to put builtIns into map *before* initialization
-            // Note #2: it's OK to put not-initialized built-ins into public map, because access to [cache] is guarded by storageManager.lock
-            val newBuiltIns = module.platform.idePlatformKind.resolution.createBuiltIns(module, projectContextFromSdkResolver, sdk)
-            cache[key] = newBuiltIns
-
-            if (newBuiltIns is JvmBuiltIns) {
-                // SDK should be present, otherwise we wouldn't have created JvmBuiltIns in createBuiltIns
-                val sdkDescriptor = resolverForSdk.descriptorForModule(sdk!!)
-
-                val isAdditionalBuiltInsFeaturesSupported = module.supportsAdditionalBuiltInsMembers(projectContextFromSdkResolver.project)
-
-                newBuiltIns.initialize(sdkDescriptor, isAdditionalBuiltInsFeaturesSupported)
-            }
-
-            return@compute newBuiltIns
+            module.platform.idePlatformKind.resolution
+                .createBuiltIns(module, projectContextFromSdkResolver, resolverForSdk, sdk)
+                .also {
+                    // TODO: MemoizedFunction should be used here instead, but for proper we also need a module (for LV settings) that is not contained in the key
+                    cache[key] = it
+                }
         }
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.kt
index cae41ef0d0a..4ca582e36e6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.kt
@@ -62,7 +62,8 @@ class DebugInfoAnnotator : Annotator {
 
     companion object {
         val isDebugInfoEnabled: Boolean
-            get() = ApplicationManager.getApplication()
-                .isInternal && (KotlinPluginUtil.isSnapshotVersion() || KotlinPluginUtil.isDevVersion())
+            get() = ApplicationManager.getApplication().isUnitTestMode ||
+                    (ApplicationManager.getApplication().isInternal &&
+                            (KotlinPluginUtil.isSnapshotVersion() || KotlinPluginUtil.isDevVersion()))
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
index 593008c7296..35506e98243 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
@@ -192,7 +192,7 @@ private class ElementAnnotator(
         val factory = diagnostic.factory
 
         // hack till the root cause #KT-21246 is fixed
-        if (isIrCompileClassDiagnosticForModulesWithEnabledIR(diagnostic)) return
+        if (isUnstableAbiClassDiagnosticForModulesWithEnabledUnstableAbi(diagnostic)) return
 
         assert(diagnostics.all { it.psiElement == element && it.factory == factory })
 
@@ -272,16 +272,18 @@ private class ElementAnnotator(
         data.processDiagnostics(holder, diagnostics, fixesMap)
     }
 
-    private fun isIrCompileClassDiagnosticForModulesWithEnabledIR(diagnostic: Diagnostic): Boolean {
-        if (diagnostic.factory != Errors.IR_COMPILED_CLASS) return false
+    private fun isUnstableAbiClassDiagnosticForModulesWithEnabledUnstableAbi(diagnostic: Diagnostic): Boolean {
+        val setting = when (diagnostic.factory) {
+            Errors.IR_WITH_UNSTABLE_ABI_COMPILED_CLASS -> K2JVMCompilerArguments::useIR
+            Errors.FIR_COMPILED_CLASS -> K2JVMCompilerArguments::useFir
+            else -> return false
+        }
         val module = element.module ?: return false
         val moduleFacetSettings = KotlinFacetSettingsProvider.getInstance(element.project)?.getSettings(module) ?: return false
-        return moduleFacetSettings.isCompilerSettingPresent(K2JVMCompilerArguments::useIR)
-                || moduleFacetSettings.isCompilerSettingPresent(K2JVMCompilerArguments::allowJvmIrDependencies)
+        return moduleFacetSettings.isCompilerSettingPresent(setting)
     }
 
     companion object {
         val LOG = Logger.getInstance(ElementAnnotator::class.java)
     }
 }
-
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/trackers/KotlinFE10OutOfBlockModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/trackers/KotlinFE10OutOfBlockModificationTracker.kt
new file mode 100644
index 00000000000..ac191961816
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/trackers/KotlinFE10OutOfBlockModificationTracker.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2020 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.trackers
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.util.ModificationTracker
+
+class KotlinFE10OutOfBlockModificationTracker : KotlinOutOfBlockModificationTrackerFactory() {
+    override fun createProjectWideOutOfBlockModificationTracker(): ModificationTracker =
+        throwUnsupportedError()
+
+    override fun createModuleWithoutDependenciesOutOfBlockModificationTracker(module: Module): ModificationTracker =
+        throwUnsupportedError()
+
+    private fun throwUnsupportedError(): Nothing =
+        error("Supported only for FIR plugin now, sorry, consider using KotlinModificationTrackerService instead")
+}
\ No newline at end of file
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt
index 5e7e43cfe77..c13ea6e52c6 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ucache/ScriptClassRootsUpdater.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.core.script.ucache
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.components.service
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
@@ -27,6 +28,7 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesModificationTrack
 import org.jetbrains.kotlin.idea.core.script.configuration.CompositeScriptConfigurationManager
 import org.jetbrains.kotlin.idea.core.script.scriptingDebugLog
 import org.jetbrains.kotlin.idea.core.util.EDT
+import org.jetbrains.kotlin.idea.util.FirPluginOracleService
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.KtFile
@@ -243,6 +245,14 @@ abstract class ScriptClassRootsUpdater(
 
         if (openedScripts.isEmpty()) return
 
+        /**
+         * Scripts guts are everywhere in the plugin code, without them some functionality does not work,
+         * And with them some other fir plugin related is broken
+         * As FIR plugin does not have scripts support yet, just disabling not working one for now
+         */
+        @Suppress("DEPRECATION")
+        if (project.service<FirPluginOracleService>().isFirPlugin()) return
+
         GlobalScope.launch(EDT(project)) {
             if (project.isDisposed) return@launch
 
diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/util/FirPluginOracleServiceFirImpl.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/util/FirPluginOracleServiceFirImpl.kt
new file mode 100644
index 00000000000..7c48b5a8c01
--- /dev/null
+++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/util/FirPluginOracleServiceFirImpl.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 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.idea.util
+
+@Suppress("OverridingDeprecatedMember")
+class FirPluginOracleServiceFirImpl : FirPluginOracleService() {
+    override fun isFirPlugin(): Boolean = true
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt
index f23d1512d53..12097480415 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ReadActionConfinementValidityToken.kt
@@ -7,27 +7,36 @@ package org.jetbrains.kotlin.idea.frontend.api
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
+import org.jetbrains.kotlin.trackers.createProjectWideOutOfBlockModificationTracker
 
 class ReadActionConfinementValidityToken(project: Project) : ValidityToken() {
-    private val modificationTracker = KotlinModificationTrackerService.getInstance(project).modificationTracker
+    private val modificationTracker = project.createProjectWideOutOfBlockModificationTracker()
     private val onCreatedTimeStamp = modificationTracker.modificationCount
 
-    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
     override fun isValid(): Boolean {
-        val application = ApplicationManager.getApplication()
-        if (application.isDispatchThread && !allowOnEdt.get()) return false
-        if (!application.isReadAccessAllowed) return false
         return onCreatedTimeStamp == modificationTracker.modificationCount
     }
 
     @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
     override fun getInvalidationReason(): String {
+        if (onCreatedTimeStamp != modificationTracker.modificationCount) return "PSI has changed since creation"
+        error("Getting invalidation reason for valid validity token")
+    }
+
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
+    override fun isAccessible(): Boolean {
+        val application = ApplicationManager.getApplication()
+        if (application.isDispatchThread && !allowOnEdt.get()) return false
+        if (!application.isReadAccessAllowed) return false
+        return true
+    }
+
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
+    override fun getInaccessibilityReason(): String {
         val application = ApplicationManager.getApplication()
         if (application.isDispatchThread && !allowOnEdt.get()) return "Called in EDT thread"
         if (!application.isReadAccessAllowed) return "Called outside read action"
-        if (onCreatedTimeStamp != modificationTracker.modificationCount) return "PSI has changed since creation"
-        error("Getting invalidation reason for valid validity token")
+        error("Getting inaccessibility reason for validity token when it is accessible")
     }
 
     companion object {
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityToken.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityToken.kt
index 69f23509aa7..f8d37e1d82e 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityToken.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityToken.kt
@@ -8,14 +8,23 @@ package org.jetbrains.kotlin.idea.frontend.api
 abstract class ValidityToken {
     abstract fun isValid(): Boolean
     abstract fun getInvalidationReason(): String
+
+    abstract fun isAccessible(): Boolean
+    abstract fun getInaccessibilityReason(): String
 }
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun ValidityToken.assertIsValid() {
+inline fun ValidityToken.assertIsValidAndAccessible() {
     if (!isValid()) {
-        throw InvalidEntityAccessException("Access to invalid $this, invalidation reason is ${getInvalidationReason()}")
+        throw InvalidEntityAccessException("Access to invalid $this: ${getInvalidationReason()}")
+    }
+    if (!isAccessible()) {
+        throw InaccessibleEntityAccessException("$this is inaccessible: ${getInaccessibilityReason()}")
     }
 }
 
-class InvalidEntityAccessException(override val message: String): IllegalStateException()
+abstract class BadEntityAccessException(): IllegalStateException()
+
+class InvalidEntityAccessException(override val message: String) : BadEntityAccessException()
+class InaccessibleEntityAccessException(override val message: String): BadEntityAccessException()
 
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt
index cdd9c6f54a4..4971336c579 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/ValidityTokenOwner.kt
@@ -9,12 +9,14 @@ interface ValidityTokenOwner {
     val token: ValidityToken
 }
 
+fun ValidityTokenOwner.isValid(): Boolean = token.isValid()
+
 @Suppress("NOTHING_TO_INLINE")
-inline fun ValidityTokenOwner.assertIsValid() {
-    token.assertIsValid()
+inline fun ValidityTokenOwner.assertIsValidAndAccessible() {
+    token.assertIsValidAndAccessible()
 }
 
 inline fun <R> ValidityTokenOwner.withValidityAssertion(action: () -> R): R {
-    assertIsValid()
+    assertIsValidAndAccessible()
     return action()
 }
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
index 33d9bcee2f3..d20d21ba9d0 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
     testCompile(projectTests(":idea"))
     testCompile(project(":idea:idea-fir"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler:fir:analysis-tests"))
+    testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testCompile(projectTests(":idea:idea-test-framework"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
index 69f5e4609b5..9ab4158ef0b 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSessionProvide
 import org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirOutOfBlockModificationTrackerFactory
 import org.jetbrains.kotlin.idea.util.cachedValue
 import org.jetbrains.kotlin.idea.util.getValue
+import org.jetbrains.kotlin.trackers.createProjectWideOutOfBlockModificationTracker
 import java.util.concurrent.ConcurrentHashMap
 
 internal class FirIdeResolveStateService(project: Project) {
@@ -24,7 +25,7 @@ internal class FirIdeResolveStateService(project: Project) {
 
     private val stateCache by cachedValue(
         project,
-        project.service<KotlinFirOutOfBlockModificationTrackerFactory>().createProjectWideOutOfBlockModificationTracker(),
+        project.createProjectWideOutOfBlockModificationTracker(),
         ProjectRootModificationTracker.getInstance(project),
     ) {
         ConcurrentHashMap<IdeaModuleInfo, FirModuleResolveStateImpl>()
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt
index 673445ef24f..608cda97437 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateForCompletion.kt
@@ -35,7 +35,6 @@ internal class FirModuleResolveStateForCompletion(
     override val moduleInfo: IdeaModuleInfo get() = originalState.moduleInfo
 
     override val rootModuleSession get() = originalState.rootModuleSession
-    override val firTransformerProvider: FirTransformerProvider get() = originalState.firTransformerProvider
     private val fileStructureCache = originalState.fileStructureCache
 
     private val completionMapping = mutableMapOf<KtElement, FirElement>()
@@ -48,6 +47,7 @@ internal class FirModuleResolveStateForCompletion(
         synchronized(completionMapping) { completionMapping[psi] }?.let { return it }
         return originalState.elementBuilder.getOrBuildFirFor(
             element,
+            originalState.firFileBuilder,
             originalState.rootModuleSession.cache,
             fileStructureCache,
         )
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt
index 6abf1c19627..9691fd39509 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirModuleResolveStateImpl.kt
@@ -44,7 +44,6 @@ internal class FirModuleResolveStateImpl(
     val firLazyDeclarationResolver: FirLazyDeclarationResolver,
 ) : FirModuleResolveState() {
     override val rootModuleSession: FirIdeSourcesSession get() = sessionProvider.rootModuleSession
-    override val firTransformerProvider: FirTransformerProvider get() = firFileBuilder.firPhaseRunner.transformerProvider
     val fileStructureCache = FileStructureCache(firFileBuilder, firLazyDeclarationResolver)
     val elementBuilder = FirElementBuilder()
     private val diagnosticsCollector = DiagnosticsCollector(fileStructureCache, rootModuleSession.cache)
@@ -53,7 +52,7 @@ internal class FirModuleResolveStateImpl(
         sessionProvider.getSession(moduleInfo)!!
 
     override fun getOrBuildFirFor(element: KtElement): FirElement =
-        elementBuilder.getOrBuildFirFor(element, rootModuleSession.cache, fileStructureCache)
+        elementBuilder.getOrBuildFirFor(element, firFileBuilder, rootModuleSession.cache, fileStructureCache)
 
     override fun getFirFile(ktFile: KtFile): FirFile =
         firFileBuilder.buildRawFirFileWithCaching(ktFile, rootModuleSession.cache, lazyBodiesMode = false)
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt
index 1f5584d74b8..12d3be6addb 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt
@@ -7,28 +7,30 @@ package org.jetbrains.kotlin.idea.fir.low.level.api
 
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.resolve.ScopeSession
+import org.jetbrains.kotlin.fir.resolve.transformers.createTransformerBasedProcessorByPhase
 import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.FirLazyBodiesCalculator
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.executeWithoutPCE
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock
 
-internal class FirPhaseRunner(val transformerProvider: FirTransformerProvider) {
+internal class FirPhaseRunner {
     private val superTypesBodyResolveLock = ReentrantLock()
     private val statusResolveLock = ReentrantLock()
     private val implicitTypesResolveLock = ReentrantLock()
 
-    fun runPhase(firFile: FirFile, phase: FirResolvePhase) = when (phase) {
+    fun runPhase(firFile: FirFile, phase: FirResolvePhase, scopeSession: ScopeSession) = when (phase) {
         FirResolvePhase.SUPER_TYPES -> superTypesBodyResolveLock.withLock {
-            runPhaseWithoutLock(firFile, phase)
+            runPhaseWithoutLock(firFile, phase, scopeSession)
         }
         FirResolvePhase.STATUS -> statusResolveLock.withLock {
-            runPhaseWithoutLock(firFile, phase)
+            runPhaseWithoutLock(firFile, phase, scopeSession)
         }
         FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> implicitTypesResolveLock.withLock {
-            runPhaseWithoutLock(firFile, phase)
+            runPhaseWithoutLock(firFile, phase, scopeSession)
         }
         else -> {
-            runPhaseWithoutLock(firFile, phase)
+            runPhaseWithoutLock(firFile, phase, scopeSession)
         }
     }
 
@@ -54,8 +56,8 @@ internal class FirPhaseRunner(val transformerProvider: FirTransformerProvider) {
     }
 
 
-    private fun runPhaseWithoutLock(firFile: FirFile, phase: FirResolvePhase) {
-        val phaseProcessor = transformerProvider.getTransformerForPhase(firFile.session, phase)
+    private fun runPhaseWithoutLock(firFile: FirFile, phase: FirResolvePhase, scopeSession: ScopeSession) {
+        val phaseProcessor = phase.createTransformerBasedProcessorByPhase(firFile.session, scopeSession)
         executeWithoutPCE {
             FirLazyBodiesCalculator.calculateLazyBodiesIfPhaseRequires(firFile, phase)
             phaseProcessor.processFile(firFile)
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirTransformerProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirTransformerProvider.kt
deleted file mode 100644
index ced4308384b..00000000000
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirTransformerProvider.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2020 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.idea.fir.low.level.api
-
-import com.google.common.collect.MapMaker
-import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.FirSessionComponent
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.resolve.ScopeSession
-import org.jetbrains.kotlin.fir.resolve.transformers.FirTransformerBasedResolveProcessor
-import org.jetbrains.kotlin.fir.resolve.transformers.createTransformerBasedProcessorByPhase
-import java.util.*
-
-class FirTransformerProvider {
-    private val scopeSession = MapMaker().weakKeys().makeMap<FirSession, ScopeSession>()
-    private val transformers = MapMaker().weakKeys().makeMap<FirSession, EnumMap<FirResolvePhase, FirTransformerBasedResolveProcessor>>()
-
-
-    fun getTransformerForPhase(session: FirSession, phase: FirResolvePhase): FirTransformerBasedResolveProcessor =
-        transformers.computeIfAbsent(session) {
-            val scopesSession = getScopeSession(session)
-            EnumMap<FirResolvePhase, FirTransformerBasedResolveProcessor>(FirResolvePhase::class.java).apply {
-                FirResolvePhase.values().forEach { resolvePhase ->
-                    if (resolvePhase != FirResolvePhase.RAW_FIR) {
-                        put(resolvePhase, resolvePhase.createTransformerBasedProcessorByPhase(session, scopesSession))
-                    }
-                }
-            }
-        }.getValue(phase)
-
-    fun getScopeSession(session: FirSession): ScopeSession =
-        scopeSession.getOrPut(session) { ScopeSession() }
-}
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt
index 7b2d1585c34..402fdbe13cf 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/FirModuleResolveState.kt
@@ -11,16 +11,12 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
-import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
-import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirIdeResolveStateService
-import org.jetbrains.kotlin.idea.fir.low.level.api.FirTransformerProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.annotations.InternalForInline
 import org.jetbrains.kotlin.idea.fir.low.level.api.annotations.PrivateForInline
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
-import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSourcesSession
 import org.jetbrains.kotlin.idea.util.getElementTextInContext
@@ -36,8 +32,6 @@ abstract class FirModuleResolveState {
 
     abstract val moduleInfo: IdeaModuleInfo
 
-    abstract val firTransformerProvider: FirTransformerProvider
-
     internal abstract fun getSessionFor(moduleInfo: IdeaModuleInfo): FirSession
 
     internal abstract fun getOrBuildFirFor(element: KtElement): FirElement
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt
index e51d168ec1f..13d6ac803a8 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacade.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.fir.low.level.api.api
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.unwrapFakeOverrides
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
@@ -109,7 +110,7 @@ fun <D : FirDeclaration, R> D.withFirDeclaration(
         -> {
             val cache = session.cache
             val file = resolveState.getFirFile(this, cache)
-                ?: error("Fir file was not found for\n${render()}\n${ktDeclaration.getElementTextInContext()}")
+                ?: error("Fir file was not found for\n${render()}\n${(psi as? KtElement)?.getElementTextInContext()}")
             cache.firFileLockProvider.withReadLock(file) { action(this) }
         }
         else -> action(this)
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
index fdbc9b84ee3..506d43dc07f 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/element/builder/FirElementBuilder.kt
@@ -6,9 +6,13 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.element.builder
 
 import com.intellij.psi.PsiElement
+import com.intellij.psi.util.parentsOfType
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.fir.FirElement
+import org.jetbrains.kotlin.fir.declarations.FirFile
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.idea.fir.low.level.api.annotations.ThreadSafe
+import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.FileStructureCache
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.FileStructureElement
@@ -16,6 +20,7 @@ import org.jetbrains.kotlin.idea.util.getElementTextInContext
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.isAncestor
+import org.jetbrains.kotlin.psi.psiUtil.isObjectLiteral
 import org.jetbrains.kotlin.psi2ir.deparenthesize
 
 /**
@@ -42,12 +47,31 @@ internal class FirElementBuilder {
 
     fun getOrBuildFirFor(
         element: KtElement,
+        firFileBuilder: FirFileBuilder,
         moduleFileCache: ModuleFileCache,
         fileStructureCache: FileStructureCache,
-    ): FirElement {
-        val fileStructure = fileStructureCache.getFileStructure(element.containingKtFile, moduleFileCache)
-        val mappings = fileStructure.getStructureElementFor(element).mappings
+    ): FirElement = when (element) {
+        is KtFile -> getOrBuildFirForKtFile(element, firFileBuilder, moduleFileCache)
+        else -> getOrBuildFirForNonKtFileElement(element, fileStructureCache, moduleFileCache)
+    }
 
+    private fun getOrBuildFirForKtFile(ktFile: KtFile, firFileBuilder: FirFileBuilder, moduleFileCache: ModuleFileCache): FirFile =
+        firFileBuilder.getFirFileResolvedToPhaseWithCaching(
+            ktFile,
+            moduleFileCache,
+            FirResolvePhase.BODY_RESOLVE,
+            checkPCE = true
+        )
+
+    private fun getOrBuildFirForNonKtFileElement(
+        element: KtElement,
+        fileStructureCache: FileStructureCache,
+        moduleFileCache: ModuleFileCache
+    ): FirElement {
+        require(element !is KtFile)
+        val fileStructure = fileStructureCache.getFileStructure(element.containingKtFile, moduleFileCache)
+
+        val mappings = fileStructure.getStructureElementFor(element).mappings
         val psi = getPsiAsFirElementSource(element)
         mappings[psi]?.let { return it }
         return psi.getFirOfClosestParent(mappings)?.second
@@ -83,9 +107,9 @@ internal inline fun PsiElement.getNonLocalContainingOrThisDeclaration(predicate:
     var container: PsiElement? = this
     while (container != null && container !is KtFile) {
         if (container is KtNamedDeclaration
-            && (container is KtClassOrObject || container is KtDeclarationWithBody || container is KtProperty || container is KtTypeAlias)
+            && (container.isNonAnonymousClassOrObject() || container is KtDeclarationWithBody || container is KtProperty || container is KtTypeAlias)
             && container !is KtPrimaryConstructor
-            && !KtPsiUtil.isLocal(container)
+            && container.hasFqName()
             && container !is KtEnumEntry
             && container.containingClassOrObject !is KtEnumEntry
             && predicate(container)
@@ -97,6 +121,14 @@ internal inline fun PsiElement.getNonLocalContainingOrThisDeclaration(predicate:
     return null
 }
 
+private fun KtDeclaration.isNonAnonymousClassOrObject() =
+    this is KtClassOrObject
+            && !this.isObjectLiteral()
+
+
+private fun KtDeclaration.hasFqName(): Boolean =
+    parentsOfType<KtDeclaration>(withSelf = false).all { it.isNonAnonymousClassOrObject() }
+
 internal fun PsiElement.getNonLocalContainingInBodyDeclarationWith(): KtNamedDeclaration? =
     getNonLocalContainingOrThisDeclaration { declaration ->
         when (declaration) {
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt
index a8c1a454db2..c928290114b 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/FirFileBuilder.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.builder.RawFirBuilder
 import org.jetbrains.kotlin.fir.builder.RawFirBuilderMode
 import org.jetbrains.kotlin.fir.declarations.FirFile
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirPhaseRunner
 import org.jetbrains.kotlin.psi.KtFile
@@ -81,10 +82,11 @@ internal class FirFileBuilder(
             "Trying to resolve file ${firFile.name} from $fromPhase to $toPhase"
         }
         var currentPhase = fromPhase
+        val scopeSession = ScopeSession()
         while (currentPhase < toPhase) {
             if (checkPCE) checkCanceled()
             currentPhase = currentPhase.next
-            firPhaseRunner.runPhase(firFile, currentPhase)
+            firPhaseRunner.runPhase(firFile, currentPhase, scopeSession)
         }
     }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt
index 7011942030e..3b4bd676b0a 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt
@@ -6,8 +6,7 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api.file.builder
 
 import com.google.common.collect.MapMaker
-import com.intellij.openapi.diagnostic.logger
-import org.jetbrains.kotlin.fir.declarations.FirFile
+import org.jetbrains.kotlin.idea.fir.low.level.api.annotations.PrivateForInline
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.lockWithPCECheck
 import java.util.concurrent.ConcurrentMap
 import java.util.concurrent.locks.ReadWriteLock
@@ -17,22 +16,51 @@ import kotlin.concurrent.withLock
 internal class LockProvider<KEY> {
     private val locks: ConcurrentMap<KEY, ReadWriteLock> = MapMaker().weakKeys().makeMap()
 
+    @OptIn(PrivateForInline::class)
+    private val deadLockGuard = DeadLockGuard()
+
     @Suppress("NOTHING_TO_INLINE")
     private inline fun getLockFor(key: KEY) = locks.getOrPut(key) { ReentrantReadWriteLock() }
 
+    @OptIn(PrivateForInline::class)
     inline fun <R> withReadLock(key: KEY, action: () -> R): R {
         val readLock = getLockFor(key).readLock()
-        return readLock.withLock { action() }
+        return deadLockGuard.guardReadLock { readLock.withLock { action() } }
     }
 
-
+    @OptIn(PrivateForInline::class)
     inline fun <R> withWriteLock(key: KEY, action: () -> R): R {
         val writeLock = getLockFor(key).writeLock()
-        return writeLock.withLock { action() }
+        return deadLockGuard.guardWriteLock { writeLock.withLock { action() } }
     }
 
+    @OptIn(PrivateForInline::class)
     inline fun <R> withWriteLockPCECheck(key: KEY, lockingIntervalMs: Long, action: () -> R): R {
         val writeLock = getLockFor(key).writeLock()
-        return writeLock.lockWithPCECheck(lockingIntervalMs, action)
+        return deadLockGuard.guardWriteLock { writeLock.lockWithPCECheck(lockingIntervalMs, action) }
     }
-}
\ No newline at end of file
+}
+
+@PrivateForInline
+internal class DeadLockGuard {
+    private val readLocksCount = ThreadLocal.withInitial { 0 }
+
+    inline fun <R> guardReadLock(action: () -> R): R {
+        readLocksCount.set(readLocksCount.get() + 1)
+        return try {
+            action()
+        } finally {
+            readLocksCount.set(readLocksCount.get() - 1)
+        }
+    }
+
+    inline fun <R> guardWriteLock(action: () -> R): R {
+
+        if (readLocksCount.get() > 0) {
+            throw ReadWriteDeadLockException()
+        }
+        return action()
+    }
+}
+
+class ReadWriteDeadLockException : IllegalStateException("Acquiring write lock when read lock hold")
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
index 84a2d623b61..cfb03c16ff9 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.render
 import org.jetbrains.kotlin.fir.resolve.ResolutionMode
+import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.firSymbolProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
@@ -119,6 +120,8 @@ internal class FirLazyDeclarationResolver(
         }
 
         var currentPhase = nonLazyPhase
+        val scopeSession = ScopeSession()
+
         while (currentPhase < toPhase) {
             currentPhase = currentPhase.next
             if (currentPhase.pluginPhase) continue
@@ -129,6 +132,7 @@ internal class FirLazyDeclarationResolver(
                 moduleFileCache,
                 provider,
                 currentPhase,
+                scopeSession,
                 towerDataContextCollector
             )
         }
@@ -140,50 +144,77 @@ internal class FirLazyDeclarationResolver(
         moduleFileCache: ModuleFileCache,
         provider: FirProvider,
         phase: FirResolvePhase,
+        scopeSession: ScopeSession,
         towerDataContextCollector: FirTowerDataContextCollector?,
     ) {
         val nonLocalDeclarationToResolve = firDeclarationToResolve.getNonLocalDeclarationToResolve(provider, moduleFileCache)
 
-        val designation = mutableListOf<FirDeclaration>(containerFirFile)
+        val designation = nonLocalDeclarationToResolve.getDesignation(containerFirFile, provider, moduleFileCache)
 
-        if (nonLocalDeclarationToResolve !is FirFile) {
-            val ktDeclaration = firDeclarationToResolve.ktDeclaration
-            designation += ktDeclaration.parentsOfType<KtClassOrObject>()
+        if (designation.all { it.resolvePhase >= phase }) {
+            return
+        }
+
+        val transformer = phase.createLazyTransformer(
+            designation,
+            firDeclarationToResolve,
+            containerFirFile,
+            scopeSession,
+            towerDataContextCollector
+        )
+
+        firFileBuilder.firPhaseRunner.runPhaseWithCustomResolve(phase) {
+            containerFirFile.transform<FirFile, ResolutionMode>(transformer, ResolutionMode.ContextDependent)
+        }
+    }
+
+    private fun FirResolvePhase.createLazyTransformer(
+        designation: List<FirDeclaration>,
+        targetDeclaration: FirDeclaration,
+        containerFirFile: FirFile,
+        scopeSession: ScopeSession,
+        towerDataContextCollector: FirTowerDataContextCollector?
+    ) = when (this) {
+        FirResolvePhase.CONTRACTS -> FirDesignatedContractsResolveTransformerForIDE(
+            designation.iterator(),
+            targetDeclaration,
+            containerFirFile.session,
+            scopeSession,
+        )
+        FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> FirDesignatedImplicitTypesTransformerForIDE(
+            designation.iterator(),
+            targetDeclaration,
+            containerFirFile.session,
+            scopeSession,
+        )
+        FirResolvePhase.BODY_RESOLVE -> FirDesignatedBodyResolveTransformerForIDE(
+            designation.iterator(),
+            targetDeclaration,
+            containerFirFile.session,
+            scopeSession,
+            towerDataContextCollector
+        )
+        else -> error("Non-lazy phase $this")
+    }
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private fun FirDeclaration.getDesignation(
+        containerFirFile: FirFile,
+        provider: FirProvider,
+        moduleFileCache: ModuleFileCache
+    ): List<FirDeclaration> = buildList {
+        if (this !is FirFile) {
+            val ktDeclaration = ktDeclaration
+            ktDeclaration.parentsOfType<KtClassOrObject>(withSelf = true)
                 .filter { it !is KtEnumEntry }
                 .map { it.findSourceNonLocalFirDeclaration(firFileBuilder, provider.symbolProvider, moduleFileCache, containerFirFile) }
                 .toList()
                 .asReversed()
-            if (nonLocalDeclarationToResolve is FirCallableDeclaration<*>) {
-                designation += nonLocalDeclarationToResolve
+                .let(::addAll)
+            if (this@getDesignation is FirCallableDeclaration<*>) {
+                add(this@getDesignation)
             }
         }
-        if (designation.all { it.resolvePhase >= phase }) {
-            return
-        }
-        val scopeSession = firFileBuilder.firPhaseRunner.transformerProvider.getScopeSession(containerFirFile.session)
-        val transformer = when (phase) {
-            FirResolvePhase.CONTRACTS -> FirDesignatedContractsResolveTransformerForIDE(
-                designation.iterator(),
-                containerFirFile.session,
-                scopeSession,
-            )
-            FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE -> FirDesignatedImplicitTypesTransformerForIDE(
-                designation.iterator(),
-                containerFirFile.session,
-                scopeSession,
-            )
-            FirResolvePhase.BODY_RESOLVE -> FirDesignatedBodyResolveTransformerForIDE(
-                designation.iterator(),
-                containerFirFile.session,
-                scopeSession,
-                towerDataContextCollector
-            )
-            else -> error("Non-lazy phase $phase")
-        }
-
-        firFileBuilder.firPhaseRunner.runPhaseWithCustomResolve(phase) {
-            containerFirFile.transform<FirFile, ResolutionMode>(transformer, ResolutionMode.ContextDependent)
-        }
     }
 
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
index 84379f87c22..0ecb941a0ae 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.fir.session.*
 import org.jetbrains.kotlin.idea.caches.project.*
 import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirPhaseRunner
-import org.jetbrains.kotlin.idea.fir.low.level.api.FirTransformerProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.IdeFirPhaseManager
 import org.jetbrains.kotlin.idea.fir.low.level.api.IdeSessionComponents
 import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProviderStorage.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProviderStorage.kt
index bd6454f6234..3d6bf7b2ad5 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProviderStorage.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionProviderStorage.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.idea.fir.low.level.api.sessions
 
-import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import kotlinx.collections.immutable.PersistentMap
 import kotlinx.collections.immutable.persistentMapOf
@@ -13,18 +12,17 @@ import kotlinx.collections.immutable.toPersistentMap
 import org.jetbrains.kotlin.fir.BuiltinTypes
 import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirPhaseRunner
-import org.jetbrains.kotlin.idea.fir.low.level.api.FirTransformerProvider
 import org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirOutOfBlockModificationTrackerFactory
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.addValueFor
 import org.jetbrains.kotlin.idea.fir.low.level.api.util.executeWithoutPCE
+import org.jetbrains.kotlin.trackers.createModuleWithoutDependenciesOutOfBlockModificationTracker
 import java.util.concurrent.ConcurrentHashMap
 
 internal class FirIdeSessionProviderStorage(private val project: Project) {
     private val sessionsCache = ConcurrentHashMap<ModuleSourceInfo, FromModuleViewSessionCache>()
 
     fun getSessionProvider(rootModule: ModuleSourceInfo): FirIdeSessionProvider {
-        val transformerProvider = FirTransformerProvider()
-        val firPhaseRunner = FirPhaseRunner(transformerProvider)
+        val firPhaseRunner = FirPhaseRunner()
 
         val builtinTypes = BuiltinTypes()
         val builtinsAndCloneableSession = FirIdeSessionFactory.createBuiltinsAndCloneableSession(project, builtinTypes)
@@ -113,8 +111,7 @@ private class FromModuleViewSessionCache(
 private class FirSessionWithModificationTracker(
     val firSession: FirIdeSourcesSession,
 ) {
-    private val modificationTracker = firSession.project.service<KotlinFirOutOfBlockModificationTrackerFactory>()
-        .createModuleWithoutDependenciesOutOfBlockModificationTracker(firSession.moduleInfo.module)
+    private val modificationTracker = firSession.moduleInfo.module.createModuleWithoutDependenciesOutOfBlockModificationTracker()
 
     private val timeStamp = modificationTracker.modificationCount
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt
index 7a3ddd10fd3..3cc34e6c68d 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTracker.kt
@@ -105,6 +105,12 @@ internal class KotlinFirModificationTrackerService(project: Project) : Disposabl
 
         private fun isOutOfBlockChange(node: ASTNode): Boolean {
             val psi = node.psi ?: return true
+            if (!psi.isValid) {
+                /**
+                 * If PSI is not valid, well something bad happened, OOBM won't hurt
+                 */
+                return true
+            }
             val container = psi.getNonLocalContainingInBodyDeclarationWith() ?: return true
             return !FileElementFactory.isReanalyzableContainer(container)
         }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTrackerFactory.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTrackerFactory.kt
index a5ab7fdee93..bb9a4be06d9 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTrackerFactory.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinFirOutOfBlockModificationTrackerFactory.kt
@@ -10,12 +10,13 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.ModificationTracker
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.trackers.KotlinOutOfBlockModificationTrackerFactory
 
-class KotlinFirOutOfBlockModificationTrackerFactory(private val project: Project) {
-    fun createProjectWideOutOfBlockModificationTracker(): ModificationTracker =
+class KotlinFirOutOfBlockModificationTrackerFactory(private val project: Project) : KotlinOutOfBlockModificationTrackerFactory() {
+    override fun createProjectWideOutOfBlockModificationTracker(): ModificationTracker =
         KotlinFirOutOfBlockModificationTracker(project)
 
-    fun createModuleWithoutDependenciesOutOfBlockModificationTracker(module: Module): ModificationTracker =
+    override fun createModuleWithoutDependenciesOutOfBlockModificationTracker(module: Module): ModificationTracker =
         KotlinFirOutOfBlockModuleModificationTracker(module)
 
     @TestOnly
@@ -24,12 +25,6 @@ class KotlinFirOutOfBlockModificationTrackerFactory(private val project: Project
     }
 }
 
-fun Project.createProjectWideOutOfBlockModificationTracker() =
-    service<KotlinFirOutOfBlockModificationTrackerFactory>().createProjectWideOutOfBlockModificationTracker()
-
-fun Module.createModuleWithoutDependenciesOutOfBlockModificationTracker() =
-    project.service<KotlinFirOutOfBlockModificationTrackerFactory>().createModuleWithoutDependenciesOutOfBlockModificationTracker(this)
-
 private class KotlinFirOutOfBlockModificationTracker(project: Project) : ModificationTracker {
     private val trackerService = project.service<KotlinFirModificationTrackerService>()
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedBodyResolveTransformerForIDE.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedBodyResolveTransformerForIDE.kt
index 0458ba0c22c..2968c6b3526 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedBodyResolveTransformerForIDE.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedBodyResolveTransformerForIDE.kt
@@ -21,7 +21,8 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirIdeDesigna
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirTowerDataContextCollector
 
 internal class FirDesignatedBodyResolveTransformerForIDE(
-    private val designation: Iterator<FirElement>,
+    private val designation: Iterator<FirDeclaration>,
+    targetDeclaration: FirDeclaration,
     session: FirSession,
     scopeSession: ScopeSession,
     private val towerDataContextCollector: FirTowerDataContextCollector? = null
@@ -37,10 +38,11 @@ internal class FirDesignatedBodyResolveTransformerForIDE(
         ::FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator
     )
 ) {
+    private val phaseReplaceOracle = PhaseReplaceOracle(targetDeclaration)
 
     override fun transformDeclarationContent(declaration: FirDeclaration, data: ResolutionMode): CompositeTransformResult<FirDeclaration> {
-        if (designation.hasNext()) {
-            designation.next().visitNoTransform(this, data)
+        if (designation.hasNext()) phaseReplaceOracle.transformDeclarationInside(designation.next()) {
+            it.visitNoTransform(this, data)
             return declaration.compose()
         }
 
@@ -54,4 +56,6 @@ internal class FirDesignatedBodyResolveTransformerForIDE(
     override fun onBeforeStatementResolution(statement: FirStatement) {
         towerDataContextCollector?.addStatementContext(statement, context.towerDataContext)
     }
+
+    override fun needReplacePhase(firDeclaration: FirDeclaration): Boolean = phaseReplaceOracle.needReplacePhase(firDeclaration)
 }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedContractsResolveTransformerForIDE.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedContractsResolveTransformerForIDE.kt
index 7797053b288..86b0548aa07 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedContractsResolveTransformerForIDE.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedContractsResolveTransformerForIDE.kt
@@ -15,16 +15,20 @@ import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult
 import org.jetbrains.kotlin.fir.visitors.compose
 
 internal class FirDesignatedContractsResolveTransformerForIDE(
-    private val designation: Iterator<FirElement>,
+    private val designation: Iterator<FirDeclaration>,
+    targetDeclaration: FirDeclaration,
     session: FirSession,
     scopeSession: ScopeSession,
 ) : FirContractResolveTransformer(session, scopeSession) {
+    private val phaseReplaceOracle = PhaseReplaceOracle(targetDeclaration)
 
     override fun transformDeclarationContent(declaration: FirDeclaration, data: ResolutionMode): CompositeTransformResult<FirDeclaration> {
-        if (designation.hasNext()) {
-            designation.next().visitNoTransform(this, data)
+        if (designation.hasNext()) phaseReplaceOracle.transformDeclarationInside(designation.next()) {
+            it.visitNoTransform(this, data)
             return declaration.compose()
         }
         return super.transformDeclarationContent(declaration, data)
     }
+
+    override fun needReplacePhase(firDeclaration: FirDeclaration): Boolean = phaseReplaceOracle.needReplacePhase(firDeclaration)
 }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedImplicitTypesTransformerForIDE.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedImplicitTypesTransformerForIDE.kt
index 2b34b72529e..84130b93cea 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedImplicitTypesTransformerForIDE.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/FirDesignatedImplicitTypesTransformerForIDE.kt
@@ -19,7 +19,8 @@ import org.jetbrains.kotlin.fir.visitors.compose
 import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator
 
 internal class FirDesignatedImplicitTypesTransformerForIDE(
-    private val designation: Iterator<FirElement>,
+    private val designation: Iterator<FirDeclaration>,
+    targetDeclaration: FirDeclaration,
     session: FirSession,
     scopeSession: ScopeSession,
     implicitBodyResolveComputationSession: ImplicitBodyResolveComputationSession = ImplicitBodyResolveComputationSession(),
@@ -36,12 +37,15 @@ internal class FirDesignatedImplicitTypesTransformerForIDE(
         ::FirIdeDesignatedBodyResolveTransformerForReturnTypeCalculator
     )
 ) {
+    private val phaseReplaceOracle = PhaseReplaceOracle(targetDeclaration)
 
     override fun transformDeclarationContent(declaration: FirDeclaration, data: ResolutionMode): CompositeTransformResult<FirDeclaration> {
-        if (designation.hasNext()) {
-            designation.next().visitNoTransform(this, data)
+        if (designation.hasNext()) phaseReplaceOracle.transformDeclarationInside(designation.next()) {
+            it.visitNoTransform(this, data)
             return declaration.compose()
         }
         return super.transformDeclarationContent(declaration, data)
     }
+
+    override fun needReplacePhase(firDeclaration: FirDeclaration): Boolean = phaseReplaceOracle.needReplacePhase(firDeclaration)
 }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/PhaseReplaceOracle.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/PhaseReplaceOracle.kt
new file mode 100644
index 00000000000..43f7d200c90
--- /dev/null
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/trasformers/PhaseReplaceOracle.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2020 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.idea.fir.low.level.api.trasformers
+
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+
+internal class PhaseReplaceOracle(private val targetDeclaration: FirDeclaration) {
+    private var isInsideCurrentDeclaration = false
+
+    fun needReplacePhase(firDeclaration: FirDeclaration): Boolean =
+        isInsideCurrentDeclaration
+
+    inline fun <T> transformDeclarationInside(declaration: FirDeclaration, transform: (FirDeclaration) -> T): T {
+        if (declaration == targetDeclaration) isInsideCurrentDeclaration = true
+        return try {
+            transform(declaration)
+        } finally {
+            if (declaration == targetDeclaration) isInsideCurrentDeclaration = false
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt
index 66d679d219d..bcdf205e668 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/classMembers.txt
@@ -1,6 +1,6 @@
 FILE: classMembers.kt
-    public final [BODY_RESOLVE] class A : R|kotlin/Any| {
-        public constructor(): R|A| {
+    public final [CONTRACTS] class A : R|kotlin/Any| {
+        public [CONTRACTS] constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
index 5cff929d20e..54e11b255ca 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/delegates.txt
@@ -7,7 +7,7 @@ FILE: delegates.kt
     }
     public final [STATUS] fun receive(value: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK }
     public final [IMPLICIT_TYPES_BODY_RESOLVE] val delegate: R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| = object : R|kotlin/properties/ReadWriteProperty<kotlin/Any?, kotlin/Int>| {
-        private constructor(): R|<anonymous>| {
+        private [BODY_RESOLVE] constructor(): R|<anonymous>| {
             super<R|kotlin/Any|>()
         }
 
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt
index 5684066099f..47e22d827ab 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/lazyResolve/secondaryConstructor.txt
@@ -4,6 +4,6 @@ FILE: secondaryConstructor.kt
     }
     public final [STATUS] fun receive(value: R|A|): R|kotlin/Unit| { LAZY_BLOCK }
     public final [STATUS] class A : R|kotlin/Any| {
-        public constructor(x: R|kotlin/Int|): R|A| { LAZY_BLOCK }
+        public [STATUS] constructor(x: R|kotlin/Int|): R|A| { LAZY_BLOCK }
 
     }
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/multiModuleLazyResolve/whenWithHeiarchy/expected.txt b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/multiModuleLazyResolve/whenWithHeiarchy/expected.txt
index bfe62cb2db1..048c70e24e4 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/multiModuleLazyResolve/whenWithHeiarchy/expected.txt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/testdata/multiModuleLazyResolve/whenWithHeiarchy/expected.txt
@@ -1,11 +1,11 @@
 FILE: main.kt
-    public? final? fun Y.test(): String? {
-        lval a: <implicit> = when (this#) {
-            ($subj$ is F) ->  {
-                IntegerLiteral(1)
+    public final fun R|Y|.test(): R|kotlin/String?| {
+        lval a: R|kotlin/Int| = when (this@R|/test|) {
+            ($subj$ is R|F|) ->  {
+                Int(1)
             }
-            ($subj$ is G) ->  {
-                IntegerLiteral(2)
+            ($subj$ is R|G|) ->  {
+                Int(2)
             }
             else ->  {
                 ^test Null(null)
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/AbstractProjectWideOutOfBlockKotlinModificationTrackerTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/AbstractProjectWideOutOfBlockKotlinModificationTrackerTest.kt
index c1ec05132c6..319746f8da0 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/AbstractProjectWideOutOfBlockKotlinModificationTrackerTest.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/AbstractProjectWideOutOfBlockKotlinModificationTrackerTest.kt
@@ -5,12 +5,12 @@
 
 package org.jetbrains.kotlin.idea.fir.low.level.api.trackers
 
-import com.intellij.openapi.components.service
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiDocumentManager
 import junit.framework.Assert
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.trackers.createProjectWideOutOfBlockModificationTracker
 import java.io.File
 
 abstract class AbstractProjectWideOutOfBlockKotlinModificationTrackerTest : KotlinLightCodeInsightFixtureTestCase() {
@@ -23,7 +23,7 @@ abstract class AbstractProjectWideOutOfBlockKotlinModificationTrackerTest : Kotl
         val textToType = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// TYPE:") ?: DEFAULT_TEXT_TO_TYPE
         val outOfBlock = InTextDirectivesUtils.getPrefixedBoolean(fileText, "// OUT_OF_BLOCK:")
             ?: error("Please, specify should out of block change happen or not by `// OUT_OF_BLOCK:` directive")
-        val tracker = project.service<KotlinFirOutOfBlockModificationTrackerFactory>().createProjectWideOutOfBlockModificationTracker()
+        val tracker = project.createProjectWideOutOfBlockModificationTracker()
         val initialModificationCount = tracker.modificationCount
         myFixture.type(textToType)
         PsiDocumentManager.getInstance(project).commitAllDocuments()
diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinModuleOutOfBlockTrackerTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinModuleOutOfBlockTrackerTest.kt
index af6a808c70c..d34b3d764f8 100644
--- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinModuleOutOfBlockTrackerTest.kt
+++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/trackers/KotlinModuleOutOfBlockTrackerTest.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.idea.util.rootManager
 import org.jetbrains.kotlin.idea.util.sourceRoots
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.trackers.createModuleWithoutDependenciesOutOfBlockModificationTracker
 import java.nio.file.Files
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.writeText
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassBase.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassBase.kt
index b422d36b3aa..9b2c783a8b4 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassBase.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassBase.kt
@@ -39,8 +39,11 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.classes.cannotModify
 import org.jetbrains.kotlin.asJava.classes.lazyPub
 import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.idea.frontend.api.HackToForceAllowRunningAnalyzeOnEDT
+import org.jetbrains.kotlin.idea.frontend.api.hackyAllowRunningOnEdt
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantLock
+import org.jetbrains.kotlin.trackers.createProjectWideOutOfBlockModificationTracker
 import javax.swing.Icon
 
 abstract class FirLightClassBase protected constructor(manager: PsiManager) : LightElement(manager, KotlinLanguage.INSTANCE), PsiClass,
@@ -50,16 +53,17 @@ abstract class FirLightClassBase protected constructor(manager: PsiManager) : Li
         get() = invalidAccess()
 
     private class FirLightClassesLazyCreator(private val project: Project) : KotlinClassInnerStuffCache.LazyCreator() {
+        @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
         override fun <T : Any> get(initializer: () -> T, dependencies: List<Any>): Lazy<T> = lazyPub {
             PsiCachedValueImpl(PsiManager.getInstance(project)) {
-                CachedValueProvider.Result.create(initializer(), dependencies)
+                CachedValueProvider.Result.create(hackyAllowRunningOnEdt(initializer) , dependencies)
             }.value ?: error("initializer cannot return null")
         }
     }
 
     private val myInnersCache = KotlinClassInnerStuffCache(
         myClass = this@FirLightClassBase,
-        externalDependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker),
+        externalDependencies = listOf(manager.project.createProjectWideOutOfBlockModificationTracker()),
         lazyCreator = FirLightClassesLazyCreator(project)
     )
 
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
index d4c015e822a..fe59aca4c41 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
@@ -19,8 +19,10 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.fir.symbols.StandardClassIds
 import org.jetbrains.kotlin.idea.asJava.*
+import org.jetbrains.kotlin.idea.frontend.api.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.analyze
 import org.jetbrains.kotlin.idea.frontend.api.fir.analyzeWithSymbolAsContext
+import org.jetbrains.kotlin.idea.frontend.api.hackyAllowRunningOnEdt
 import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolVisibility
@@ -32,6 +34,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClass
+import org.jetbrains.kotlin.trackers.createProjectWideOutOfBlockModificationTracker
 import java.util.*
 
 fun getOrCreateFirLightClass(classOrObject: KtClassOrObject): KtLightClass? =
@@ -39,11 +42,12 @@ fun getOrCreateFirLightClass(classOrObject: KtClassOrObject): KtLightClass? =
         CachedValueProvider.Result
             .create(
                 createFirLightClassNoCache(classOrObject),
-                KotlinModificationTrackerService.getInstance(classOrObject.project).outOfBlockModificationTracker
+                classOrObject.project.createProjectWideOutOfBlockModificationTracker()
             )
     }
 
-fun createFirLightClassNoCache(classOrObject: KtClassOrObject): KtLightClass? {
+@OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
+fun createFirLightClassNoCache(classOrObject: KtClassOrObject): KtLightClass? = hackyAllowRunningOnEdt {
 
     val containingFile = classOrObject.containingFile
     if (containingFile is KtCodeFragment) {
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt
index 38669123b8c..06e7dd58545 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSession.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.getResolveState
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.ReadActionConfinementValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.assertIsValid
+import org.jetbrains.kotlin.idea.frontend.api.assertIsValidAndAccessible
 import org.jetbrains.kotlin.idea.frontend.api.components.*
 import org.jetbrains.kotlin.idea.frontend.api.fir.components.*
 import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbolProvider
@@ -35,7 +35,7 @@ private constructor(
     val context: KtFirAnalysisSessionContext,
 ) : KtAnalysisSession(token) {
     init {
-        assertIsValid()
+        assertIsValidAndAccessible()
     }
 
     internal val towerDataContextProvider: TowerDataContextProvider = TowerDataContextProvider(this)
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
index 3497ef52c73..46a9526370f 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtFirAnalysisSessionProvider.kt
@@ -17,8 +17,9 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.InvalidWayOfUsingAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider
-import org.jetbrains.kotlin.idea.frontend.api.assertIsValid
+import org.jetbrains.kotlin.idea.frontend.api.assertIsValidAndAccessible
 import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.trackers.createProjectWideOutOfBlockModificationTracker
 import java.util.concurrent.ConcurrentHashMap
 
 @OptIn(InvalidWayOfUsingAnalysisSession::class)
@@ -28,7 +29,8 @@ class KtFirAnalysisSessionProvider(project: Project) : KtAnalysisSessionProvider
             CachedValueProvider.Result(
                 ConcurrentHashMap<ModuleInfo, KtAnalysisSession>(),
                 PsiModificationTracker.MODIFICATION_COUNT,
-                ProjectRootModificationTracker.getInstance(project)
+                ProjectRootModificationTracker.getInstance(project),
+                project.createProjectWideOutOfBlockModificationTracker()
             )
         }
 
@@ -37,7 +39,7 @@ class KtFirAnalysisSessionProvider(project: Project) : KtAnalysisSessionProvider
             @Suppress("DEPRECATION")
             KtFirAnalysisSession.createForElement(contextElement)
         }.apply {
-            assertIsValid()
+            assertIsValidAndAccessible()
         }
     }
 
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt
index 7cdd54c9b03..338fc017a5c 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt
@@ -9,9 +9,12 @@ import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
 import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
 import org.jetbrains.kotlin.fir.expressions.FirSafeCallExpression
+import org.jetbrains.kotlin.fir.psi
 import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
 import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
 import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference
+import org.jetbrains.kotlin.fir.render
+import org.jetbrains.kotlin.fir.resolve.calls.FirErrorReferenceWithCandidate
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.idea.fir.getCandidateSymbols
@@ -26,9 +29,11 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.fir.buildSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.references.FirReferenceResolveHelper
+import org.jetbrains.kotlin.idea.util.getElementTextInContext
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtCallExpression
+import org.jetbrains.kotlin.psi.KtElement
 
 internal class KtFirCallResolver(
     override val analysisSession: KtFirAnalysisSession,
@@ -89,10 +94,16 @@ internal class KtFirCallResolver(
         val target = when (val calleeReference = calleeReference) {
             is FirResolvedNamedReference -> calleeReference.getKtFunctionOrConstructorSymbol()?.let { KtSuccessCallTarget(it) }
             is FirErrorNamedReference -> calleeReference.createErrorCallTarget()
-            is FirSimpleNamedReference -> error(
-                "Looks like FirFunctionCall was not resolved to BODY_RESOLVE phase, " +
-                        "consider resolving it containing declaration before starting resolve calls"
-            )
+            is FirErrorReferenceWithCandidate -> calleeReference.createErrorCallTarget()
+            is FirSimpleNamedReference ->
+                error(
+                    """
+                      Looks like FirFunctionCall was not resolved to BODY_RESOLVE phase,
+                      consider resolving it containing declaration before starting resolve calls
+                      ${this.render()}
+                      ${(this.psi as? KtElement)?.getElementTextInContext()}
+                      """.trimIndent()
+                )
             else -> error("Unexpected call reference ${calleeReference::class.simpleName}")
         } ?: return null
         return KtFunctionCall(target)
@@ -104,6 +115,12 @@ internal class KtFirCallResolver(
             KtSimpleDiagnostic(diagnostic.reason)
         )
 
+    private fun FirErrorReferenceWithCandidate.createErrorCallTarget(): KtErrorCallTarget =
+        KtErrorCallTarget(
+            getCandidateSymbols().mapNotNull { it.fir.buildSymbol(firSymbolBuilder) as? KtFunctionLikeSymbol },
+            KtSimpleDiagnostic(diagnostic.reason)
+        )
+
     private fun FirResolvedNamedReference.getKtFunctionOrConstructorSymbol(): KtFunctionLikeSymbol? =
         resolvedSymbol.fir.buildSymbol(firSymbolBuilder) as? KtFunctionLikeSymbol
 
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt
index e579f4860c3..39ee401db4f 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject
 import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.resolve.ScopeSession
 import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticPropertiesScope
 import org.jetbrains.kotlin.fir.resolve.scope
 import org.jetbrains.kotlin.fir.scopes.*
@@ -79,13 +80,12 @@ internal class KtFirScopeProvider(
                 val firSession = fir.session
                 fir.unsubstitutedScope(
                     firSession,
-                    firResolveState.firTransformerProvider.getScopeSession(firSession),
+                    ScopeSession(),
                     withForcedTypeCalculator = false
                 )
             } ?: return@getOrPut KtFirEmptyMemberScope(classSymbol)
 
             firScopeStorage.register(firScope)
-
             KtFirMemberScope(classSymbol, firScope, token, builder)
         }
     }
@@ -129,7 +129,7 @@ internal class KtFirScopeProvider(
         val firSession = firResolveState.rootModuleSession
         val firTypeScope = type.coneType.scope(
             firSession,
-            firResolveState.firTransformerProvider.getScopeSession(firSession),
+            ScopeSession(),
             FakeOverrideTypeCalculator.Forced
         ) ?: return null
         return getCompositeScope(
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSubtyppingComponent.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSubtyppingComponent.kt
index f3ea0ceb07f..34586ab1b9a 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSubtyppingComponent.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSubtyppingComponent.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.components
 
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
-import org.jetbrains.kotlin.idea.frontend.api.assertIsValid
+import org.jetbrains.kotlin.idea.frontend.api.assertIsValidAndAccessible
 import org.jetbrains.kotlin.idea.frontend.api.components.KtSubtypingComponent
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.fir.types.KtFirType
@@ -20,7 +20,7 @@ internal class KtFirSubtypingComponent(
     override val token: ValidityToken,
 ) : KtSubtypingComponent(), KtFirAnalysisSessionComponent {
     override fun isEqualTo(first: KtType, second: KtType): Boolean = withValidityAssertion {
-        second.assertIsValid()
+        second.assertIsValidAndAccessible()
         check(first is KtFirType)
         check(second is KtFirType)
         return AbstractTypeChecker.equalTypes(
@@ -31,7 +31,7 @@ internal class KtFirSubtypingComponent(
     }
 
     override fun isSubTypeOf(subType: KtType, superType: KtType): Boolean = withValidityAssertion {
-        superType.assertIsValid()
+        superType.assertIsValidAndAccessible()
         check(subType is KtFirType)
         check(superType is KtFirType)
         return AbstractTypeChecker.isSubtypeOf(
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt
index edf229da4a4..10924fc58a2 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolDeclarationOverridesProvider.kt
@@ -43,12 +43,10 @@ internal class KtFirSymbolDeclarationOverridesProvider(
         check(callableSymbol is KtFirSymbol<*>)
         check(containingDeclaration is KtFirClassOrObjectSymbol)
 
-        return callableSymbol.firRef.withFir(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { firCallableElement ->
-
-            containingDeclaration.firRef.withFir(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { containingDeclaration ->
-
-                val firTypeScope = containingDeclaration.unsubstitutedScope(
-                    containingDeclaration.session,
+        return containingDeclaration.firRef.withFir(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { firContainer ->
+            callableSymbol.firRef.withFirUnsafe { firCallableElement ->
+                val firTypeScope = firContainer.unsubstitutedScope(
+                    firContainer.session,
                     ScopeSession(),
                     withForcedTypeCalculator = false
                 )
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt
index 3cd8fbc80e1..2055c6a1dd9 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousFunctionSymbol.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
@@ -35,7 +34,6 @@ internal class KtFirAnonymousFunctionSymbol(
 
     override val valueParameters: List<KtParameterSymbol> by firRef.withFirAndCache { fir ->
         fir.valueParameters.map { valueParameter ->
-            check(valueParameter is FirValueParameterImpl)
             builder.buildParameterSymbol(valueParameter)
         }
     }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt
index dae71f29763..db40b54f59c 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
@@ -45,7 +44,6 @@ internal class KtFirConstructorSymbol(
 
     override val valueParameters: List<KtConstructorParameterSymbol> by firRef.withFirAndCache { fir ->
         fir.valueParameters.map { valueParameter ->
-            check(valueParameter is FirValueParameterImpl)
             builder.buildFirConstructorParameter(valueParameter)
         }
     }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt
index b16c5851632..84a2e519c7f 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.fir.containingClass
 import org.jetbrains.kotlin.fir.declarations.*
-import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
@@ -39,7 +38,6 @@ internal class KtFirFunctionSymbol(
     }
     override val valueParameters: List<KtFirFunctionValueParameterSymbol> by firRef.withFirAndCache { fir ->
         fir.valueParameters.map { valueParameter ->
-            check(valueParameter is FirValueParameterImpl)
             builder.buildParameterSymbol(valueParameter)
         }
     }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt
index 0b41fc42de2..1cfb2cfbec8 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/FirRefWithValidityCheck.kt
@@ -9,11 +9,10 @@ import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
-import org.jetbrains.kotlin.idea.fir.low.level.api.api.resolvedFirToPhase
 import org.jetbrains.kotlin.idea.fir.low.level.api.api.withFirDeclaration
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
-import org.jetbrains.kotlin.idea.frontend.api.assertIsValid
+import org.jetbrains.kotlin.idea.frontend.api.assertIsValidAndAccessible
 import java.lang.ref.WeakReference
 
 internal class FirRefWithValidityCheck<out D : FirDeclaration>(fir: D, resolveState: FirModuleResolveState, val token: ValidityToken) {
@@ -25,7 +24,7 @@ internal class FirRefWithValidityCheck<out D : FirDeclaration>(fir: D, resolveSt
         firWeakRef.get() == null && resolveStateWeakRef.get() == null
 
     inline fun <R> withFir(phase: FirResolvePhase = FirResolvePhase.RAW_FIR, crossinline action: (fir: D) -> R): R {
-        token.assertIsValid()
+        token.assertIsValidAndAccessible()
         val fir = firWeakRef.get()
             ?: throw EntityWasGarbageCollectedException("FirElement")
         val resolveState = resolveStateWeakRef.get()
@@ -42,6 +41,18 @@ internal class FirRefWithValidityCheck<out D : FirDeclaration>(fir: D, resolveSt
         }
     }
 
+    /**
+     * Runs [action] with fir element *without* any lock hold
+     * Consider using this only when you are completely sure
+     * that fir or one of it's container already holds the lock (i.e, corresponding withFir call was made)
+     */
+    inline fun <R> withFirUnsafe(action: (fir: D) -> R): R {
+        token.assertIsValidAndAccessible()
+        val fir = firWeakRef.get()
+            ?: throw EntityWasGarbageCollectedException("FirElement")
+        return action(fir)
+    }
+
     val resolveState
         get() = resolveStateWeakRef.get() ?: throw EntityWasGarbageCollectedException("FirModuleResolveState")
 
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/ValidityAwareCachedValue.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/ValidityAwareCachedValue.kt
index e7ef4b87f6b..40f1dfed2ea 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/ValidityAwareCachedValue.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/ValidityAwareCachedValue.kt
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.utils
 
 import org.jetbrains.kotlin.idea.frontend.api.ValidityToken
 import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
-import org.jetbrains.kotlin.idea.frontend.api.assertIsValid
+import org.jetbrains.kotlin.idea.frontend.api.assertIsValidAndAccessible
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
@@ -22,7 +22,7 @@ class ValidityAwareCachedValue<T>(
 
     @Suppress("UNCHECKED_CAST")
     override fun getValue(thisRef: Any, property: KProperty<*>): T {
-        token.assertIsValid()
+        token.assertIsValidAndAccessible()
         return lazyValue.value
     }
 }
diff --git a/idea/idea-frontend-fir/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt b/idea/idea-frontend-fir/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt
new file mode 100644
index 00000000000..94d057876c3
--- /dev/null
+++ b/idea/idea-frontend-fir/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt
@@ -0,0 +1,7 @@
+infix fun <A, B> A.to(other: B) = this
+
+open class A<T>(x: T)
+
+class B : A(<selection>1 to 2</selection>)
+
+// CALL: KtFunctionCall: targetFunction = to(<receiver>: A, other: B): A
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt
index fdaadb53a6d..5d7f0a1fc3a 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt
@@ -1,19 +1,19 @@
 // RUNTIME
 
-class: java.lang.String
+class: java/lang/String
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
   annotations: []
-  classIdIfNonLocal: java.lang.String
+  classIdIfNonLocal: java/lang/String
   classKind: CLASS
   companionObject: null
-  isInner: true
+  isInner: false
   modality: FINAL
   name: String
   origin: JAVA
   primaryConstructor: null
   superTypes: [[] kotlin/Any, [] java/io/Serializable, [] kotlin/Comparable<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, [] kotlin/CharSequence]
-  symbolKind: MEMBER
+  symbolKind: TOP_LEVEL
   typeParameters: []
   visibility: PUBLIC
diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt
index 3bfc101f4de..1e85eb52927 100644
--- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt
+++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/AbstractResolveCallTest.kt
@@ -11,6 +11,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.testFramework.LightCodeInsightTestCase
 import org.jetbrains.kotlin.idea.addExternalTestFiles
 import org.jetbrains.kotlin.idea.executeOnPooledThreadInReadAction
+import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.analyze
 import org.jetbrains.kotlin.idea.frontend.api.calls.KtCall
 import org.jetbrains.kotlin.idea.frontend.api.calls.KtErrorCallTarget
@@ -22,6 +23,7 @@ import org.jetbrains.kotlin.idea.frontend.api.types.KtType
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtValueArgument
 import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.util.KtTestUtil
@@ -44,13 +46,7 @@ abstract class AbstractResolveCallTest : @Suppress("DEPRECATION") LightCodeInsig
 
         val actualText = executeOnPooledThreadInReadAction {
             val callInfos = analyze(file as KtFile) {
-                elements.map { element ->
-                    when (element) {
-                        is KtCallExpression -> element.resolveCall()
-                        is KtBinaryExpression -> element.resolveCall()
-                        else -> error("Selected should be either KtCallExpression or KtBinaryExpression but was $element")
-                    }
-                }
+                elements.map { resolveCall(it) }
             }
 
             if (callInfos.isEmpty()) {
@@ -72,6 +68,13 @@ abstract class AbstractResolveCallTest : @Suppress("DEPRECATION") LightCodeInsig
         KotlinTestUtils.assertEqualsToFile(File(path), actualText)
     }
 
+    private fun KtAnalysisSession.resolveCall(element: PsiElement): KtCall? = when (element) {
+        is KtCallExpression -> element.resolveCall()
+        is KtBinaryExpression -> element.resolveCall()
+        is KtValueArgument -> resolveCall(element.getArgumentExpression()!!)
+        else -> error("Selected should be either KtCallExpression or KtBinaryExpression but was $element")
+    }
+
 
     private fun getSingleSelectedElement(selection: CaretState): PsiElement {
         val selectionRange = selection.getTextRange()
diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java
index ff4c42df83a..d69b9ad2ebb 100644
--- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java
+++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/fir/ResolveCallTestGenerated.java
@@ -59,6 +59,11 @@ public class ResolveCallTestGenerated extends AbstractResolveCallTest {
         runTest("idea/idea-frontend-fir/testData/analysisSession/resolveCall/javaFunctionCall.kt");
     }
 
+    @TestMetadata("resolveCallInSuperConstructorParam.kt")
+    public void testResolveCallInSuperConstructorParam() throws Exception {
+        runTest("idea/idea-frontend-fir/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt");
+    }
+
     @TestMetadata("simpleCallWithNonMatchingArgs.kt")
     public void testSimpleCallWithNonMatchingArgs() throws Exception {
         runTest("idea/idea-frontend-fir/testData/analysisSession/resolveCall/simpleCallWithNonMatchingArgs.kt");
diff --git a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt
index 095b7ad9089..328af9cd589 100644
--- a/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt
+++ b/idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/symbols/AbstractMemoryLeakInSymbolsTest.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
+import org.jetbrains.kotlin.trackers.KotlinOutOfBlockModificationTrackerFactory
 import java.io.File
 
 abstract class AbstractMemoryLeakInSymbolsTest : KotlinLightCodeInsightFixtureTestCase() {
@@ -51,7 +52,7 @@ abstract class AbstractMemoryLeakInSymbolsTest : KotlinLightCodeInsightFixtureTe
 
     @OptIn(InvalidWayOfUsingAnalysisSession::class)
     private fun invalidateAllCaches(ktFile: KtFile) {
-        project.service<KotlinFirOutOfBlockModificationTrackerFactory>().incrementModificationsCount()
+        (project.service<KotlinOutOfBlockModificationTrackerFactory>() as KotlinFirOutOfBlockModificationTrackerFactory).incrementModificationsCount()
         (project.service<KtAnalysisSessionProvider>() as KtFirAnalysisSessionProvider).clearCaches()
         executeOnPooledThreadInReadAction { analyze(ktFile) {} }
     }
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/FirPluginOracle.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/FirPluginOracle.kt
new file mode 100644
index 00000000000..e2cf5ce1b74
--- /dev/null
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/idea/util/FirPluginOracle.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 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.idea.util
+
+abstract class FirPluginOracleService {
+    @Deprecated("Should be used only as a very temporary solution to disable some FE1.0 functionality which is used in FIR plugin")
+    abstract fun isFirPlugin(): Boolean
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-independent/src/org/jetbrains/kotlin/trackers/KotlinOutOfBlockModificationTrackerFactory.kt b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/trackers/KotlinOutOfBlockModificationTrackerFactory.kt
new file mode 100644
index 00000000000..7ae5d394b35
--- /dev/null
+++ b/idea/idea-frontend-independent/src/org/jetbrains/kotlin/trackers/KotlinOutOfBlockModificationTrackerFactory.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2020 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.trackers
+
+import com.intellij.openapi.components.service
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.ModificationTracker
+
+
+abstract class KotlinOutOfBlockModificationTrackerFactory {
+    abstract fun createProjectWideOutOfBlockModificationTracker(): ModificationTracker
+    abstract fun createModuleWithoutDependenciesOutOfBlockModificationTracker(module: Module): ModificationTracker
+}
+
+fun Project.createProjectWideOutOfBlockModificationTracker() =
+    service<KotlinOutOfBlockModificationTrackerFactory>().createProjectWideOutOfBlockModificationTracker()
+
+fun Module.createModuleWithoutDependenciesOutOfBlockModificationTracker() =
+    project.service<KotlinOutOfBlockModificationTrackerFactory>().createModuleWithoutDependenciesOutOfBlockModificationTracker(this)
\ No newline at end of file
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
deleted file mode 100644
index b687dd75193..00000000000
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 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.gradle
-
-import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
-import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
-import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
-import org.junit.Test
-
-
-class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase() {
-
-    @Test
-    @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
-    fun testMultiplatformLibrary() {
-        importAndCheckHighlighting()
-    }
-
-    @Test
-    @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
-    fun testUnresolvedInMultiplatformLibrary() {
-        importAndCheckHighlighting(false, false)
-    }
-
-    private fun importAndCheckHighlighting(testLineMarkers: Boolean = true, checkWarnings: Boolean = true) {
-        val files = configureByFiles()
-        importProject(skipIndexing = false)
-        val project = myTestFixture.project
-        checkFiles(
-            files.filter { it.extension == "kt" || it.extension == "java" },
-            project,
-            object : GradleDaemonAnalyzerTestCase(
-                testLineMarkers = testLineMarkers,
-                checkWarnings = checkWarnings,
-                checkInfos = false,
-                rootDisposable = testRootDisposable
-            ) {}
-        )
-    }
-
-    override fun testDataDirName(): String {
-        return "importAndCheckHighlighting"
-    }
-}
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchSourceFileProcessor.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchSourceFileProcessor.kt
index df110183eef..8064f40fd3a 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchSourceFileProcessor.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchSourceFileProcessor.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.RenderingContext
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.scratch.ScratchExpression
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.calls.util.isSingleUnderscore
 
 class KtScratchSourceFileProcessor {
     companion object {
@@ -71,6 +72,7 @@ class KtScratchSourceFileProcessor {
         fun process(expression: ScratchExpression) {
             val psiElement = expression.element
             when (psiElement) {
+                is KtDestructuringDeclaration -> processDestructuringDeclaration(expression, psiElement)
                 is KtVariableDeclaration -> processDeclaration(expression, psiElement)
                 is KtFunction -> processDeclaration(expression, psiElement)
                 is KtClassOrObject -> processDeclaration(expression, psiElement)
@@ -89,6 +91,23 @@ class KtScratchSourceFileProcessor {
             objectBuilder.appendLineInfo(e)
         }
 
+        private fun processDestructuringDeclaration(e: ScratchExpression, c: KtDestructuringDeclaration) {
+            val entries = c.entries.mapNotNull { if (it.isSingleUnderscore) null else it.resolveToDescriptorIfAny() }
+            entries.forEach {
+                val context = RenderingContext.of(it)
+                val rendered = Renderers.COMPACT.render(it, context)
+                classBuilder.append(rendered).newLine()
+                objectBuilder.println(rendered)
+            }
+            objectBuilder.appendLineInfo(e)
+            classBuilder.append("init {").newLine()
+            classBuilder.append(c.text).newLine()
+            entries.forEach {
+                classBuilder.append("this.${it.name} = ${it.name}").newLine()
+            }
+            classBuilder.append("}").newLine()
+        }
+
         private fun processExpression(e: ScratchExpression, expr: KtExpression) {
             val resName = "$GET_RES_FUN_NAME_PREFIX$resCount"
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt
index d708e161f00..64f19817fa0 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeChecker.kt
@@ -23,38 +23,9 @@ import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.roots.libraries.Library
 import com.intellij.util.text.VersionComparatorUtil
-import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil
 import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil
 
-data class VersionedLibrary(val library: Library, val version: String?, val usedInModules: Collection<Module>)
-
-fun findOutdatedKotlinLibraries(project: Project): List<VersionedLibrary> {
-    if (KotlinPluginUtil.isSnapshotVersion()) return emptyList() // plugin is run from sources, can't compare versions
-    if (KotlinPluginUtil.isDevVersion()) return emptyList()
-    if (project.isDisposed) return emptyList()
-
-    val outdatedLibraries = arrayListOf<VersionedLibrary>()
-
-    for ((library, modules) in findAllUsedLibraries(project).entrySet()) {
-        getOutdatedRuntimeLibraryVersion(library, project)?.let { version ->
-            outdatedLibraries.add(VersionedLibrary(library, version, modules))
-        }
-    }
-
-    return outdatedLibraries
-}
-
-private fun getOutdatedRuntimeLibraryVersion(library: Library, project: Project): String? {
-    val libraryVersion = getKotlinLibraryVersion(library, project) ?: return null
-    val runtimeVersion = bundledRuntimeVersion()
-
-    return if (isRuntimeOutdated(libraryVersion, runtimeVersion)) libraryVersion else null
-}
-
-private fun getKotlinLibraryVersion(library: Library, project: Project): String? =
-    JavaRuntimeDetectionUtil.getJavaRuntimeVersion(library) ?: JsLibraryStdDetectionUtil.getJsLibraryStdVersion(library, project)
-
 fun findKotlinRuntimeLibrary(module: Module, predicate: (Library, Project) -> Boolean = ::isKotlinRuntime): Library? {
     val orderEntries = ModuleRootManager.getInstance(module).orderEntries.filterIsInstance<LibraryOrderEntry>()
     return orderEntries.asSequence()
@@ -70,9 +41,6 @@ private fun isKotlinJavaRuntime(library: Library) =
 private fun isKotlinJsRuntime(library: Library, project: Project) =
     JsLibraryStdDetectionUtil.hasJsStdlibJar(library, project)
 
-fun collectModulesWithOutdatedRuntime(libraries: List<VersionedLibrary>): List<Module> =
-    libraries.flatMap { it.usedInModules }
-
 fun isRuntimeOutdated(libraryVersion: String?, runtimeVersion: String): Boolean {
     return libraryVersion == null || libraryVersion.startsWith("internal-") != runtimeVersion.startsWith("internal-") ||
             VersionComparatorUtil.compare(runtimeVersion.substringBefore("-release-"), libraryVersion) > 0
diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
index cf4c833f7f5..7152af66d0b 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
@@ -14,6 +14,7 @@ import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters
 import org.jetbrains.kotlin.analyzer.ResolverForModuleFactory
+import org.jetbrains.kotlin.analyzer.ResolverForProject
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.functions.functionInterfacePackageFragmentProvider
@@ -28,6 +29,7 @@ import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin
 import org.jetbrains.kotlin.descriptors.konan.KlibModuleOrigin
 import org.jetbrains.kotlin.ide.konan.analyzer.NativeResolverForModuleFactory
+import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
 import org.jetbrains.kotlin.idea.caches.project.LibraryInfo
 import org.jetbrains.kotlin.idea.caches.project.SdkInfo
 import org.jetbrains.kotlin.idea.caches.project.lazyClosure
@@ -94,8 +96,12 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
 
     override fun getKeyForBuiltIns(moduleInfo: ModuleInfo, sdkInfo: SdkInfo?): BuiltInsCacheKey = NativeBuiltInsCacheKey
 
-    override fun createBuiltIns(moduleInfo: ModuleInfo, projectContext: ProjectContext, sdkDependency: SdkInfo?) =
-        createKotlinNativeBuiltIns(moduleInfo, projectContext)
+    override fun createBuiltIns(
+        moduleInfo: IdeaModuleInfo,
+        projectContext: ProjectContext,
+        resolverForProject: ResolverForProject<IdeaModuleInfo>,
+        sdkDependency: SdkInfo?
+    ) = createKotlinNativeBuiltIns(moduleInfo, projectContext)
 
     private fun createKotlinNativeBuiltIns(moduleInfo: ModuleInfo, projectContext: ProjectContext): KotlinBuiltIns {
         val stdlibInfo = moduleInfo.findNativeStdlib() ?: return DefaultBuiltIns.Instance
diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java
index 193d55ca4cc..47d2c8ec487 100644
--- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java
+++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/SdkAndMockLibraryProjectDescriptor.java
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.framework.JSLibraryKind;
 import org.jetbrains.kotlin.idea.framework.KotlinSdkType;
 import org.jetbrains.kotlin.test.MockLibraryUtil;
+import org.jetbrains.kotlin.test.MockLibraryUtilExt;
 import org.jetbrains.kotlin.utils.PathUtil;
 
 import java.io.File;
@@ -78,7 +79,7 @@ public class SdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri
         File libraryJar =
                 isJsLibrary
                 ? MockLibraryUtil.compileJsLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, Collections.emptyList())
-                : MockLibraryUtil.compileJvmLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, true, extraOptions, classpath);
+                : MockLibraryUtilExt.compileJvmLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, true, extraOptions, classpath);
         String jarUrl = getJarUrl(libraryJar);
 
         Library.ModifiableModel libraryModel =
diff --git a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
index 27e68cf27c1..e8bf4008634 100644
--- a/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
+++ b/idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
@@ -22,7 +22,6 @@ import com.intellij.debugger.engine.evaluation.EvaluateException
 import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl
 import com.intellij.debugger.engine.evaluation.expression.*
-import com.intellij.lang.java.JavaLanguage
 import com.intellij.openapi.diagnostic.Attachment
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.progress.ProcessCanceledException
@@ -446,7 +445,10 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, private val sourcePositi
 
     companion object {
         private val IGNORED_DIAGNOSTICS: Set<DiagnosticFactory<*>> = Errors.INVISIBLE_REFERENCE_DIAGNOSTICS +
-                setOf(Errors.EXPERIMENTAL_API_USAGE_ERROR, Errors.MISSING_DEPENDENCY_SUPERCLASS, Errors.IR_COMPILED_CLASS)
+                setOf(
+                    Errors.EXPERIMENTAL_API_USAGE_ERROR, Errors.MISSING_DEPENDENCY_SUPERCLASS, Errors.IR_WITH_UNSTABLE_ABI_COMPILED_CLASS,
+                    Errors.FIR_COMPILED_CLASS
+                )
 
         private val DEFAULT_METHOD_MARKERS = listOf(AsmTypes.OBJECT_TYPE, AsmTypes.DEFAULT_CONSTRUCTOR_MARKER)
 
diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt
index 097601eee6b..d090288a18e 100644
--- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt
+++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.KotlinBaseTest.TestFile
 import org.jetbrains.kotlin.test.MockLibraryUtil
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
+import org.jetbrains.kotlin.test.util.JUnit4Assertions
 import java.io.File
 
 class DebuggerTestCompilerFacility(
@@ -109,7 +110,8 @@ class DebuggerTestCompilerFacility(
                 java.map { File(srcDir, it.name).absolutePath },
                 mavenArtifacts + classesDir.absolutePath,
                 listOf("-g"),
-                classesDir
+                classesDir,
+                JUnit4Assertions
             )
         }
     }
@@ -152,7 +154,8 @@ class DebuggerTestCompilerFacility(
                 java.map { File(srcDir, it.name).absolutePath },
                 getClasspath(module) + listOf(classesDir.absolutePath),
                 listOf("-g"),
-                classesDir
+                classesDir,
+                JUnit4Assertions
             )
         }
 
@@ -252,4 +255,4 @@ private fun splitByLanguage(files: List<TestFile>): TestFilesByLanguage {
     }
 
     return TestFilesByLanguage(kotlin = kotlin, java = java, resources = resources)
-}
\ No newline at end of file
+}
diff --git a/idea/resources-descriptors/META-INF/plugin.xml b/idea/resources-descriptors/META-INF/plugin.xml
index 7eb10ab8e9c..981f882d453 100644
--- a/idea/resources-descriptors/META-INF/plugin.xml
+++ b/idea/resources-descriptors/META-INF/plugin.xml
@@ -127,6 +127,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
     <highlightingPassFactory implementation="org.jetbrains.kotlin.idea.refactoring.cutPaste.MoveDeclarationsPassFactory$Registrar"/>
 
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.trackers.KotlinOutOfBlockModificationTrackerFactory"
+                    serviceImplementation="org.jetbrains.kotlin.trackers.KotlinFE10OutOfBlockModificationTracker"/>
+
 
     <statistics.counterUsagesCollector groupId="kotlin.gradle.target" version="2"/>
     <statistics.counterUsagesCollector groupId="kotlin.maven.target" version="3"/>
diff --git a/idea/resources-en/inspectionDescriptions/KotlinSealedInheritorsInJava.html b/idea/resources-en/inspectionDescriptions/KotlinSealedInheritorsInJava.html
new file mode 100644
index 00000000000..a81e027b794
--- /dev/null
+++ b/idea/resources-en/inspectionDescriptions/KotlinSealedInheritorsInJava.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This inspection reports attempt to inherit Kotlin sealed interface/class in Java code.
+</body>
+</html>
\ No newline at end of file
diff --git a/idea/resources-en/messages/KotlinBundle.properties b/idea/resources-en/messages/KotlinBundle.properties
index 8503a39be15..7a3536e6bf2 100644
--- a/idea/resources-en/messages/KotlinBundle.properties
+++ b/idea/resources-en/messages/KotlinBundle.properties
@@ -332,6 +332,7 @@ action.new.file.dialog.data.class.title=Data Class
 action.new.file.dialog.sealed.class.title=Sealed Class
 action.new.file.dialog.annotation.title=Annotation
 action.new.file.dialog.interface.title=Interface
+action.new.file.dialog.sealed.interface.title=Sealed Interface
 action.new.file.dialog.enum.title=Enum class
 action.new.file.dialog.object.title=Object
 action.new.file.error.empty.name=Name can't be empty
@@ -1343,6 +1344,7 @@ double.negation.fix.text=Remove redundant negations
 redundant.double.negation=Redundant double negation
 equals.between.objects.of.inconvertible.types='equals()' between objects of inconvertible types
 usage.of.kotlin.internal.declaration.from.different.module=Usage of Kotlin internal declaration from different module
+inheritance.of.kotlin.sealed=Java {0,choice,0#interface|1#class} cannot be a part of Kotlin sealed hierarchy
 junit.static.methods=JUnit static methods
 redundant.override.fix.text=Remove redundant overriding method
 redundant.overriding.method=Redundant overriding method
@@ -2064,6 +2066,7 @@ inspection.replace.array.of.with.literal.display.name='arrayOf' call can be repl
 inspection.copy.without.named.arguments.display.name='copy' method of data class is called without named arguments
 inspection.move.suspicious.callable.reference.into.parentheses.display.name=Suspicious callable reference used as lambda result
 inspection.kotlin.internal.in.java.display.name=Usage of Kotlin internal declarations from Java
+inspection.kotlin.sealed.in.java.display.name=Inheritance of Kotlin sealed interface/class from Java
 inspection.unused.lambda.expression.body.display.name=Unused return value of a function with lambda expression body
 inspection.destructuring.wrong.name.display.name=Variable in destructuring declaration uses name of a wrong data class property
 inspection.data.class.private.constructor.display.name=Private data class constructor is exposed via the 'copy' method
diff --git a/idea/resources-fir/META-INF/plugin.xml b/idea/resources-fir/META-INF/plugin.xml
index 6b3ef0cbfc4..f4d4c1a2fd7 100644
--- a/idea/resources-fir/META-INF/plugin.xml
+++ b/idea/resources-fir/META-INF/plugin.xml
@@ -85,6 +85,25 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
   </extensions>
 <!--decompiler-->
 
+  <extensions defaultExtensionNs="com.intellij">
+    <statistics.counterUsagesCollector groupId="kotlin.gradle.target" version="2"/>
+    <statistics.counterUsagesCollector groupId="kotlin.maven.target" version="3"/>
+    <statistics.counterUsagesCollector groupId="kotlin.jps.target" version="3"/>
+    <statistics.counterUsagesCollector groupId="kotlin.gradle.library" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.refactoring" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.newFileTempl" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.npwizards" version="2"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.debugger" version="2"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.j2k" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.editor" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.migrationTool" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.ide.new.wizard" version="1"/>
+    <statistics.counterUsagesCollector groupId="kotlin.gradle.performance" version="1"/>
+    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.IDESettingsFUSCollector"/>
+    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.formatter.KotlinFormatterUsageCollector"/>
+    <statistics.projectUsagesCollector implementation="org.jetbrains.kotlin.idea.statistics.ProjectConfigurationCollector"/>
+  </extensions>
+
   <extensions defaultExtensionNs="com.intellij">
     <!-- fir-specific -->
     <projectService serviceInterface="org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSessionProvider"
@@ -112,7 +131,8 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
     <highlightingPassFactory implementation="org.jetbrains.kotlin.idea.fir.highlighter.KotlinDiagnosticHighlightingPassFactory"/>
 
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirModificationTrackerService"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirOutOfBlockModificationTrackerFactory"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.trackers.KotlinOutOfBlockModificationTrackerFactory"
+                    serviceImplementation="org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinFirOutOfBlockModificationTrackerFactory"/>
     <psi.treeChangePreprocessor implementation="org.jetbrains.kotlin.idea.fir.low.level.api.trackers.KotlinOutOfBlockPsiTreeChangePreprocessor"/>
   </extensions>
 
@@ -247,6 +267,11 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 <!--    <classesWithAnnotatedMembersSearch implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinClassesWithAnnotatedMembersSearcher"/>-->
 <!--    <methodReferencesSearch implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.DefaultAnnotationMethodKotlinImplicitReferenceSearcher"/>-->
 
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.util.FirPluginOracleService"
+                    serviceImplementation="org.jetbrains.kotlin.idea.util.FirPluginOracleServiceFirImpl"/>
+
+
+
     <readWriteAccessDetector implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector" id="kotlin"/>
 
 
diff --git a/idea/resources/META-INF/caches.xml b/idea/resources/META-INF/caches.xml
index 3a5d4b5cb4b..280077a634e 100644
--- a/idea/resources/META-INF/caches.xml
+++ b/idea/resources/META-INF/caches.xml
@@ -25,6 +25,8 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.caches.project.SdkInfoCache"
                     serviceImplementation="org.jetbrains.kotlin.idea.caches.project.SdkInfoCacheImpl"/>
 
+    <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.lightClasses.ClsJavaStubByVirtualFileCache"/>
+
     <psi.treeChangePreprocessor implementation="org.jetbrains.kotlin.idea.caches.KotlinPackageStatementPsiTreeChangePreprocessor"/>
     <applicationService serviceImplementation="org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache"/>
 
diff --git a/idea/resources/META-INF/inspections.xml b/idea/resources/META-INF/inspections.xml
index eb699fcedf2..4717ddc6426 100644
--- a/idea/resources/META-INF/inspections.xml
+++ b/idea/resources/META-INF/inspections.xml
@@ -1504,6 +1504,14 @@
                      language="JAVA"
                      key="inspection.kotlin.internal.in.java.display.name" bundle="messages.KotlinBundle"/>
 
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinSealedInheritorsInJavaInspection"
+                     groupPath="Kotlin"
+                     groupName="Java interop issues"
+                     enabledByDefault="true"
+                     level="ERROR"
+                     language="JAVA"
+                     key="inspection.kotlin.sealed.in.java.display.name" bundle="messages.KotlinBundle"/>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.MoveSuspiciousCallableReferenceIntoParenthesesInspection"
                      groupPath="Kotlin"
                      groupName="Probable bugs"
diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml
index be399d9e6f5..e802ce65eb8 100644
--- a/idea/resources/META-INF/plugin-common.xml
+++ b/idea/resources/META-INF/plugin-common.xml
@@ -254,8 +254,6 @@
 
     <projectService serviceImplementation="org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade"/>
 
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.lightClasses.ClsJavaStubByVirtualFileCache"/>
-
     <projectService serviceInterface="org.jetbrains.kotlin.asJava.classes.LightClassInheritanceHelper"
                     serviceImplementation="org.jetbrains.kotlin.idea.caches.lightClasses.IdeLightClassInheritanceHelper"/>
 
@@ -292,6 +290,10 @@
     <projectService serviceInterface="org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport"
                     serviceImplementation="org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupportImpl"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.idea.util.FirPluginOracleService"
+                    serviceImplementation="org.jetbrains.kotlin.idea.util.FirPluginOracleServiceFE10Impl"/>
+
+
     <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
 
     <registryKey key="kotlin.dispatch.thread.resolve.check"
diff --git a/idea/resources/fileTemplates/internal/Kotlin Sealed Interface.kt.ft b/idea/resources/fileTemplates/internal/Kotlin Sealed Interface.kt.ft
new file mode 100644
index 00000000000..70df990d276
--- /dev/null
+++ b/idea/resources/fileTemplates/internal/Kotlin Sealed Interface.kt.ft	
@@ -0,0 +1,5 @@
+#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}
+
+#end
+#parse("File Header.java")
+sealed interface ${NAME}
\ No newline at end of file
diff --git a/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
index 58a941e2496..383712fa1f7 100644
--- a/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
+++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/ScratchRunActionTestGenerated.java
@@ -31,6 +31,11 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/scripting-support/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), null, false);
         }
 
+        @TestMetadata("destructuringDecls.kts")
+        public void testDestructuringDecls() throws Exception {
+            runTest("idea/scripting-support/testData/scratch/destructuringDecls.kts");
+        }
+
         @TestMetadata("for.kts")
         public void testFor() throws Exception {
             runTest("idea/scripting-support/testData/scratch/for.kts");
@@ -119,6 +124,11 @@ public class ScratchRunActionTestGenerated extends AbstractScratchRunActionTest
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/scripting-support/testData/scratch"), Pattern.compile("^(.+)\\.kts$"), null, false);
         }
 
+        @TestMetadata("destructuringDecls.kts")
+        public void testDestructuringDecls() throws Exception {
+            runTest("idea/scripting-support/testData/scratch/destructuringDecls.kts");
+        }
+
         @TestMetadata("for.kts")
         public void testFor() throws Exception {
             runTest("idea/scripting-support/testData/scratch/for.kts");
diff --git a/idea/scripting-support/testData/scratch/destructuringDecls.comp.after b/idea/scripting-support/testData/scratch/destructuringDecls.comp.after
new file mode 100644
index 00000000000..e950d3bd456
--- /dev/null
+++ b/idea/scripting-support/testData/scratch/destructuringDecls.comp.after
@@ -0,0 +1,7 @@
+// REPL_MODE: false
+
+val (foo, bar) = 1 to "2"    // RESULT: val foo: Int; val bar: String
+foo                          // RESULT: 1
+bar                          // RESULT: 2
+val (_, baz) = 3 to "4"      // RESULT: val baz: String
+baz                          // RESULT: 4
\ No newline at end of file
diff --git a/idea/scripting-support/testData/scratch/destructuringDecls.kts b/idea/scripting-support/testData/scratch/destructuringDecls.kts
new file mode 100644
index 00000000000..e24c166f89f
--- /dev/null
+++ b/idea/scripting-support/testData/scratch/destructuringDecls.kts
@@ -0,0 +1,7 @@
+// REPL_MODE: ~REPL_MODE~
+
+val (foo, bar) = 1 to "2"
+foo
+bar
+val (_, baz) = 3 to "4"
+baz
diff --git a/idea/scripting-support/testData/scratch/destructuringDecls.repl.after b/idea/scripting-support/testData/scratch/destructuringDecls.repl.after
new file mode 100644
index 00000000000..531cdbbc5f5
--- /dev/null
+++ b/idea/scripting-support/testData/scratch/destructuringDecls.repl.after
@@ -0,0 +1,7 @@
+// REPL_MODE: true
+
+val (foo, bar) = 1 to "2"
+foo                          // RESULT: res1: kotlin.Int = 1
+bar                          // RESULT: res2: kotlin.String = 2
+val (_, baz) = 3 to "4"
+baz                          // RESULT: res4: kotlin.String = 4
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
index 48ec0ce9c98..a3f84b8d80b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
@@ -29,9 +29,11 @@ import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
 import com.intellij.util.IncorrectOperationException
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinIcons
+import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
 import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
@@ -91,11 +93,20 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
                 KotlinIcons.INTERFACE,
                 "Kotlin Interface"
             )
-            .addKind(
-                KotlinBundle.message("action.new.file.dialog.data.class.title"),
-                KotlinIcons.CLASS,
-                "Kotlin Data Class"
+
+        if (project.getLanguageVersionSettings().supportsFeature(LanguageFeature.SealedInterfaces)) {
+            builder.addKind(
+                KotlinBundle.message("action.new.file.dialog.sealed.interface.title"),
+                KotlinIcons.INTERFACE,
+                "Kotlin Sealed Interface"
             )
+        }
+
+        builder.addKind(
+            KotlinBundle.message("action.new.file.dialog.data.class.title"),
+            KotlinIcons.CLASS,
+            "Kotlin Data Class"
+        )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.enum.title"),
                 KotlinIcons.ENUM,
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.201 b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.201
index e366c6c2127..570237a05fa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.201
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.201
@@ -29,9 +29,11 @@ import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
 import com.intellij.util.IncorrectOperationException
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinIcons
+import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
 import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
@@ -91,11 +93,20 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
                 KotlinIcons.INTERFACE,
                 "Kotlin Interface"
             )
-            .addKind(
-                KotlinBundle.message("action.new.file.dialog.data.class.title"),
-                KotlinIcons.CLASS,
-                "Kotlin Data Class"
+
+        if (project.getLanguageVersionSettings().supportsFeature(LanguageFeature.SealedInterfaces)) {
+            builder.addKind(
+                KotlinBundle.message("action.new.file.dialog.sealed.interface.title"),
+                KotlinIcons.INTERFACE,
+                "Kotlin Sealed Interface"
             )
+        }
+
+        builder.addKind(
+            KotlinBundle.message("action.new.file.dialog.data.class.title"),
+            KotlinIcons.CLASS,
+            "Kotlin Data Class"
+        )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.enum.title"),
                 KotlinIcons.ENUM,
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.203 b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.203
index df7ab319f36..1a2ffc7eb78 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.203
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt.203
@@ -29,9 +29,11 @@ import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
 import com.intellij.util.IncorrectOperationException
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinIcons
+import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
 import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
@@ -91,11 +93,20 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
                 KotlinIcons.INTERFACE,
                 "Kotlin Interface"
             )
-            .addKind(
-                KotlinBundle.message("action.new.file.dialog.data.class.title"),
-                KotlinIcons.CLASS,
-                "Kotlin Data Class"
+
+        if (project.getLanguageVersionSettings().supportsFeature(LanguageFeature.SealedInterfaces)) {
+            builder.addKind(
+                KotlinBundle.message("action.new.file.dialog.sealed.interface.title"),
+                KotlinIcons.INTERFACE,
+                "Kotlin Sealed Interface"
             )
+        }
+
+        builder.addKind(
+            KotlinBundle.message("action.new.file.dialog.data.class.title"),
+            KotlinIcons.CLASS,
+            "Kotlin Data Class"
+        )
             .addKind(
                 KotlinBundle.message("action.new.file.dialog.enum.title"),
                 KotlinIcons.ENUM,
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinSealedInheritorsInJavaInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinSealedInheritorsInJavaInspection.kt
new file mode 100644
index 00000000000..572f5b00f55
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinSealedInheritorsInJavaInspection.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2019 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.idea.inspections
+
+import com.intellij.codeInspection.LocalInspectionTool
+import com.intellij.codeInspection.ProblemHighlightType
+import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.psi.*
+import com.intellij.psi.impl.source.PsiClassReferenceType
+import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
+import org.jetbrains.kotlin.descriptors.isSealed
+import org.jetbrains.kotlin.idea.KotlinBundle
+
+
+class KotlinSealedInheritorsInJavaInspection : LocalInspectionTool() {
+    companion object {
+        private fun PsiClass.listSealedParentReferences(): List<PsiReference> {
+            if (this is PsiAnonymousClass && baseClassType.isKotlinSealed())
+                return listOf(baseClassReference)
+
+            val sealedBaseClasses = extendsList?.listSealedMembers()
+            val sealedBaseInterfaces = implementsList?.listSealedMembers()
+
+            return sealedBaseClasses.orEmpty() + sealedBaseInterfaces.orEmpty()
+        }
+
+        private fun PsiReferenceList.listSealedMembers(): List<PsiReference>? = referencedTypes
+            ?.filter { it.isKotlinSealed() }
+            ?.mapNotNull { it as? PsiClassReferenceType }
+            ?.map { it.reference }
+
+        private fun PsiClassType.isKotlinSealed(): Boolean = resolve()?.isKotlinSealed() == true
+
+        private fun PsiClass.isKotlinSealed(): Boolean = this is KtUltraLightClass && getDescriptor()?.isSealed() == true
+
+        private val PsiClass.abstractionTypeName: String
+            get() = if (isInterface) "interface" else "class"
+    }
+
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : JavaElementVisitor() {
+            override fun visitClass(aClass: PsiClass?) {
+                aClass?.listSealedParentReferences()?.forEach {
+                    holder.registerProblem(
+                        it, KotlinBundle.message("inheritance.of.kotlin.sealed", 0.takeIf { aClass.isInterface } ?: 1),
+                        ProblemHighlightType.GENERIC_ERROR_OR_WARNING
+                    )
+                }
+            }
+
+            override fun visitAnonymousClass(aClass: PsiAnonymousClass?) = visitClass(aClass)
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/FirPluginOracleServiceFE10Impl.kt b/idea/src/org/jetbrains/kotlin/idea/util/FirPluginOracleServiceFE10Impl.kt
new file mode 100644
index 00000000000..b2e423bcd58
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/util/FirPluginOracleServiceFE10Impl.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2020 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.idea.util
+
+@Suppress("OverridingDeprecatedMember")
+class FirPluginOracleServiceFE10Impl : FirPluginOracleService() {
+    override fun isFirPlugin(): Boolean = false
+}
\ No newline at end of file
diff --git a/idea/testData/checker/sealed/SealedOutsidePackageInheritors.kt b/idea/testData/checker/sealed/SealedOutsidePackageInheritors.kt
index d41af6d0112..20614c3a381 100644
--- a/idea/testData/checker/sealed/SealedOutsidePackageInheritors.kt
+++ b/idea/testData/checker/sealed/SealedOutsidePackageInheritors.kt
@@ -3,5 +3,5 @@ package sealed.otherpackage
 import sealed.SealedDeclarationInterface
 import sealed.SealedDeclarationClass
 
-class D: <error descr="[SEALED_INHERITOR_IN_DIFFERENT_PACKAGE] Inheritor of sealed class or interface declared in package sealed but it must be in package {2} where base class is declared">SealedDeclarationInterface</error>
-class DClass: <error descr="[SEALED_INHERITOR_IN_DIFFERENT_PACKAGE] Inheritor of sealed class or interface declared in package sealed but it must be in package {2} where base class is declared">SealedDeclarationClass</error>()
\ No newline at end of file
+class D: <error descr="[SEALED_INHERITOR_IN_DIFFERENT_PACKAGE] Inheritor of sealed class or interface declared in package sealed.otherpackage but it must be in package sealed where base class is declared">SealedDeclarationInterface</error>
+class DClass: <error descr="[SEALED_INHERITOR_IN_DIFFERENT_PACKAGE] Inheritor of sealed class or interface declared in package sealed.otherpackage but it must be in package sealed where base class is declared">SealedDeclarationClass</error>()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java
index 3fed91ba2a6..5d4f2628330 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java
@@ -15,4 +15,6 @@ public class <caret>A {
     public static void foos() {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/fir/lazyResolve/elvis/main.txt b/idea/testData/fir/lazyResolve/elvis/main.txt
index a044e0f0df3..27f53e95fde 100644
--- a/idea/testData/fir/lazyResolve/elvis/main.txt
+++ b/idea/testData/fir/lazyResolve/elvis/main.txt
@@ -1,6 +1,6 @@
 FILE: main.kt
-    public final [BODY_RESOLVE] class WithElvis : R|kotlin/Any| {
-        public constructor(value: R|kotlin/String?|): R|elvis/WithElvis| {
+    public final [CONTRACTS] class WithElvis : R|kotlin/Any| {
+        public [CONTRACTS] constructor(value: R|kotlin/String?|): R|elvis/WithElvis| {
             super<R|kotlin/Any|>()
         }
 
diff --git a/idea/testData/fir/lazyResolve/inInit/main.txt b/idea/testData/fir/lazyResolve/inInit/main.txt
index f22840a6425..02321541b3e 100644
--- a/idea/testData/fir/lazyResolve/inInit/main.txt
+++ b/idea/testData/fir/lazyResolve/inInit/main.txt
@@ -1,6 +1,6 @@
 FILE: main.kt
     public final [BODY_RESOLVE] class Foo : R|kotlin/Any| {
-        public constructor(): R|Foo| {
+        public [BODY_RESOLVE] constructor(): R|Foo| {
             super<R|kotlin/Any|>()
         }
 
diff --git a/idea/testData/fir/lazyResolve/inSecondary/main.txt b/idea/testData/fir/lazyResolve/inSecondary/main.txt
index 1d7a239ddf9..a7d90399fd8 100644
--- a/idea/testData/fir/lazyResolve/inSecondary/main.txt
+++ b/idea/testData/fir/lazyResolve/inSecondary/main.txt
@@ -1,9 +1,9 @@
 FILE: main.kt
-    public final [BODY_RESOLVE] class Foo : R|kotlin/Any| {
+    public final [CONTRACTS] class Foo : R|kotlin/Any| {
         public final [CONTRACTS] val x: R|kotlin/Int|
             public get(): R|kotlin/Int|
 
-        public constructor(): R|Foo| {
+        public [BODY_RESOLVE] constructor(): R|Foo| {
             super<R|kotlin/Any|>()
             this@R|/Foo|.R|/Foo.x| = Int(42)
         }
diff --git a/idea/testData/fir/lazyResolve/secondary/main.txt b/idea/testData/fir/lazyResolve/secondary/main.txt
index 1b8de2ec511..cff06d08a32 100644
--- a/idea/testData/fir/lazyResolve/secondary/main.txt
+++ b/idea/testData/fir/lazyResolve/secondary/main.txt
@@ -1,6 +1,6 @@
 FILE: main.kt
     public final [STATUS] class My : R|kotlin/Any| {
-        public constructor(): R|My| {
+        public [STATUS] constructor(): R|My| {
             super<R|kotlin/Any|>()
         }
 
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
deleted file mode 100644
index c5eb7f5c603..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
+++ /dev/null
@@ -1,59 +0,0 @@
-plugins {
-    id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
-}
-repositories {
-    {{kotlin_plugin_repositories}}
-}
-group 'com.example'
-version '0.0.1'
-
-apply plugin: 'maven-publish'
-
-kotlin {
-    jvm()
-    js {
-        browser {
-        }
-        nodejs {
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib-common')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation kotlin('stdlib-jdk8')
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test')
-                implementation kotlin('test-junit')
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation kotlin('stdlib-js')
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-        mingwMain {
-        }
-        mingwTest {
-        }
-    }
-}
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties
deleted file mode 100644
index 29e08e8ca88..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-kotlin.code.style=official
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
deleted file mode 100644
index 65d15f5c2f7..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-pluginManagement {
-    repositories {
-        {{kotlin_plugin_repositories}}
-    }
-}
-
-rootProject.name = 'mppLibrary'
-
-enableFeaturePreview('GRADLE_METADATA')
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt
deleted file mode 100644
index 853f893b8c9..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package sample
-
-expect class <lineMarker descr="Has actuals in JS, JVM">Sample</lineMarker>() {
-    fun <lineMarker descr="Has actuals in JS, JVM">checkMe</lineMarker>(): Int
-}
-
-expect object <lineMarker descr="Has actuals in JS, JVM">Platform</lineMarker> {
-    val <lineMarker descr="Has actuals in JS, JVM">name</lineMarker>: String
-}
-
-fun hello(): String = "Hello from ${Platform.name}"
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt
deleted file mode 100644
index 2d298871ae8..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/commonTest/kotlin/sample/SampleTests.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package sample
-
-import kotlin.test.Test
-import kotlin.test.assertTrue
-
-class <lineMarker descr="Run Test">SampleTests</lineMarker> {
-    @Test
-    fun <lineMarker descr="Run Test">testMe</lineMarker>() {
-        assertTrue(Sample().checkMe() > 0)
-    }
-}
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt
deleted file mode 100644
index 5bac311f4d4..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package sample
-
-actual class <lineMarker descr="Has declaration in common module">Sample</lineMarker> {
-    actual fun <lineMarker descr="Has declaration in common module">checkMe</lineMarker>() = 12
-}
-
-actual object <lineMarker descr="Has declaration in common module">Platform</lineMarker> {
-    actual val <lineMarker descr="Has declaration in common module">name</lineMarker>: String = "JS"
-}
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt
deleted file mode 100644
index 14f2be23f42..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package sample
-
-actual class <lineMarker descr="Has declaration in common module">Sample</lineMarker> {
-    actual fun <lineMarker descr="Has declaration in common module">checkMe</lineMarker>() = 42
-}
-
-actual object <lineMarker descr="Has declaration in common module">Platform</lineMarker> {
-    actual val <lineMarker descr="Has declaration in common module">name</lineMarker>: String = "JVM"
-}
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt
deleted file mode 100644
index faa97a40242..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/src/jvmTest/kotlin/sample/SampleTestsJVM.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package sample
-
-import kotlin.test.Test
-import kotlin.test.assertTrue
-
-class <lineMarker descr="Run Test">SampleTestsJVM</lineMarker> {
-    @Test
-    fun <lineMarker descr="Run Test">testHello</lineMarker>() {
-        assertTrue("JVM" in hello())
-    }
-}
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
deleted file mode 100644
index c5eb7f5c603..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
+++ /dev/null
@@ -1,59 +0,0 @@
-plugins {
-    id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
-}
-repositories {
-    {{kotlin_plugin_repositories}}
-}
-group 'com.example'
-version '0.0.1'
-
-apply plugin: 'maven-publish'
-
-kotlin {
-    jvm()
-    js {
-        browser {
-        }
-        nodejs {
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib-common')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation kotlin('stdlib-jdk8')
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test')
-                implementation kotlin('test-junit')
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation kotlin('stdlib-js')
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-        mingwMain {
-        }
-        mingwTest {
-        }
-    }
-}
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties
deleted file mode 100644
index 29e08e8ca88..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-kotlin.code.style=official
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
deleted file mode 100644
index 65d15f5c2f7..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-pluginManagement {
-    repositories {
-        {{kotlin_plugin_repositories}}
-    }
-}
-
-rootProject.name = 'mppLibrary'
-
-enableFeaturePreview('GRADLE_METADATA')
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt
deleted file mode 100644
index 3a8718e2512..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/commonMain/kotlin/sample/Sample.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package sample
-fun common(): Boolean {
-    return <error descr="[TYPE_MISMATCH] Type mismatch: inferred type is String but Boolean was expected" textAttributesKey="ERRORS_ATTRIBUTES">""</error>
-}
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt
deleted file mode 100644
index 8b9b5ac59e5..00000000000
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jvmMain/kotlin/sample/SampleJvm.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package sample
-
-fun jvm() {
-    println(common())
-    println(<error descr="[UNRESOLVED_REFERENCE] Unresolved reference: js" textAttributesKey="WRONG_REFERENCES_ATTRIBUTES">js</error>())
-}
\ No newline at end of file
diff --git a/idea/testData/highlighter/AutoCreatedItParameter.kt b/idea/testData/highlighter/AutoCreatedItParameter.kt
index 68af0a13a90..f50f05c068b 100644
--- a/idea/testData/highlighter/AutoCreatedItParameter.kt
+++ b/idea/testData/highlighter/AutoCreatedItParameter.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun <info textAttributesKey="KOTLIN_FUNCTION_DECLARATION">test</info>() {
     val <info textAttributesKey="KOTLIN_LOCAL_VARIABLE">vect</info> = <info textAttributesKey="KOTLIN_CONSTRUCTOR">MyIterable</info><<info textAttributesKey="KOTLIN_CLASS">Int</info>>()
     <info textAttributesKey="KOTLIN_LOCAL_VARIABLE">vect</info>.<info textAttributesKey="KOTLIN_FUNCTION_CALL">filter</info> { <info textAttributesKey="KOTLIN_CLOSURE_DEFAULT_PARAMETER">it</info> != 2 }.<info textAttributesKey="KOTLIN_FUNCTION_CALL">forEach</info> { <info textAttributesKey="KOTLIN_CLOSURE_DEFAULT_PARAMETER">it</info>.<info textAttributesKey="KOTLIN_FUNCTION_CALL">toString</info>() }
diff --git a/idea/testData/multiFileInspections/kotlinSealedInJavaTest/before/JavaTriesToExtendKotlinSealed.java b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/before/JavaTriesToExtendKotlinSealed.java
new file mode 100644
index 00000000000..2ab7d257214
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/before/JavaTriesToExtendKotlinSealed.java
@@ -0,0 +1,18 @@
+public class JavaTriesToExtendKotlinSealed {
+
+    private static class TryToImplement implements KotlinSealedInterface {}
+    private static interface TryToExtend extends KotlinSealedInterface {}
+    private static class TryToExtendClass extends KotlinSealedClass {}
+
+    class OkToImplement implements KotlinInterface {}
+    interface OkToExtend extends KotlinInterface {}
+    class OkToExtendClass extends KotlinClass{}
+
+    public static void main(String[] args) {
+        KotlinSealedInterface sealedInterface = new KotlinSealedInterface() {}; // anonymouns class implements interface
+        KotlinSealedClass sealedClass = new KotlinSealedClass() {};
+
+        new KotlinInterface() {};
+        new KotlinClass() {};
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/multiFileInspections/kotlinSealedInJavaTest/before/KotlinSealedDeclarations.kt b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/before/KotlinSealedDeclarations.kt
new file mode 100644
index 00000000000..7e9097cee71
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/before/KotlinSealedDeclarations.kt
@@ -0,0 +1,5 @@
+sealed interface KotlinSealedInterface
+sealed class KotlinSealedClass
+
+interface KotlinInterface: KotlinSealedInterface
+class KotlinClass: KotlinSealedClass()
\ No newline at end of file
diff --git a/idea/testData/multiFileInspections/kotlinSealedInJavaTest/expected.xml b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/expected.xml
new file mode 100644
index 00000000000..585da3710b0
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/expected.xml
@@ -0,0 +1,72 @@
+<problems>
+  <problem>
+    <file>JavaTriesToExtendKotlinSealed.java</file>
+    <line>3</line>
+    <module>testKotlinSealedInJavaTest_KotlinSealedInJavaTest</module>
+    <package>&lt;default&gt;</package>
+    <entry_point TYPE="class" FQNAME="JavaTriesToExtendKotlinSealed.TryToImplement"/>
+    <problem_class id="KotlinSealedInheritorsInJava" severity="ERROR" attribute_key="ERRORS_ATTRIBUTES">Inheritance of Kotlin sealed
+      interface/class from Java
+    </problem_class>
+    <description>Java class cannot be a part of Kotlin sealed hierarchy</description>
+    <highlighted_element>KotlinSealedInterface</highlighted_element>
+    <offset>4</offset>
+    <length>71</length>
+  </problem>
+
+  <problem>
+    <file>JavaTriesToExtendKotlinSealed.java</file>
+    <line>4</line>
+    <module>testKotlinSealedInJavaTest_KotlinSealedInJavaTest</module>
+    <package>&lt;default&gt;</package>
+    <entry_point TYPE="class" FQNAME="JavaTriesToExtendKotlinSealed.TryToExtend"/>
+    <problem_class id="KotlinSealedInheritorsInJava" severity="ERROR" attribute_key="ERRORS_ATTRIBUTES">Inheritance of Kotlin sealed
+      interface/class from Java
+    </problem_class>
+    <description>Java interface cannot be a part of Kotlin sealed hierarchy</description>
+    <highlighted_element>KotlinSealedInterface</highlighted_element>
+    <offset>4</offset>
+    <length>69</length>
+  </problem>
+
+  <problem>
+    <file>JavaTriesToExtendKotlinSealed.java</file>
+    <line>5</line>
+    <module>testKotlinSealedInJavaTest_KotlinSealedInJavaTest</module>
+    <package>&lt;default&gt;</package>
+    <entry_point TYPE="class" FQNAME="JavaTriesToExtendKotlinSealed.TryToExtendClass"/>
+    <problem_class id="KotlinSealedInheritorsInJava" severity="ERROR" attribute_key="ERRORS_ATTRIBUTES">Inheritance of Kotlin sealed
+      interface/class from Java
+    </problem_class>
+    <description>Java class cannot be a part of Kotlin sealed hierarchy</description>
+    <highlighted_element>KotlinSealedClass</highlighted_element>
+    <offset>4</offset>
+    <length>66</length>
+  </problem>
+
+  <problem>
+    <file>JavaTriesToExtendKotlinSealed.java</file>
+    <line>12</line>
+    <module>testKotlinSealedInJavaTest_KotlinSealedInJavaTest</module>
+    <package>&lt;default&gt;</package>
+    <entry_point TYPE="class" FQNAME="JavaTriesToExtendKotlinSealed$1" />
+    <problem_class id="KotlinSealedInheritorsInJava" severity="ERROR" attribute_key="ERRORS_ATTRIBUTES">Inheritance of Kotlin sealed interface/class from Java</problem_class>
+    <description>Java class cannot be a part of Kotlin sealed hierarchy</description>
+    <highlighted_element>KotlinSealedInterface</highlighted_element>
+    <offset>52</offset>
+    <length>26</length>
+  </problem>
+
+  <problem>
+    <file>JavaTriesToExtendKotlinSealed.java</file>
+    <line>13</line>
+    <module>testKotlinSealedInJavaTest_KotlinSealedInJavaTest</module>
+    <package>&lt;default&gt;</package>
+    <entry_point TYPE="class" FQNAME="JavaTriesToExtendKotlinSealed$2" />
+    <problem_class id="KotlinSealedInheritorsInJava" severity="ERROR" attribute_key="ERRORS_ATTRIBUTES">Inheritance of Kotlin sealed interface/class from Java</problem_class>
+    <description>Java class cannot be a part of Kotlin sealed hierarchy</description>
+    <highlighted_element>KotlinSealedClass()</highlighted_element>
+    <offset>44</offset>
+    <length>22</length>
+  </problem>
+</problems>
\ No newline at end of file
diff --git a/idea/testData/multiFileInspections/kotlinSealedInJavaTest/kotlinSealedInJavaTest.test b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/kotlinSealedInJavaTest.test
new file mode 100644
index 00000000000..ef7ba9896b7
--- /dev/null
+++ b/idea/testData/multiFileInspections/kotlinSealedInJavaTest/kotlinSealedInJavaTest.test
@@ -0,0 +1,3 @@
+{
+    "inspectionClass": "org.jetbrains.kotlin.idea.inspections.KotlinSealedInheritorsInJavaInspection"
+}
\ No newline at end of file
diff --git a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
index 53282e881ae..390c9123cfd 100644
--- a/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/expectWithActualInSameModule/common/common.kt
@@ -2,7 +2,7 @@ package sample
 
 expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameFile<!>()
 
-actual fun <!LINE_MARKER("descr='null'")!>sameFile<!>() = Unit
+actual fun <!LINE_MARKER!>sameFile<!>() = Unit
 
 expect fun <!LINE_MARKER("descr='Has actuals in common'")!>sameModule<!>()
 
diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt b/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt
index 9165ee6ca4c..e1883480d0e 100644
--- a/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt
+++ b/idea/testData/multiplatform/aliasesTypeMismatch/common/common.kt
@@ -1,9 +1,9 @@
 @file:Suppress("UNUSED_PARAMETER")
 
-expect open class MyCancelException : MyIllegalStateException
+expect open class <!LINE_MARKER("descr='Has actuals in JVM'")!>MyCancelException<!> : MyIllegalStateException
 
 fun cancel(cause: MyCancelException) {}
 
-expect open class OtherException : MyIllegalStateException
+expect open class <!LINE_MARKER("descr='Has actuals in JVM'")!>OtherException<!> : MyIllegalStateException
 
 fun other(cause: OtherException) {}
diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt b/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt
index b089ad48d19..d6897aa74aa 100644
--- a/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt
+++ b/idea/testData/multiplatform/aliasesTypeMismatch/commonLibrary/lib.kt
@@ -1,3 +1,3 @@
-public expect open class MyException
+public expect open class <!LINE_MARKER("descr='Is subclassed by MyCancelException [common] MyIllegalStateException [commonLibrary] OtherException [common]'"), LINE_MARKER("descr='Has actuals in JVM'")!>MyException<!>
 
-public expect open class MyIllegalStateException : MyException
\ No newline at end of file
+public expect open class <!LINE_MARKER("descr='Is subclassed by MyCancelException [common] OtherException [common]'"), LINE_MARKER("descr='Has actuals in JVM'")!>MyIllegalStateException<!> : MyException
\ No newline at end of file
diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt
index 5595c8ef7a0..87b9e881de5 100644
--- a/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt
+++ b/idea/testData/multiplatform/aliasesTypeMismatch/jvm/jvm.kt
@@ -1,6 +1,6 @@
-actual typealias MyCancelException = platform.lib.MyCancellationException
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>MyCancelException<!> = platform.lib.MyCancellationException
 
-actual open class OtherException : platform.lib.MyIllegalStateException()
+actual open class <!LINE_MARKER("descr='Has declaration in common module'")!>OtherException<!> : platform.lib.MyIllegalStateException()
 
 fun test() {
     cancel(MyCancelException()) // TYPE_MISMATCH
diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt
index 0a03dd29ca8..6a7831a6830 100644
--- a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt
+++ b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/bindings.kt
@@ -1,3 +1,3 @@
-actual typealias MyException = platform.lib.MyException
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>MyException<!> = platform.lib.MyException
 
-actual typealias MyIllegalStateException = platform.lib.MyIllegalStateException
\ No newline at end of file
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>MyIllegalStateException<!> = platform.lib.MyIllegalStateException
\ No newline at end of file
diff --git a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt
index cf9578251a6..93e4146c88e 100644
--- a/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt
+++ b/idea/testData/multiplatform/aliasesTypeMismatch/jvmLibrary/core.kt
@@ -1,7 +1,7 @@
 package platform.lib
 
-open class MyException
+open class <!LINE_MARKER("descr='Is subclassed by MyCancellationException MyIllegalStateException OtherException [jvm]'")!>MyException<!>
 
-open class MyIllegalStateException : MyException()
+open class <!LINE_MARKER("descr='Is subclassed by MyCancellationException OtherException [jvm]'")!>MyIllegalStateException<!> : MyException()
 
 open class MyCancellationException : MyIllegalStateException()
\ No newline at end of file
diff --git a/idea/testData/multiplatform/callableReferences/common-1/common-1.kt b/idea/testData/multiplatform/callableReferences/common-1/common-1.kt
index 936a5830396..8d4f8286fce 100644
--- a/idea/testData/multiplatform/callableReferences/common-1/common-1.kt
+++ b/idea/testData/multiplatform/callableReferences/common-1/common-1.kt
@@ -2,8 +2,8 @@
 
 package sample
 
-expect interface A {
-    fun common_1_A()
+expect interface <!LINE_MARKER("descr='Is subclassed by B [common-1] B [jvm]'"), LINE_MARKER("descr='Has actuals in common'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in common'")!>common_1_A<!>()
 }
 
 expect interface B : A {
diff --git a/idea/testData/multiplatform/callableReferences/common-2/common-2.kt b/idea/testData/multiplatform/callableReferences/common-2/common-2.kt
index 3d02aceaae2..a8a9d362182 100644
--- a/idea/testData/multiplatform/callableReferences/common-2/common-2.kt
+++ b/idea/testData/multiplatform/callableReferences/common-2/common-2.kt
@@ -2,12 +2,12 @@
 
 package sample
 
-expect interface C {
-    fun common_2_C()
+expect interface <!LINE_MARKER("descr='Is subclassed by A [common-2] B [jvm]'"), LINE_MARKER("descr='Has actuals in JVM'")!>C<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>common_2_C<!>()
 }
 
-actual interface A : C {
-    actual fun common_1_A()
+actual interface <!LINE_MARKER("descr='Is implemented by B [jvm]'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!> : C {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>common_1_A<!>()
     fun common_2_A()
 }
 
diff --git a/idea/testData/multiplatform/callableReferences/jvm/jvm.kt b/idea/testData/multiplatform/callableReferences/jvm/jvm.kt
index 3cbbfae12ef..1d5ef831620 100644
--- a/idea/testData/multiplatform/callableReferences/jvm/jvm.kt
+++ b/idea/testData/multiplatform/callableReferences/jvm/jvm.kt
@@ -2,8 +2,8 @@
 
 package sample
 
-actual interface C {
-    actual fun common_2_C()
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>C<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>common_2_C<!>()
     fun jvm_C()
 }
 
diff --git a/idea/testData/multiplatform/constructorsOfExpect/common/common.kt b/idea/testData/multiplatform/constructorsOfExpect/common/common.kt
index a4a56d42678..28054c745cc 100644
--- a/idea/testData/multiplatform/constructorsOfExpect/common/common.kt
+++ b/idea/testData/multiplatform/constructorsOfExpect/common/common.kt
@@ -1,3 +1,3 @@
-expect class A {
-    fun commonMember()
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonMember<!>()
 }
diff --git a/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt b/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt
index 176156e3830..37f1a157d9b 100644
--- a/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt
+++ b/idea/testData/multiplatform/constructorsOfExpect/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class A {
-    actual fun commonMember() { }
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonMember<!>() { }
 
     fun platformMember() { }
 }
diff --git a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt
index d19352369f0..d309fd727ee 100644
--- a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt
+++ b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/common/common.kt
@@ -1,6 +1,6 @@
 // KT-34027
-expect interface A<T> {
-    fun foo(x: T)
+expect interface <!LINE_MARKER("descr='Has actuals in JS'")!>A<!><T> {
+    fun <!LINE_MARKER("descr='Has actuals in JS'")!>foo<!>(x: T)
 }
 
 fun bar(): A<String> = null!!
diff --git a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt
index b2af8823566..5a2ae073160 100644
--- a/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt
+++ b/idea/testData/multiplatform/correctOverloadResolutionAmbiguity/js/js.kt
@@ -1,5 +1,5 @@
-actual interface A<T> {
-    actual fun foo(x: T)
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>A<!><T> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(x: T)
     fun foo(x: String)
 }
 
diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt b/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt
index 7cb32d6ba6d..4dd0a18697a 100644
--- a/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt
+++ b/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt
@@ -1,6 +1,6 @@
 package sample
 
-fun main() {
+fun <!LINE_MARKER!>main<!>() {
     ActualizedInLeft()
     ActualizedInRight()
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt b/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt
index 66e0de55eb6..3bc96c173c8 100644
--- a/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt
+++ b/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt
@@ -1,3 +1,3 @@
 package sample
 
-actual class ActualizedInLeft
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ActualizedInLeft<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt b/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt
index 8e247ab6097..0c2f6b059e6 100644
--- a/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt
+++ b/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt
@@ -1,3 +1,3 @@
 package sample
 
-actual class ActualizedInRight
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ActualizedInRight<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt b/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt
index 38cdbbeb8b4..d94562fb4d8 100644
--- a/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt
+++ b/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt
@@ -1,4 +1,4 @@
 package sample
 
-expect class ActualizedInLeft
-expect class ActualizedInRight
+expect class <!LINE_MARKER("descr='Has actuals in common'")!>ActualizedInLeft<!>
+expect class <!LINE_MARKER("descr='Has actuals in common'")!>ActualizedInRight<!>
diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt
index 7fc554e7629..b93d8d27d43 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt
@@ -5,7 +5,7 @@ actual class A {
     fun fromBottom(): Int = 0
 }
 
-fun main() {
+fun <!LINE_MARKER!>main<!>() {
     A().foo()
 
     // Any behaviour is acceptable, as the code is erroneous.
diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt b/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt
index 44ec2e78907..8b0c9ead635 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt
@@ -1,6 +1,6 @@
 package sample
 
-actual class A /* Left */ {
-    actual fun foo(): Int = 42
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> /* Left */ {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(): Int = 42
     fun fromLeft(): String = ""
 }
diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
index ace4e1bab24..f4d6c1b3ee6 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
@@ -2,6 +2,6 @@
 
 package sample
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, left")!>A<!> {
-    fun <!AMBIGUOUS_ACTUALS("Function 'foo'; bottom, left")!>foo<!>(): Int
+expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, left"), LINE_MARKER("descr='Has actuals in common'")!>A<!> {
+    fun <!AMBIGUOUS_ACTUALS("Function 'foo'; bottom, left"), LINE_MARKER("descr='Has actuals in common'")!>foo<!>(): Int
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt
index 16984b10298..a9d5969c9cb 100644
--- a/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency1/common-1/common-1.kt
@@ -4,8 +4,8 @@ package sample
 
 // --------------------------------------------
 
-expect interface A {
-    fun foo()
+expect interface <!LINE_MARKER("descr='Is subclassed by B'"), LINE_MARKER("descr='Has actuals in JVM (2 modules)'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM (2 modules)'")!>foo<!>()
 }
 
 fun take_A_common_1(x: A) {
diff --git a/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt
index b1b7436c281..54e51a8721a 100644
--- a/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency1/common-2-1/common-2-1.kt
@@ -2,8 +2,8 @@
 
 package sample
 
-actual interface A {
-    actual fun foo()
+actual interface <!LINE_MARKER("descr='Is implemented by B'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>()
     fun bar()
 }
 
diff --git a/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt b/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt
index c66f893d494..9e40e7f0756 100644
--- a/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency1/common-2-2/common-2-2.kt
@@ -2,8 +2,8 @@
 
 package sample
 
-actual interface A {
-    actual fun foo()
+actual interface <!LINE_MARKER("descr='Is implemented by B'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>()
     fun baz()
 }
 
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt
index bb69e60f25a..b4217a515c6 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/common-1/common-1.kt
@@ -6,8 +6,8 @@ interface BB
 interface CC
 interface DD
 
-expect interface A {
-    fun foo_A()
+expect interface <!LINE_MARKER("descr='Is subclassed by B [common-2-1] C [common-2-2] D'"), LINE_MARKER("descr='Has actuals in common'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in common'")!>foo_A<!>()
 }
 
 fun take0(x: A): AA = null!!
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt
index fc55ae8f0f3..0f93db64c1f 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-1/common-2-1.kt
@@ -1,7 +1,7 @@
 @file:Suppress("UNUSED_PARAMETER")
 package sample
 
-expect interface B : A {
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>B<!> : A {
     fun foo_B_1()
 }
 
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt
index e3c86b64062..f646f332538 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-2/common-2-2.kt
@@ -1,7 +1,7 @@
 @file:Suppress("UNUSED_PARAMETER")
 package sample
 
-expect interface C : A {
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>C<!> : A {
     fun foo_C_1()
 }
 
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
index 3e6ef38d791..cecb0f7b99a 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/common-2-3/common-2-3.kt
@@ -1,8 +1,8 @@
 @file:Suppress("UNUSED_PARAMETER")
 package sample
 
-actual interface A {
-    actual fun foo_A()
+actual interface <!LINE_MARKER("descr='Is implemented by D'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo_A<!>()
     fun foo_A_3()
 }
 
diff --git a/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
index 6daf8537af1..5ef37848c39 100644
--- a/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
+++ b/idea/testData/multiplatform/diamondModuleDependency2/jvm/jvm.kt
@@ -9,8 +9,8 @@ interface D : A {
     fun foo_D()
 }
 
-actual typealias B = D
-actual typealias C = D
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>B<!> = D
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>C<!> = D
 
 fun take0(x: D): Unit = null!!
 
diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt
index 774ed917d01..f8e58b8b3b8 100644
--- a/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt
+++ b/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt
@@ -1,6 +1,6 @@
 package sample
 
-fun main() {
+fun <!LINE_MARKER!>main<!>() {
     A().foo()
     // fromLeft should be resolved, because 'left' comes first in dependencies order!
     A().fromLeft()
diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt
index 44ec2e78907..8b0c9ead635 100644
--- a/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt
+++ b/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt
@@ -1,6 +1,6 @@
 package sample
 
-actual class A /* Left */ {
-    actual fun foo(): Int = 42
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> /* Left */ {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(): Int = 42
     fun fromLeft(): String = ""
 }
diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt
index 2926acfa52c..e5b0fc49868 100644
--- a/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt
+++ b/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt
@@ -1,5 +1,5 @@
 package sample
 
-actual class A /* Right */ {
-    actual fun foo(): Int = 100500
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> /* Right */ {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(): Int = 100500
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt
index a359748ada8..efd43ff67a9 100644
--- a/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt
+++ b/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt
@@ -1,5 +1,5 @@
 package sample
 
-expect class A {
-    fun foo(): Int
+expect class <!LINE_MARKER("descr='Has actuals in common (2 modules)'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in common (2 modules)'")!>foo<!>(): Int
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt
index d1d8c72d0c5..c3a3fb50dab 100644
--- a/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt
+++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt
@@ -1 +1 @@
-expect class A
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JS, JVM'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt
index 04176df5fb3..05d8ac707a7 100644
--- a/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt
+++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt
@@ -1,4 +1,4 @@
-actual class A
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>
 
 // Error: ACTUAL_WITHOUT_EXPECT, becuase we shouldn't see expects through usual dependencies
 actual class <!ACTUAL_WITHOUT_EXPECT!>B<!>
diff --git a/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt
index 04176df5fb3..05d8ac707a7 100644
--- a/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt
+++ b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual class A
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>
 
 // Error: ACTUAL_WITHOUT_EXPECT, becuase we shouldn't see expects through usual dependencies
 actual class <!ACTUAL_WITHOUT_EXPECT!>B<!>
diff --git a/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt
index e2147a3138b..7d19eb1d9c0 100644
--- a/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt
+++ b/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt
@@ -1,3 +1,3 @@
 package foo
 
-actual class A
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt
index e84eaec9c89..d1137515042 100644
--- a/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt
@@ -1,3 +1,3 @@
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS!>A<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS, LINE_MARKER("descr='Has actuals in common'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt
index 1de923ea4ad..1bf9764942d 100644
--- a/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt
+++ b/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt
@@ -1,6 +1,6 @@
 package foo
 
-actual class ActualInMiddleCompatibleInBottom
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ActualInMiddleCompatibleInBottom<!>
 class <!ACTUAL_MISSING!>CompatibleInMiddleActualInBottom<!>
 
 class <!ACTUAL_MISSING!>CompatibleInMiddleAndBottom<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
index 502bde6fc0c..51b75054ac3 100644
--- a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
@@ -2,7 +2,7 @@
 
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'; bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
+expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'; bottom, middle"), LINE_MARKER("descr='Has actuals in common'")!>ActualInMiddleCompatibleInBottom<!>
 expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'; bottom, middle")!>CompatibleInMiddleActualInBottom<!>
 
 expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'; bottom, middle")!>CompatibleInMiddleAndBottom<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt
index e2147a3138b..7d19eb1d9c0 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt
@@ -1,3 +1,3 @@
 package foo
 
-actual class A
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
index 587cf9e0e7e..18061733924 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
@@ -2,4 +2,4 @@
 
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, middle")!>A<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, middle"), LINE_MARKER("descr='Has actuals in common'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt
index c6cb1d20e89..9cb1a0fc9a4 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt
@@ -1,3 +1,3 @@
 package foo
 
-actual fun foo(): Int = 42
\ No newline at end of file
+actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(): Int = 42
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt
index 801eaf23873..27e51ca729e 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt
@@ -1,3 +1,3 @@
 package foo
 
-expect fun foo(): Int
\ No newline at end of file
+expect fun <!LINE_MARKER("descr='Has actuals in common'")!>foo<!>(): Int
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
index 21a344f975a..b61482b96d8 100644
--- a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
@@ -1,3 +1,3 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
 
-actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'; left, right")!>A<!>
\ No newline at end of file
+actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'; left, right"), LINE_MARKER("descr='Has declaration in common module'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt
index d1d8c72d0c5..c125bb704ce 100644
--- a/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt
+++ b/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt
@@ -1 +1 @@
-expect class A
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt
index d1d8c72d0c5..c125bb704ce 100644
--- a/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt
+++ b/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt
@@ -1 +1 @@
-expect class A
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt
index 72e8e852980..01f45a4f850 100644
--- a/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt
@@ -1,3 +1,3 @@
 // Note that here we have no ambiguity, becuase we don't consider
 // declarations without 'expect' as potential weakly-compatible 'expect'-counterpart
-actual class A
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt
index d1d8c72d0c5..c125bb704ce 100644
--- a/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt
+++ b/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt
@@ -1 +1 @@
-expect class A
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt
index e5dcb22c9a4..345a75d7011 100644
--- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt
@@ -1 +1 @@
-actual fun foo(): Int = 42
\ No newline at end of file
+actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(): Int = 42
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt
index f5ed19d2be4..2c6611d4048 100644
--- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt
+++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt
@@ -1 +1 @@
-expect fun foo(): Int
\ No newline at end of file
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): Int
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt
index 03905c01a3a..914781262ef 100644
--- a/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt
+++ b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt
@@ -1 +1 @@
-expect fun foo<!NO_ACTUAL_FOR_EXPECT!>(x: Int)<!>: Int
\ No newline at end of file
+expect fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!><!NO_ACTUAL_FOR_EXPECT!>(x: Int)<!>: Int
\ No newline at end of file
diff --git a/idea/testData/multiplatform/extensionOnExpect/common/common.kt b/idea/testData/multiplatform/extensionOnExpect/common/common.kt
index f5ed5d3c5e8..73dfbd5ee50 100644
--- a/idea/testData/multiplatform/extensionOnExpect/common/common.kt
+++ b/idea/testData/multiplatform/extensionOnExpect/common/common.kt
@@ -1,3 +1,3 @@
-expect class E {
-    fun commonMember()
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>E<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonMember<!>()
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt b/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt
index 0bfd36b512d..ae63798640c 100644
--- a/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt
+++ b/idea/testData/multiplatform/extensionOnExpect/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class E {
-    actual fun commonMember() {}
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>E<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonMember<!>() {}
 
     fun platformMember() {}
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/hierarcicalActualization/common/common.kt b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt
index 8c9f28d9ba5..e9550db10ba 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/common/common.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt
@@ -1,6 +1,6 @@
 package foo
 
-expect class ExpectInCommonActualInMiddle
+expect class <!LINE_MARKER("descr='Has actuals in common'")!>ExpectInCommonActualInMiddle<!>
 expect class ExpectInCommonActualInPlatforms
 
 expect class <!NO_ACTUAL_FOR_EXPECT, NO_ACTUAL_FOR_EXPECT!>ExpectInCommonWithoutActual<!>
diff --git a/idea/testData/multiplatform/hierarcicalActualization/js/js.kt b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt
index df196c6a41f..2a66eadb629 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/js/js.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt
@@ -2,9 +2,9 @@ package foo
 
 actual class ExpectInCommonActualInPlatforms
 
-actual class ExpectInMiddleActualInPlatforms
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ExpectInMiddleActualInPlatforms<!>
 
 expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInJsWithoutActual<!>
 
-expect class ExpectInJsActualInJs
-actual class ExpectInJsActualInJs
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JS'")!>ExpectInJsActualInJs<!>
+actual class <!LINE_MARKER!>ExpectInJsActualInJs<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt
index 1e805d06dee..cddd7ac3ff8 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt
@@ -1,9 +1,9 @@
 package foo
 
 actual class ExpectInCommonActualInPlatforms
-actual class ExpectInMiddleActualInPlatforms
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ExpectInMiddleActualInPlatforms<!>
 
 expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInJvmWithoutActual<!>
 
-expect class ExpectInJvmActualInJvm
-actual class ExpectInJvmActualInJvm
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>ExpectInJvmActualInJvm<!>
+actual class <!LINE_MARKER!>ExpectInJvmActualInJvm<!>
diff --git a/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt
index be9956fa5aa..b0b0d46312a 100644
--- a/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt
+++ b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt
@@ -1,7 +1,7 @@
 package foo
 
-actual class ExpectInCommonActualInMiddle
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ExpectInCommonActualInMiddle<!>
 
-expect class ExpectInMiddleActualInPlatforms
+expect class <!LINE_MARKER("descr='Has actuals in JVM, JS'")!>ExpectInMiddleActualInPlatforms<!>
 
 expect class <!NO_ACTUAL_FOR_EXPECT, NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleWithoutActual<!>
diff --git a/idea/testData/multiplatform/incompleteActualization/js/js.kt b/idea/testData/multiplatform/incompleteActualization/js/js.kt
index dbc5bdf0dfb..dc34f0bfa17 100644
--- a/idea/testData/multiplatform/incompleteActualization/js/js.kt
+++ b/idea/testData/multiplatform/incompleteActualization/js/js.kt
@@ -1,4 +1,4 @@
 package foo
 
 actual class ExpectInCommonActualInJsOnly
-actual class ExpectInMiddleActualInJsOnly
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ExpectInMiddleActualInJsOnly<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt b/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt
index aad88a99fbf..325684bd89e 100644
--- a/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt
+++ b/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt
@@ -1,4 +1,4 @@
 package foo
 
 actual class ExpectInCommonActualInJvmOnly
-actual class ExpectInMiddleActualInJvmOnly
\ No newline at end of file
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>ExpectInMiddleActualInJvmOnly<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt
index 7c20ed87f58..af442dc30cf 100644
--- a/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt
+++ b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt
@@ -1,4 +1,4 @@
 package foo
 
-expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleActualInJsOnly<!>
-expect class <!NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleActualInJvmOnly<!>
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JS'"), NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleActualInJsOnly<!>
+expect class <!LINE_MARKER("descr='Has actuals in JVM'"), NO_ACTUAL_FOR_EXPECT!>ExpectInMiddleActualInJvmOnly<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/jsNameClash/common/common.kt b/idea/testData/multiplatform/jsNameClash/common/common.kt
index 173ec86e912..7557dd55776 100644
--- a/idea/testData/multiplatform/jsNameClash/common/common.kt
+++ b/idea/testData/multiplatform/jsNameClash/common/common.kt
@@ -1,7 +1,7 @@
 package sample
 
-expect interface Input
+expect interface <!LINE_MARKER("descr='Is subclassed by AbstractInput JSInput'"), LINE_MARKER("descr='Has actuals in JS'")!>Input<!>
 
-abstract class AbstractInput : Input {
+abstract class <!LINE_MARKER("descr='Is subclassed by JSInput'")!>AbstractInput<!> : Input {
     val head: Int = null!!
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/jsNameClash/js/js.kt b/idea/testData/multiplatform/jsNameClash/js/js.kt
index 826ddab533e..28e76019387 100644
--- a/idea/testData/multiplatform/jsNameClash/js/js.kt
+++ b/idea/testData/multiplatform/jsNameClash/js/js.kt
@@ -1,10 +1,10 @@
 package sample
 
-actual interface Input
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>Input<!>
 
 class JSInput : AbstractInput()
 
 // ------------------------------------
 
-expect class ExpectInJsActualInJs
-actual class ExpectInJsActualInJs
\ No newline at end of file
+expect class <!LINE_MARKER("descr='Has actuals in JS'")!>ExpectInJsActualInJs<!>
+actual class <!LINE_MARKER!>ExpectInJsActualInJs<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt b/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt
index e87a2d0e5eb..6767bf46fce 100644
--- a/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt
+++ b/idea/testData/multiplatform/jvmDefaultNonMpp/base/base.kt
@@ -1,9 +1,9 @@
 package base
 
-interface Check {
-    fun test(): String {
+interface <!LINE_MARKER("descr='Is implemented by CheckClass SubCheck SubCheckClass'")!>Check<!> {
+    fun <!LINE_MARKER("descr='Is overridden in SubCheck'")!>test<!>(): String {
         return "fail";
     }
 }
 
-open class CheckClass : Check
\ No newline at end of file
+open class <!LINE_MARKER("descr='Is subclassed by SubCheckClass'")!>CheckClass<!> : Check
\ No newline at end of file
diff --git a/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt b/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt
index 855274eb2fb..117dcc150b5 100644
--- a/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt
+++ b/idea/testData/multiplatform/jvmDefaultNonMpp/clash/clash.kt
@@ -1,7 +1,7 @@
 import base.*
 
-interface SubCheck : Check {
-    override fun test(): String {
+interface <!LINE_MARKER("descr='Is implemented by SubCheckClass'")!>SubCheck<!> : Check {
+    override fun <!LINE_MARKER("descr='Overrides function in 'Check''")!>test<!>(): String {
         return "OK"
     }
 }
diff --git a/idea/testData/multiplatform/lambdas/common/common.kt b/idea/testData/multiplatform/lambdas/common/common.kt
index d99edc5c950..e0762630055 100644
--- a/idea/testData/multiplatform/lambdas/common/common.kt
+++ b/idea/testData/multiplatform/lambdas/common/common.kt
@@ -2,7 +2,7 @@
 
 package sample
 
-expect interface A
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!>
 
 fun useA(block: A.() -> Unit) {}
 
diff --git a/idea/testData/multiplatform/lambdas/jvm/jvm.kt b/idea/testData/multiplatform/lambdas/jvm/jvm.kt
index 4d1fafed9e6..dd095317abe 100644
--- a/idea/testData/multiplatform/lambdas/jvm/jvm.kt
+++ b/idea/testData/multiplatform/lambdas/jvm/jvm.kt
@@ -1,6 +1,6 @@
 package sample
 
-actual interface A {
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
     fun foo()
 }
 
diff --git a/idea/testData/multiplatform/languageConstructions/common/common.kt b/idea/testData/multiplatform/languageConstructions/common/common.kt
index 01466bf5ea4..93330ab5ed7 100644
--- a/idea/testData/multiplatform/languageConstructions/common/common.kt
+++ b/idea/testData/multiplatform/languageConstructions/common/common.kt
@@ -1,10 +1,10 @@
 package sample
 
-expect class A {
-    fun commonFun()
-    val x: Int
-    val y: Double
-    val z: String
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonFun<!>()
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>x<!>: Int
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>y<!>: Double
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>z<!>: String
 }
 
 fun getCommonA(): A = null!!
\ No newline at end of file
diff --git a/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt b/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt
index d7e898984a7..78ea1c2460d 100644
--- a/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt
+++ b/idea/testData/multiplatform/languageConstructions/jvm/jvm.kt
@@ -2,11 +2,11 @@
 
 package sample
 
-actual data class A(actual val x: Int, actual val y: Double, val t: String)  {
-    actual fun commonFun() {}
+actual data class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!>(actual val x: Int, actual val y: Double, val t: String)  {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonFun<!>() {}
     fun platformFun() {}
 
-    actual val z: String by lazy { "" }
+    actual val <!LINE_MARKER("descr='Has declaration in common module'")!>z<!>: String by lazy { "" }
 
     operator fun iterator(): Iterator<Int> = null!!
 }
diff --git a/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt b/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt
index 9691edc3642..cc761fd8fe0 100644
--- a/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt
+++ b/idea/testData/multiplatform/multilevelParents/common-1/common-1.kt
@@ -2,12 +2,12 @@
 
 package sample
 
-expect interface A {
+expect interface <!LINE_MARKER("descr='Is subclassed by B [common-1] B [common-2] Case_2_3'"), LINE_MARKER("descr='Has actuals in common'")!>A<!> {
     fun common_1_A()
 }
 
-expect interface B : A {
-    fun common_1_B()
+expect interface <!LINE_MARKER("descr='Is subclassed by Case_2_3'"), LINE_MARKER("descr='Has actuals in common'")!>B<!> : A {
+    fun <!LINE_MARKER("descr='Has actuals in common'")!>common_1_B<!>()
 }
 
 fun getB(): B = null!!
diff --git a/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt b/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt
index 091ad08f3e4..5fb8a45458a 100644
--- a/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt
+++ b/idea/testData/multiplatform/multilevelParents/common-2/common-2.kt
@@ -2,15 +2,15 @@
 
 package sample
 
-expect interface A_Common {
-    fun common_1_A()
-    fun common_2_A()
+expect interface <!LINE_MARKER("descr='Is subclassed by B [common-2] Case_2_3'"), LINE_MARKER("descr='Has actuals in JVM'")!>A_Common<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>common_1_A<!>()
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>common_2_A<!>()
 }
 
-actual typealias A = A_Common
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> = A_Common
 
-actual interface B : A {
-    actual fun common_1_B()
+actual interface <!LINE_MARKER("descr='Is implemented by Case_2_3'"), LINE_MARKER("descr='Has declaration in common module'")!>B<!> : A {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>common_1_B<!>()
     fun common_1_2_B()
 }
 
diff --git a/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt b/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt
index 9492bff1f2f..b84b47d59ad 100644
--- a/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt
+++ b/idea/testData/multiplatform/multilevelParents/jvm/jvm.kt
@@ -1,8 +1,8 @@
 package sample
 
-actual interface A_Common {
-    actual fun common_1_A()
-    actual fun common_2_A()
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>A_Common<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>common_1_A<!>()
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>common_2_A<!>()
     fun jvm_A()
 }
 
diff --git a/idea/testData/multiplatform/multiplatformLibrary/common/common.kt b/idea/testData/multiplatform/multiplatformLibrary/common/common.kt
new file mode 100644
index 00000000000..48cb49c4809
--- /dev/null
+++ b/idea/testData/multiplatform/multiplatformLibrary/common/common.kt
@@ -0,0 +1,11 @@
+package sample
+
+expect class <!LINE_MARKER("descr='Has actuals in JVM, JS'")!>Sample<!>() {
+    fun <!LINE_MARKER("descr='Has actuals in JVM, JS'")!>checkMe<!>(): Int
+}
+
+expect object <!LINE_MARKER("descr='Has actuals in JVM, JS'")!>Platform<!> {
+    val <!LINE_MARKER("descr='Has actuals in JVM, JS'")!>name<!>: String
+}
+
+fun hello(): String = "Hello from ${Platform.name}"
\ No newline at end of file
diff --git a/idea/testData/multiplatform/multiplatformLibrary/dependencies.txt b/idea/testData/multiplatform/multiplatformLibrary/dependencies.txt
new file mode 100644
index 00000000000..043dae49965
--- /dev/null
+++ b/idea/testData/multiplatform/multiplatformLibrary/dependencies.txt
@@ -0,0 +1,8 @@
+MODULE common { platform=[JVM, JS, Native]; root=common }
+MODULE jvm { platform=[JVM]; root=jvm; testRoot=jvmTest}
+MODULE js { platform=[JS]; root=js }
+
+common -> STDLIB_COMMON { kind=DEPENDENCY }
+jvm -> common { kind=DEPENDS_ON }
+jvm -> STDLIB_JVM, KOTLIN_TEST, KOTLIN_TEST_JVM, JUNIT, MOCK_JDK { kind=DEPENDENCY }
+js -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/multiplatformLibrary/js/js.kt b/idea/testData/multiplatform/multiplatformLibrary/js/js.kt
new file mode 100644
index 00000000000..9b6d8c25e2b
--- /dev/null
+++ b/idea/testData/multiplatform/multiplatformLibrary/js/js.kt
@@ -0,0 +1,9 @@
+package sample
+
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Sample<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>checkMe<!>() = 12
+}
+
+actual object <!LINE_MARKER("descr='Has declaration in common module'")!>Platform<!> {
+    actual val <!LINE_MARKER("descr='Has declaration in common module'")!>name<!>: String = "JS"
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/multiplatformLibrary/jvm/jvm.kt b/idea/testData/multiplatform/multiplatformLibrary/jvm/jvm.kt
new file mode 100644
index 00000000000..65ed9655a3d
--- /dev/null
+++ b/idea/testData/multiplatform/multiplatformLibrary/jvm/jvm.kt
@@ -0,0 +1,9 @@
+package sample
+
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Sample<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>checkMe<!>() = 42
+}
+
+actual object <!LINE_MARKER("descr='Has declaration in common module'")!>Platform<!> {
+    actual val <!LINE_MARKER("descr='Has declaration in common module'")!>name<!>: String = "JVM"
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/multiplatformLibrary/jvmTest/test.kt b/idea/testData/multiplatform/multiplatformLibrary/jvmTest/test.kt
new file mode 100644
index 00000000000..bb5b6137226
--- /dev/null
+++ b/idea/testData/multiplatform/multiplatformLibrary/jvmTest/test.kt
@@ -0,0 +1,11 @@
+package sample
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class <!LINE_MARKER("descr='Run Test'")!>SampleTestsJVM<!> {
+    @Test
+    fun <!LINE_MARKER("descr='Run Test'")!>testHello<!>() {
+        assertTrue("JVM" in hello())
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/overrideExpect/common/common.kt b/idea/testData/multiplatform/overrideExpect/common/common.kt
index 773e3246626..7305740cb89 100644
--- a/idea/testData/multiplatform/overrideExpect/common/common.kt
+++ b/idea/testData/multiplatform/overrideExpect/common/common.kt
@@ -1,13 +1,13 @@
-expect class Expect
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Expect<!>
 
-interface Base {
-    fun expectInReturnType(): Expect
+interface <!LINE_MARKER("descr='Is implemented by Derived'")!>Base<!> {
+    fun <!LINE_MARKER("descr='Is implemented in Derived'")!>expectInReturnType<!>(): Expect
 
     fun expectInArgument(e: Expect)
 
     fun Expect.expectInReceiver()
 
-    val expectVal: Expect
+    val <!LINE_MARKER("descr='Is implemented in Derived'")!>expectVal<!>: Expect
 
-    var expectVar: Expect
+    var <!LINE_MARKER("descr='Is implemented in Derived'")!>expectVar<!>: Expect
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt b/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt
index 7b7e579d9f5..c057f345c99 100644
--- a/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt
+++ b/idea/testData/multiplatform/overrideExpect/jvm/jvm.kt
@@ -1,13 +1,13 @@
-actual typealias Expect = String
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>Expect<!> = String
 
 interface Derived : Base {
-    override fun expectInReturnType(): Expect
+    override fun <!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInReturnType<!>(): Expect
 
-    override fun expectInArgument(e: Expect)
+    override fun <!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInArgument<!>(e: Expect)
 
-    override fun Expect.expectInReceiver()
+    override fun Expect.<!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInReceiver<!>()
 
-    override val expectVal: Expect
+    override val <!LINE_MARKER("descr='Overrides property in 'Base''")!>expectVal<!>: Expect
 
-    override var expectVar: Expect
+    override var <!LINE_MARKER("descr='Overrides property in 'Base''")!>expectVar<!>: Expect
 }
diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt b/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt
index 940c07085ed..59574c34944 100644
--- a/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt
+++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/common/common.kt
@@ -1,15 +1,15 @@
-expect class Expect
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Expect<!>
 
 class Box<out T>(val x: T)
 
-interface Base {
-    fun expectInReturnType(): Box<Expect>
+interface <!LINE_MARKER("descr='Is implemented by Derived'")!>Base<!> {
+    fun <!LINE_MARKER("descr='Is implemented in Derived'")!>expectInReturnType<!>(): Box<Expect>
 
     fun expectInArgument(e: Box<Expect>)
 
     fun Box<Expect>.expectInReceiver()
 
-    val expectVal: Box<Expect>
+    val <!LINE_MARKER("descr='Is implemented in Derived'")!>expectVal<!>: Box<Expect>
 
-    var expectVar: Box<Expect>
+    var <!LINE_MARKER("descr='Is implemented in Derived'")!>expectVar<!>: Box<Expect>
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt b/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt
index cf654228119..54181303c01 100644
--- a/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt
+++ b/idea/testData/multiplatform/overrideExpectWithCompositeType/jvm/jvm.kt
@@ -1,13 +1,13 @@
-actual typealias Expect = String
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>Expect<!> = String
 
 interface Derived : Base {
-    override fun expectInReturnType(): Box<Expect>
+    override fun <!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInReturnType<!>(): Box<Expect>
 
-    override fun expectInArgument(e: Box<Expect>)
+    override fun <!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInArgument<!>(e: Box<Expect>)
 
-    override fun Box<Expect>.expectInReceiver()
+    override fun Box<Expect>.<!LINE_MARKER("descr='Overrides function in 'Base''")!>expectInReceiver<!>()
 
-    override val expectVal: Box<Expect>
+    override val <!LINE_MARKER("descr='Overrides property in 'Base''")!>expectVal<!>: Box<Expect>
 
-    override var expectVar: Box<Expect>
+    override var <!LINE_MARKER("descr='Overrides property in 'Base''")!>expectVar<!>: Box<Expect>
 }
diff --git a/idea/testData/multiplatform/qualifiedReceiver/common/common.kt b/idea/testData/multiplatform/qualifiedReceiver/common/common.kt
index 9ab6c434c83..ef3defd85ca 100644
--- a/idea/testData/multiplatform/qualifiedReceiver/common/common.kt
+++ b/idea/testData/multiplatform/qualifiedReceiver/common/common.kt
@@ -2,14 +2,14 @@
 
 package foo
 
-expect interface A {
-    fun commonFun()
-    val b: B
-    fun bFun(): B
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonFun<!>()
+    val <!LINE_MARKER("descr='Has actuals in JVM'")!>b<!>: B
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>bFun<!>(): B
 }
 
-expect interface B {
-    fun commonFunB()
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>B<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonFunB<!>()
 }
 
 class Common {
diff --git a/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt b/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt
index 4a3de83d101..26b445bf337 100644
--- a/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt
+++ b/idea/testData/multiplatform/qualifiedReceiver/jvm/platform.kt
@@ -2,14 +2,14 @@
 
 package foo
 
-actual interface A {
-    actual fun commonFun()
-    actual val b: B
-    actual fun bFun(): B
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonFun<!>()
+    actual val <!LINE_MARKER("descr='Has declaration in common module'")!>b<!>: B
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>bFun<!>(): B
     fun platformFun()
 }
 
-actual interface B {
-    actual fun commonFunB()
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>B<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonFunB<!>()
     fun platformFunB()
 }
diff --git a/idea/testData/multiplatform/recursiveTypes/common/common.kt b/idea/testData/multiplatform/recursiveTypes/common/common.kt
index e5b96aa9888..213663e4e48 100644
--- a/idea/testData/multiplatform/recursiveTypes/common/common.kt
+++ b/idea/testData/multiplatform/recursiveTypes/common/common.kt
@@ -1,7 +1,7 @@
 package sample
 
-expect interface A<T : A<T>> {
-    fun foo(): T
+expect interface <!LINE_MARKER("descr='Is subclassed by B'"), LINE_MARKER("descr='Has actuals in JVM'")!>A<!><T : A<T>> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>foo<!>(): T
 }
 
 interface B : A<B>
diff --git a/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt b/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt
index cf9524cb7d3..19cf22e4295 100644
--- a/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt
+++ b/idea/testData/multiplatform/recursiveTypes/jvm/jvm.kt
@@ -1,7 +1,7 @@
 package sample
 
-actual interface A<T : A<T>> {
-    actual fun foo(): T
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>A<!><T : A<T>> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo<!>(): T
     fun bar() : T
 }
 
diff --git a/idea/testData/multiplatform/simple/d4/d4.kt b/idea/testData/multiplatform/simple/d4/d4.kt
index 7dfc10ee63a..af5f6dd26ec 100644
--- a/idea/testData/multiplatform/simple/d4/d4.kt
+++ b/idea/testData/multiplatform/simple/d4/d4.kt
@@ -1,6 +1,6 @@
 package foobar
 import bar.baz
 
-fun main() {
+fun <!LINE_MARKER!>main<!>() {
     baz().foo()
 }
diff --git a/idea/testData/multiplatform/supertypes/d0/d0.kt b/idea/testData/multiplatform/supertypes/d0/d0.kt
index 93989981f6d..8eb856310a0 100644
--- a/idea/testData/multiplatform/supertypes/d0/d0.kt
+++ b/idea/testData/multiplatform/supertypes/d0/d0.kt
@@ -1,5 +1,5 @@
 package d0
 
-interface AnotherSupertype {
+interface <!LINE_MARKER("descr='Is implemented by Supertype [d2]'")!>AnotherSupertype<!> {
     fun another()
 }
diff --git a/idea/testData/multiplatform/supertypes/d1/d1.kt b/idea/testData/multiplatform/supertypes/d1/d1.kt
index e44b00b5ecf..2f746c059ca 100644
--- a/idea/testData/multiplatform/supertypes/d1/d1.kt
+++ b/idea/testData/multiplatform/supertypes/d1/d1.kt
@@ -2,7 +2,7 @@
 
 package foo
 
-expect interface Supertype
+expect interface <!LINE_MARKER("descr='Is subclassed by A'")!>Supertype<!>
 
 class A : Supertype
 
diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt
index a5255868830..9afdf91cd98 100644
--- a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt
+++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/commonMpp/common.kt
@@ -1,7 +1,7 @@
 package test
 
-expect class Expect {
-    fun commonFun(): String
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>Expect<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonFun<!>(): String
 }
 
 fun topLevelCommonFun(): Int = 42
\ No newline at end of file
diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt
index e66a68497f6..00a33beb229 100644
--- a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt
+++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/jvmMpp/jvm.kt
@@ -1,7 +1,7 @@
 package test
 
-actual class Expect {
-    actual fun commonFun(): String = ""
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>Expect<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonFun<!>(): String = ""
 
     fun platformFun(): Int = 42
 }
diff --git a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt
index 4c8d8e9fd40..6ade5bda72c 100644
--- a/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt
+++ b/idea/testData/multiplatform/transitiveDependencyOnCommonSourceSets/nonMpp/nonMpp.kt
@@ -1,6 +1,6 @@
 package test
 
-fun main() {
+fun <!LINE_MARKER!>main<!>() {
     val e = Expect()
 
     e.platformFun()
diff --git a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt
index d4559d2f090..38744befaab 100644
--- a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt
+++ b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/common/common.kt
@@ -1,5 +1,5 @@
-expect class A {
-    fun commonMember()
+expect class <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonMember<!>()
 }
 
 typealias TypealiasFromCommon = A
\ No newline at end of file
diff --git a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
index ccd352e371d..57a4f0c59ec 100644
--- a/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
+++ b/idea/testData/multiplatform/typeAliasToExpectClassExplicitReference/jvm/jvm.kt
@@ -1,5 +1,5 @@
-actual class A {
-    actual fun commonMember() { }
+actual class <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonMember<!>() { }
 
     fun platformMember() { }
 }
diff --git a/idea/testData/multiplatform/typeAliases/common/aliases.kt b/idea/testData/multiplatform/typeAliases/common/aliases.kt
index 765e15b6532..9b78a8b4223 100644
--- a/idea/testData/multiplatform/typeAliases/common/aliases.kt
+++ b/idea/testData/multiplatform/typeAliases/common/aliases.kt
@@ -2,14 +2,14 @@
 
 package aliases
 
-expect interface A {
-    fun commonFun()
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonFun<!>()
 }
 
 typealias A1 = A
 
-expect interface B {
-    fun commonFun()
+expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>B<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'")!>commonFun<!>()
 }
 
 typealias B1 = B
diff --git a/idea/testData/multiplatform/typeAliases/jvm/aliases.kt b/idea/testData/multiplatform/typeAliases/jvm/aliases.kt
index 6fe1183ea57..84842905e10 100644
--- a/idea/testData/multiplatform/typeAliases/jvm/aliases.kt
+++ b/idea/testData/multiplatform/typeAliases/jvm/aliases.kt
@@ -2,15 +2,15 @@
 
 package aliases
 
-actual interface A {
-    actual fun commonFun()
+actual interface <!LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>commonFun<!>()
     fun platformFun()
 }
 
 typealias A2 = A1
 typealias A3 = A
 
-actual typealias B = A
+actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>B<!> = A
 
 typealias B2 = B
 typealias B3 = B1
diff --git a/idea/testData/multiplatform/typeParameters/common/common.kt b/idea/testData/multiplatform/typeParameters/common/common.kt
index 83a15f8e137..ce7b2bbf7f1 100644
--- a/idea/testData/multiplatform/typeParameters/common/common.kt
+++ b/idea/testData/multiplatform/typeParameters/common/common.kt
@@ -2,8 +2,8 @@
 
 package foo
 
-expect interface A {
-    fun commonFun()
+expect interface <!LINE_MARKER("descr='Is subclassed by AImpl'"), LINE_MARKER("descr='Has actuals in JVM'")!>A<!> {
+    fun <!LINE_MARKER("descr='Has actuals in JVM'"), LINE_MARKER("descr='Is overridden in foo.AImpl'")!>commonFun<!>()
 }
 
 class CommonGen<T : A> {
diff --git a/idea/testData/multiplatform/typeParameters/jvm/platform.kt b/idea/testData/multiplatform/typeParameters/jvm/platform.kt
index 9376a93e679..4bb405f52e4 100644
--- a/idea/testData/multiplatform/typeParameters/jvm/platform.kt
+++ b/idea/testData/multiplatform/typeParameters/jvm/platform.kt
@@ -2,17 +2,17 @@
 
 package foo
 
-interface B
+interface <!LINE_MARKER("descr='Is implemented by A [jvm] AImpl'")!>B<!>
 
-actual interface A : B {
-    actual fun commonFun()
+actual interface <!LINE_MARKER("descr='Is implemented by AImpl'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!> : B {
+    actual fun <!LINE_MARKER("descr='Has declaration in common module'"), LINE_MARKER("descr='Is implemented in foo.AImpl'")!>commonFun<!>()
 
-    fun platformFun()
+    fun <!LINE_MARKER("descr='Is implemented in foo.AImpl'")!>platformFun<!>()
 }
 
 class AImpl : A {
-    override fun commonFun() {}
-    override fun platformFun() {}
+    override fun <!LINE_MARKER("descr='Implements function in 'A''")!>commonFun<!>() {}
+    override fun <!LINE_MARKER("descr='Implements function in 'A''")!>platformFun<!>() {}
 }
 
 @Suppress("UNUSED_PARAMETER")
diff --git a/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/common/common.kt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/common/common.kt
new file mode 100644
index 00000000000..271daa38e86
--- /dev/null
+++ b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/common/common.kt
@@ -0,0 +1,4 @@
+package sample
+fun common(): Boolean {
+    return <!TYPE_MISMATCH!>""<!>
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/dependencies.txt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/dependencies.txt
new file mode 100644
index 00000000000..87e0cef0ed8
--- /dev/null
+++ b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/dependencies.txt
@@ -0,0 +1,7 @@
+MODULE common { platform=[JVM, JS, Native] }
+MODULE jvm { platform=[JVM] }
+MODULE js { platform=[JS] }
+
+common -> STDLIB_COMMON { kind=DEPENDENCY }
+jvm -> common { kind=DEPENDS_ON }
+js -> common { kind=DEPENDS_ON }
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/js/js.kt
similarity index 100%
rename from idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/src/jsMain/kotlin/sample/SampleJs.kt
rename to idea/testData/multiplatform/unresolvedInMultiplatformLibrary/js/js.kt
diff --git a/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/jvm/jvm.kt b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/jvm/jvm.kt
new file mode 100644
index 00000000000..9baaee42434
--- /dev/null
+++ b/idea/testData/multiplatform/unresolvedInMultiplatformLibrary/jvm/jvm.kt
@@ -0,0 +1,6 @@
+package sample
+
+fun jvm() {
+    println(common())
+    println(<!UNRESOLVED_REFERENCE!>js<!>())
+}
\ No newline at end of file
diff --git a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt
index 42684e64765..a2b820853d8 100644
--- a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt
+++ b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt
@@ -1,4 +1,4 @@
 package sample
 
-actual class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>A<!> {
+actual class <!LINE_MARKER("descr='Has declaration in common module'"), NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>A<!> {
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt
index f385c7d7ea1..16e5cb0e900 100644
--- a/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt
+++ b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt
@@ -1,5 +1,5 @@
 package sample
 
-expect class A {
+expect class <!LINE_MARKER("descr='Has actuals in common'")!>A<!> {
     fun f()
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
index 9a685e7413e..af86de54107 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.idea.test.AstAccessControl
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import java.io.File
 
 abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgainstKotlinCheckerTest() {
@@ -25,7 +25,7 @@ abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgains
 
         val languageLevelOption = InTextDirectivesUtils.findListWithPrefixes(configFileText ?: "", "// KOTLINC_EXTRA_OPTS")
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(
             PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".kt",
             "libFor$testName",
             extraOptions = languageLevelOption
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
index 1e5e875117a..c57ff31b513 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.keysToMap
 import org.jetbrains.plugins.groovy.lang.psi.impl.stringValue
@@ -108,7 +108,7 @@ abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTestCase(
 
         Assert.assertNotNull("Test file not found!", testFile)
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(
             testFile!!.canonicalPath, libName(),
             extraClasspath = listOf(ForTestCompileRuntime.jetbrainsAnnotationsForTests().path)
         )
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
index 3bb8f84abcf..17588867c39 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.junit.runner.RunWith
 import java.io.File
 
@@ -27,9 +27,9 @@ class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTest
     override fun getProjectDescriptor() = object : KotlinLightProjectDescriptor() {
         override fun configureModule(module: Module, model: ModifiableRootModel) {
             val compiledJar1 =
-                MockLibraryUtil.compileJvmLibraryToJar("$TEST_DATA_PATH/lib1", "lib1")
+                MockLibraryUtilExt.compileJvmLibraryToJar("$TEST_DATA_PATH/lib1", "lib1")
             val compiledJar2 =
-                MockLibraryUtil.compileJvmLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", extraClasspath = listOf(compiledJar1.canonicalPath))
+                MockLibraryUtilExt.compileJvmLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", extraClasspath = listOf(compiledJar1.canonicalPath))
 
             model.addLibraryEntry(createLibrary(module.project, compiledJar1, "baseLibrary"))
             model.addLibraryEntry(createLibrary(module.project, compiledJar2, "dependentLibrary"))
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt
index 953e051cded..1bdc1fcf6e6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.caches.resolve
 import com.intellij.openapi.module.Module
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.test.TestJdkKind.FULL_JDK_9
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.junit.runner.RunWith
@@ -26,7 +26,7 @@ class Java9MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
 
     fun testSimpleLibraryExportsPackage() {
         // -Xallow-kotlin-package to avoid "require kotlin.stdlib" in module-info.java
-        val library = MockLibraryUtil.compileJvmLibraryToJar(
+        val library = MockLibraryUtilExt.compileJvmLibraryToJar(
             testDataPath + "${getTestName(true)}/library", "library",
             extraOptions = listOf("-jdk-home", KtTestUtil.getJdk9Home().path, "-Xallow-kotlin-package"),
             useJava9 = true
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
index beddb19f694..bf52b8f41bf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt
@@ -39,11 +39,8 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.util.projectStructure.sdk
 import org.jetbrains.kotlin.samWithReceiver.SamWithReceiverCommandLineProcessor.Companion.ANNOTATION_OPTION
 import org.jetbrains.kotlin.samWithReceiver.SamWithReceiverCommandLineProcessor.Companion.PLUGIN_ID
-import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.*
 import org.jetbrains.kotlin.test.TestJdkKind.FULL_JDK
-import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest
-import org.jetbrains.kotlin.test.runTest
 import org.junit.Assert.assertNotEquals
 import org.junit.runner.RunWith
 
@@ -233,7 +230,7 @@ open class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
     }
 
     fun testJvmExperimentalLibrary() {
-        val lib = MockLibraryUtil.compileJvmLibraryToJar(
+        val lib = MockLibraryUtilExt.compileJvmLibraryToJar(
             testDataPath + "${getTestName(true)}/lib", "lib",
             extraOptions = listOf(
                 "-Xopt-in=kotlin.RequiresOptIn",
@@ -265,12 +262,12 @@ open class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() {
         KotlinCommonCompilerArgumentsHolder.getInstance(project).update { skipMetadataVersionCheck = true }
         KotlinCompilerSettings.getInstance(project).update { additionalArguments = "-Xskip-metadata-version-check" }
 
-        val libOld = MockLibraryUtil.compileJvmLibraryToJar(
+        val libOld = MockLibraryUtilExt.compileJvmLibraryToJar(
             testDataPath + "${getTestName(true)}/libOld", "libOld",
             extraOptions = listOf("-language-version", "1.2", "-api-version", "1.2")
         )
 
-        val libNew = MockLibraryUtil.compileJvmLibraryToJar(
+        val libNew = MockLibraryUtilExt.compileJvmLibraryToJar(
             testDataPath + "${getTestName(true)}/libNew", "libNew",
             extraOptions = listOf("-language-version", "1.3", "-api-version", "1.3")
         )
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
index 578f1dac89c..46f83369c3b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java
@@ -179,6 +179,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna
         runTest("idea/testData/multiplatform/multilevelParents/");
     }
 
+    @TestMetadata("multiplatformLibrary")
+    public void testMultiplatformLibrary() throws Exception {
+        runTest("idea/testData/multiplatform/multiplatformLibrary/");
+    }
+
     @TestMetadata("overrideExpect")
     public void testOverrideExpect() throws Exception {
         runTest("idea/testData/multiplatform/overrideExpect/");
@@ -239,6 +244,11 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna
         runTest("idea/testData/multiplatform/typeParameters/");
     }
 
+    @TestMetadata("unresolvedInMultiplatformLibrary")
+    public void testUnresolvedInMultiplatformLibrary() throws Exception {
+        runTest("idea/testData/multiplatform/unresolvedInMultiplatformLibrary/");
+    }
+
     @TestMetadata("useCorrectBuiltIns")
     public void testUseCorrectBuiltIns() throws Exception {
         runTest("idea/testData/multiplatform/useCorrectBuiltIns/");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java
index 8c893b2d52e..edc26e85601 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java
@@ -49,6 +49,11 @@ public class MultiFileInspectionTestGenerated extends AbstractMultiFileInspectio
         runTest("idea/testData/multiFileInspections/kotlinInternalInJavaTest/kotlinInternalInJavaTest.test");
     }
 
+    @TestMetadata("kotlinSealedInJavaTest/kotlinSealedInJavaTest.test")
+    public void testKotlinSealedInJavaTest_KotlinSealedInJavaTest() throws Exception {
+        runTest("idea/testData/multiFileInspections/kotlinSealedInJavaTest/kotlinSealedInJavaTest.test");
+    }
+
     @TestMetadata("mainInTwoModules/mainInTwoModules.test")
     public void testMainInTwoModules_MainInTwoModules() throws Exception {
         runTest("idea/testData/multiFileInspections/mainInTwoModules/mainInTwoModules.test");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
index 33032319348..d51b2285296 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/AbstractCodeMetaInfoTest.kt
@@ -218,7 +218,8 @@ class CodeMetaInfoTestCase(
 
 abstract class AbstractDiagnosticCodeMetaInfoTest : AbstractCodeMetaInfoTest() {
     override fun getConfigurations() = listOf(
-        DiagnosticCodeMetaInfoRenderConfiguration()
+        DiagnosticCodeMetaInfoRenderConfiguration(),
+        LineMarkerRenderConfiguration()
     )
 }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt
index f3f15bc0e0a..b186c9bcdb9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/HighlightingRenderConfiguration.kt
@@ -29,7 +29,9 @@ open class HighlightingRenderConfiguration(
         if (renderSeverity)
             params.add("severity='${highlightingCodeMetaInfo.highlightingInfo.severity}'")
         if (renderDescription)
-            params.add("descr='${sanitizeLineBreaks(highlightingCodeMetaInfo.highlightingInfo.description)}'")
+            params.add("descr='${
+                highlightingCodeMetaInfo.highlightingInfo.description?.let { sanitizeLineBreaks(highlightingCodeMetaInfo.highlightingInfo.description) }
+            }'")
         if (renderTextAttributesKey)
             params.add("textAttributesKey='${highlightingCodeMetaInfo.highlightingInfo.forcedTextAttributesKey}'")
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt
index 4c5d5fec618..b8d250e5d32 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeMetaInfo/renderConfigurations/LineMarkerRenderConfiguration.kt
@@ -21,7 +21,7 @@ open class LineMarkerRenderConfiguration(var renderDescription: Boolean = true)
         if (!renderParams) return ""
         val params = mutableListOf<String>()
 
-        if (renderDescription)
+        if (renderDescription && lineMarkerCodeMetaInfo.lineMarker.lineMarkerTooltip != null)
             params.add("descr='${sanitizeLineMarkerTooltip(lineMarkerCodeMetaInfo.lineMarker.lineMarkerTooltip)}'")
 
         params.add(getAdditionalParams(lineMarkerCodeMetaInfo))
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt
index 73524103790..d458e812349 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigationWithMultipleLibrariesTest.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.decompiler.navigation.NavigationChecker.Compani
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.util.projectStructure.getModuleDir
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.test.testFramework.runWriteAction
 import org.jetbrains.kotlin.test.util.addDependency
 import org.jetbrains.kotlin.test.util.jarRoot
@@ -48,7 +48,7 @@ class NavigationWithMultipleCustomLibrariesTest : AbstractNavigationToSourceOrDe
     override fun createProjectLib(libraryName: String, withSources: Boolean): Library {
         val librarySrc = testDataPath + "libSrc"
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(librarySrc, libraryName, addSources = withSources)
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(librarySrc, libraryName, addSources = withSources)
         val jarRoot = libraryJar.jarRoot
         return projectLibrary(libraryName, jarRoot, jarRoot.findChild("src").takeIf { withSources })
     }
@@ -113,7 +113,7 @@ class NavigationToSingleJarInMultipleLibrariesTest : AbstractNavigationWithMulti
         val moduleB = module("m2", srcPath)
         val moduleC = module("m3", srcPath)
 
-        val sharedJar = MockLibraryUtil.compileJvmLibraryToJar(testDataPath + "libSrc", "sharedJar", addSources = true)
+        val sharedJar = MockLibraryUtilExt.compileJvmLibraryToJar(testDataPath + "libSrc", "sharedJar", addSources = true)
         val jarRoot = sharedJar.jarRoot
 
         moduleA.addDependency(projectLibrary("libA", jarRoot))
diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
index f52d317f899..3dad81ccddb 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import java.io.File
 import java.lang.reflect.InvocationTargetException
 import java.net.URL
@@ -50,7 +51,7 @@ abstract class AbstractKotlinExceptionFilterTest : KotlinCodeInsightTestCase() {
         val classLoader: URLClassLoader
         if (InTextDirectivesUtils.getPrefixedBoolean(fileText, "// WITH_MOCK_LIBRARY: ") ?: false) {
             if (MOCK_LIBRARY_JAR == null) {
-                MOCK_LIBRARY_JAR = MockLibraryUtil.compileJvmLibraryToJar(MOCK_LIBRARY_SOURCES, "mockLibrary", addSources = true)
+                MOCK_LIBRARY_JAR = MockLibraryUtilExt.compileJvmLibraryToJar(MOCK_LIBRARY_SOURCES, "mockLibrary", addSources = true)
             }
 
             val mockLibraryJar = MOCK_LIBRARY_JAR ?: throw AssertionError("Mock library JAR is null")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
index 1c81b4cd776..5e588c7626b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/Jsr305HighlightingTest.kt
@@ -15,15 +15,15 @@ import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.utils.ReportLevel
 import org.junit.runner.RunWith
 
 @RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class Jsr305HighlightingTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor(): LightProjectDescriptor {
-        val foreignAnnotationsJar = MockLibraryUtil.compileJvmLibraryToJar("third-party/annotations", "foreign-annotations")
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(
+        val foreignAnnotationsJar = MockLibraryUtilExt.compileJvmLibraryToJar("third-party/annotations", "foreign-annotations")
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(
             "idea/testData/highlighterJsr305/library", "jsr305-library",
             extraClasspath = listOf(foreignAnnotationsJar.absolutePath)
         )
diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt
index cd0b6233833..d0655284b23 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoWithMultipleLibrariesTest.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.test.allKotlinFiles
 import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.test.util.addDependency
 import org.jetbrains.kotlin.test.util.jarRoot
 import org.jetbrains.kotlin.test.util.projectLibrary
@@ -45,7 +45,7 @@ class GotoWithMultipleLibrariesTest : AbstractMultiModuleTest() {
     private fun doTestSameJarSharedByLibrariesWithAndWithoutSourceAttached(withSource: Int, noSource: Int) {
         val srcPath = testDataPath + "src"
 
-        val sharedJar = MockLibraryUtil.compileJvmLibraryToJar(testDataPath + "libSrc", "sharedJar", addSources = true)
+        val sharedJar = MockLibraryUtilExt.compileJvmLibraryToJar(testDataPath + "libSrc", "sharedJar", addSources = true)
         val jarRoot = sharedJar.jarRoot
 
         var i = 0
diff --git a/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt b/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt
index 391d3e1b3f9..e06c1296f47 100644
--- a/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt
+++ b/idea/tests/org/jetbrains/kotlin/projectModel/Model.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.projectModel
 
+import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.roots.libraries.PersistentLibraryKind
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
 import org.jetbrains.kotlin.idea.framework.CommonLibraryKind
@@ -154,6 +155,20 @@ sealed class KotlinTest(
         JvmPlatforms.defaultJvmPlatform,
         null
     )
+
+    object JustKotlinTest : KotlinTest(
+        "kotlin-test",
+        ForTestCompileRuntime.kotlinTestJarForTests(),
+        JvmPlatforms.defaultJvmPlatform,
+        null
+    )
+
+    object Junit : KotlinTest(
+        "junit",
+        File("${PathManager.getHomePath().replace(File.separatorChar, '/')}/lib/junit-4.12.jar"),
+        JvmPlatforms.defaultJvmPlatform,
+        null
+    )
 }
 
 
diff --git a/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt b/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt
index e741a855744..16e30f74ed0 100644
--- a/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt
+++ b/idea/tests/org/jetbrains/kotlin/projectModel/Parser.kt
@@ -23,7 +23,9 @@ open class ProjectStructureParser(private val projectRoot: File) {
         "FULL_JDK" to ResolveLibrary.Builder(FullJdk),
         "MOCK_JDK" to ResolveLibrary.Builder(MockJdk),
         "KOTLIN_TEST_JS" to ResolveLibrary.Builder(KotlinTest.JsKotlinTest),
-        "KOTLIN_TEST_JVM" to ResolveLibrary.Builder(KotlinTest.JvmKotlinTest)
+        "KOTLIN_TEST_JVM" to ResolveLibrary.Builder(KotlinTest.JvmKotlinTest),
+        "KOTLIN_TEST" to ResolveLibrary.Builder(KotlinTest.JustKotlinTest),
+        "JUNIT" to ResolveLibrary.Builder(KotlinTest.Junit)
     )
 
     fun parse(text: String): ProjectResolveModel {
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 780a2148ae0..2d432cdf16f 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -68,7 +68,7 @@ import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.PathUtil
 import org.jetbrains.kotlin.utils.Printer
@@ -614,7 +614,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
     fun testCircularDependencyWithReferenceToOldVersionLib() {
         initProject(JVM_MOCK_RUNTIME)
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
 
         AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar)
 
@@ -625,7 +625,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
     fun testDependencyToOldKotlinLib() {
         initProject()
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
 
         AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar)
 
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201
index 10af39dca01..605d85bce34 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201
@@ -68,7 +68,7 @@ import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.jetbrains.kotlin.test.MockLibraryUtilExt
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.PathUtil
 import org.jetbrains.kotlin.utils.Printer
@@ -614,7 +614,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
     fun testCircularDependencyWithReferenceToOldVersionLib() {
         initProject(JVM_MOCK_RUNTIME)
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
 
         AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar)
 
@@ -625,7 +625,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
     fun testDependencyToOldKotlinLib() {
         initProject()
 
-        val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
+        val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib")
 
         AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar)
 
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
index 484abea58c7..d2028c2f820 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.serialization.deserialization.*
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerAbiStability
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.storage.getValue
@@ -94,8 +95,8 @@ class KotlinJavascriptPackageFragment(
         override val isPreReleaseInvisible: Boolean =
             configuration.reportErrorsOnPreReleaseDependencies && (header.flags and 1) != 0
 
-        override val isInvisibleIrDependency: Boolean
-            get() = false
+        override val abiStability: DeserializedContainerAbiStability
+            get() = DeserializedContainerAbiStability.STABLE
 
         override val presentableString: String
             get() = "Package '$fqName'"
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
index c45cc27b282..60d59d49240 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.js.test
 
+import org.jetbrains.kotlin.backend.common.phaser.AnyNamedPhase
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
@@ -118,8 +119,8 @@ abstract class BasicIrBoxTest(
                 PhaseConfig(
                     jsPhases,
                     dumpToDirectory = dumpOutputDir.path,
-                    toDumpStateAfter = allPhasesSet,
-                    toValidateStateAfter = allPhasesSet,
+                    toDumpStateAfter = fromSysPropertyOrAll("kotlin.js.test.phasesToDumpAfter", allPhasesSet),
+                    toValidateStateAfter = fromSysPropertyOrAll("kotlin.js.test.phasesToValidateAfter", allPhasesSet),
                     dumpOnlyFqName = null
                 )
             } else {
@@ -188,6 +189,13 @@ abstract class BasicIrBoxTest(
         }
     }
 
+    private fun fromSysPropertyOrAll(key: String, all: Set<AnyNamedPhase>): Set<AnyNamedPhase> {
+        val phases = System.getProperty(key)?.split(',')?.toSet() ?: emptySet()
+        if (phases.isEmpty()) return all
+
+        return all.filter { it.name in phases }.toSet()
+    }
+
     private fun JsCode.writeTo(outputFile: File, config: JsConfig) {
         val wrappedCode =
             wrapWithModuleEmulationMarkers(mainModule, moduleId = config.moduleId, moduleKind = config.moduleKind)
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
index 250ada97c5f..4572d5c426a 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
@@ -1333,44 +1333,6 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractIrJsCodegenBoxES6Test {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1470,6 +1432,16 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/callableReference/genericLocalClassConstructorReference.kt");
         }
 
+        @TestMetadata("kt21014.kt")
+        public void testKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void testKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
         @TestMetadata("kt37604.kt")
         public void testKt37604() throws Exception {
             runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
@@ -11509,6 +11481,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("suspendExtensionRecevierFromConstraint.kt")
         public void testSuspendExtensionRecevierFromConstraint() throws Exception {
             runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
@@ -11518,6 +11495,74 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractIrJsCodegenBoxES6Test {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR_ES6, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -14562,6 +14607,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -14607,6 +14657,16 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -15904,6 +15964,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -15919,6 +15984,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -17831,6 +17901,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
                 runTest("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt");
             }
 
+            @TestMetadata("kt30548.kt")
+            public void testKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("compiler/testData/codegen/box/properties/lateinit/localClass.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java
index 8ddba725597..f87eb67f83e 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxErrorTestGenerated.java
@@ -72,6 +72,11 @@ public class IrJsCodegenBoxErrorTestGenerated extends AbstractIrJsCodegenBoxErro
             runTest("compiler/testData/codegen/boxError/semantic/reifiedNonInline.kt");
         }
 
+        @TestMetadata("reifiedWithWrongArguments.kt")
+        public void testReifiedWithWrongArguments() throws Exception {
+            runTest("compiler/testData/codegen/boxError/semantic/reifiedWithWrongArguments.kt");
+        }
+
         @TestMetadata("typeMismatch.kt")
         public void testTypeMismatch() throws Exception {
             runTest("compiler/testData/codegen/boxError/semantic/typeMismatch.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
index 1afba166ad5..191cc4fa79b 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
@@ -1333,44 +1333,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractIrJsCodegenBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1470,6 +1432,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/callableReference/genericLocalClassConstructorReference.kt");
         }
 
+        @TestMetadata("kt21014.kt")
+        public void testKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void testKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
         @TestMetadata("kt37604.kt")
         public void testKt37604() throws Exception {
             runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
@@ -11509,6 +11481,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("suspendExtensionRecevierFromConstraint.kt")
         public void testSuspendExtensionRecevierFromConstraint() throws Exception {
             runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
@@ -11518,6 +11495,74 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractIrJsCodegenBoxTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -14562,6 +14607,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -14607,6 +14657,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -15904,6 +15964,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -15919,6 +15984,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -17831,6 +17901,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt");
             }
 
+            @TestMetadata("kt30548.kt")
+            public void testKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("compiler/testData/codegen/box/properties/lateinit/localClass.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
index 4fe28af80a4..269a94c3140 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
@@ -1333,44 +1333,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractJsCodegenBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
-        }
-
-        @TestMetadata("callableReferenceAndCoercionToUnit.kt")
-        public void testCallableReferenceAndCoercionToUnit() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/callableReferenceAndCoercionToUnit.kt");
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntoCR.kt")
-        public void testSubstituteStubTypeIntoCR() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntoCR.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -1470,6 +1432,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/callableReference/genericLocalClassConstructorReference.kt");
         }
 
+        @TestMetadata("kt21014.kt")
+        public void testKt21014() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21014.kt");
+        }
+
+        @TestMetadata("kt21092a.kt")
+        public void testKt21092a() throws Exception {
+            runTest("compiler/testData/codegen/box/callableReference/kt21092a.kt");
+        }
+
         @TestMetadata("kt37604.kt")
         public void testKt37604() throws Exception {
             runTest("compiler/testData/codegen/box/callableReference/kt37604.kt");
@@ -11574,6 +11546,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
         }
 
+        @TestMetadata("specialCallsWithCallableReferences.kt")
+        public void testSpecialCallsWithCallableReferences() throws Exception {
+            runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
+        }
+
         @TestMetadata("suspendExtensionRecevierFromConstraint.kt")
         public void testSuspendExtensionRecevierFromConstraint() throws Exception {
             runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
@@ -11583,6 +11560,74 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractJsCodegenBoxTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
+            }
+
+            @TestMetadata("callableReferenceAndCoercionToUnit.kt")
+            public void testCallableReferenceAndCoercionToUnit() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/callableReferenceAndCoercionToUnit.kt");
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferences.kt")
+            public void testSpecialCallsWithCallableReferences() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferences.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt")
+            public void testSpecialCallsWithCallableReferencesDontCareTypeInBlockExpression() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesDontCareTypeInBlockExpression.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesErrorType.kt")
+            public void testSpecialCallsWithCallableReferencesErrorType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesErrorType.kt");
+            }
+
+            @TestMetadata("specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt")
+            public void testSpecialCallsWithCallableReferencesNonStrictOnlyInputTypes() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithCallableReferencesNonStrictOnlyInputTypes.kt");
+            }
+
+            @TestMetadata("specialCallsWithLambdas.kt")
+            public void testSpecialCallsWithLambdas() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/specialCallsWithLambdas.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntoCR.kt")
+            public void testSubstituteStubTypeIntoCR() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntoCR.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+
+            @TestMetadata("substitutelambdaExtensionReceiverType.kt")
+            public void testSubstitutelambdaExtensionReceiverType() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substitutelambdaExtensionReceiverType.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -14627,6 +14672,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -14672,6 +14722,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -15969,6 +16029,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -15984,6 +16049,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
@@ -17921,6 +17991,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 runTest("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt");
             }
 
+            @TestMetadata("kt30548.kt")
+            public void testKt30548() throws Exception {
+                runTest("compiler/testData/codegen/box/properties/lateinit/kt30548.kt");
+            }
+
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
                 runTest("compiler/testData/codegen/box/properties/lateinit/localClass.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
index 217848da792..31cc5b72dd6 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
@@ -1163,34 +1163,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
         }
     }
 
-    @TestMetadata("compiler/testData/codegen/box/builderInference")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class BuilderInference extends AbstractIrCodegenBoxWasmTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-        }
-
-        public void testAllFilesPresentInBuilderInference() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/builderInference"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-        }
-
-        @TestMetadata("kt41164.kt")
-        public void testKt41164() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/kt41164.kt");
-        }
-
-        @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
-        public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
-        }
-
-        @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
-        public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
-            runTest("compiler/testData/codegen/box/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
-        }
-    }
-
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -6174,6 +6146,34 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
         public void testUnsafeVarianceCodegen() throws Exception {
             runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
         }
+
+        @TestMetadata("compiler/testData/codegen/box/inference/builderInference")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class BuilderInference extends AbstractIrCodegenBoxWasmTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
+            }
+
+            public void testAllFilesPresentInBuilderInference() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/inference/builderInference"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
+            }
+
+            @TestMetadata("kt41164.kt")
+            public void testKt41164() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/kt41164.kt");
+            }
+
+            @TestMetadata("lackOfNullCheckOnNullableInsideBuild.kt")
+            public void testLackOfNullCheckOnNullableInsideBuild() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/lackOfNullCheckOnNullableInsideBuild.kt");
+            }
+
+            @TestMetadata("substituteStubTypeIntolambdaParameterDescriptor.kt")
+            public void testSubstituteStubTypeIntolambdaParameterDescriptor() throws Exception {
+                runTest("compiler/testData/codegen/box/inference/builderInference/substituteStubTypeIntolambdaParameterDescriptor.kt");
+            }
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/box/inlineClasses")
@@ -6203,6 +6203,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
             runTest("compiler/testData/codegen/box/inlineClasses/boundCallableReferencePassedToInlineFunction.kt");
         }
 
+        @TestMetadata("boxImplDoesNotExecuteInitBlock.kt")
+        public void testBoxImplDoesNotExecuteInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/boxImplDoesNotExecuteInitBlock.kt");
+        }
+
         @TestMetadata("boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt")
         public void testBoxNullableValueOfInlineClassWithNonNullUnderlyingType() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/boxNullableValueOfInlineClassWithNonNullUnderlyingType.kt");
@@ -6428,6 +6433,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
             runTest("compiler/testData/codegen/box/inlineClasses/genericInlineClassSynthMembers.kt");
         }
 
+        @TestMetadata("initBlock.kt")
+        public void testInitBlock() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/initBlock.kt");
+        }
+
         @TestMetadata("inlineClassAsLastExpressionInInLambda.kt")
         public void testInlineClassAsLastExpressionInInLambda() throws Exception {
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassAsLastExpressionInInLambda.kt");
@@ -8753,6 +8763,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
             runTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
         }
 
+        @TestMetadata("capturingInDefaultConstructorParameter.kt")
+        public void testCapturingInDefaultConstructorParameter() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/capturingInDefaultConstructorParameter.kt");
+        }
+
         @TestMetadata("closureOfInnerLocalClass.kt")
         public void testClosureOfInnerLocalClass() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/closureOfInnerLocalClass.kt");
@@ -8793,6 +8808,16 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
             runTest("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt");
         }
 
+        @TestMetadata("kt10835.kt")
+        public void testKt10835() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835.kt");
+        }
+
+        @TestMetadata("kt10835a.kt")
+        public void testKt10835a() throws Exception {
+            runTest("compiler/testData/codegen/box/localClasses/kt10835a.kt");
+        }
+
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
             runTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
@@ -9950,6 +9975,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
             runTest("compiler/testData/codegen/box/objects/simpleObject.kt");
         }
 
+        @TestMetadata("substitutionFunctionFromSuper.kt")
+        public void testSubstitutionFunctionFromSuper() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/substitutionFunctionFromSuper.kt");
+        }
+
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
             runTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
@@ -9965,6 +9995,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
             runTest("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt");
         }
 
+        @TestMetadata("useAnonymousObjectFunction.kt")
+        public void testUseAnonymousObjectFunction() throws Exception {
+            runTest("compiler/testData/codegen/box/objects/useAnonymousObjectFunction.kt");
+        }
+
         @TestMetadata("useImportedMember.kt")
         public void testUseImportedMember() throws Exception {
             runTest("compiler/testData/codegen/box/objects/useImportedMember.kt");
diff --git a/kotlin-native/CHANGELOG.md b/kotlin-native/CHANGELOG.md
index 36cfbe8afc8..c73d219d7b8 100644
--- a/kotlin-native/CHANGELOG.md
+++ b/kotlin-native/CHANGELOG.md
@@ -1,3 +1,28 @@
+# 1.4.30-M1 (Dec 2020)
+  * [KT-43597](https://youtrack.jetbrains.com/issue/KT-43597) Xcode 12.2 support
+  * [KT-43276](https://youtrack.jetbrains.com/issue/KT-43276) Add watchos_x64 target
+  * [KT-43198](https://youtrack.jetbrains.com/issue/KT-43198) Init blocks inside of inline classes
+  * [KT-42649](https://youtrack.jetbrains.com/issue/KT-42649) Fix secondary constructors of generic inline classes
+  * [KT-38772](https://youtrack.jetbrains.com/issue/KT-38772) Support non-reified type parameters in typeOf
+  * Compiler customization
+    * [KT-40584](https://youtrack.jetbrains.com/issue/KT-40584) Untie Kotlin/Native from the fixed LLVM distribution
+    * [KT-42234](https://youtrack.jetbrains.com/issue/KT-42234) Move LLVM optimization parameters into konan.properties
+    * [KT-40670](https://youtrack.jetbrains.com/issue/KT-40670) Allow to override konan.properties via CLI
+  * Runtime
+    * [KT-42822](https://youtrack.jetbrains.com/issue/KT-42822) Kotlin/Native Worker leaks ObjC/Swift autorelease references (and indirectly bridged K/N references) on Darwin targets
+    * [KT-42397](https://youtrack.jetbrains.com/issue/KT-42397) Reverse-C interop usage of companion object reports spurious leaks
+    * [GH-4482](https://github.com/JetBrains/kotlin-native/pull/4482) Add a switch to destroy runtime only on shutdown
+    * [GH-4575](https://github.com/JetBrains/kotlin-native/pull/4575) Fix unchecked runtime shutdown
+    * [GH-4194](https://github.com/JetBrains/kotlin-native/pull/4194) Fix possible race in terminate handler
+  * C-interop
+    * [KT-42412](https://youtrack.jetbrains.com/issue/KT-42412) Modality of generated property accessors is always FINAL
+    * [KT-38530](https://youtrack.jetbrains.com/issue/KT-38530) values() method of enum classes is not exposed to Objective-C/Swift
+    * [GH-4572](https://github.com/JetBrains/kotlin-native/pull/4572) Fix for interop enum and struct generation
+  * Optimizations
+    * [KT-42294](https://youtrack.jetbrains.com/issue/KT-42294) Significantly improved compilation time
+    * [KT-42942](https://youtrack.jetbrains.com/issue/KT-42942) Optimize peak backend memory by clearing BindingContext after psi2ir
+    * [KT-31072](https://youtrack.jetbrains.com/issue/KT-31072) Don't use non-reified arguments to specialize type operations in IR inliner
+
 # 1.4.21 (Dec 2020)
   * Fixed [KT-43517](https://youtrack.jetbrains.com/issue/KT-43517)
   * Fixed [KT-43530](https://youtrack.jetbrains.com/issue/KT-43530)
@@ -12,7 +37,7 @@
   * equals/hashCode support for fun interfaces ([KT-39798](https://youtrack.jetbrains.com/issue/KT-39798))
   * IR-level optimizations
     * Constant folding
-    * String concatenation flattenning
+    * String concatenation flattening
   * Various fixes/improvements to compiler caches
   * Some fixes to samples (calculator, tensorflow)
   * Bug fixes
diff --git a/kotlin-native/INTEROP.md b/kotlin-native/INTEROP.md
index 585b12087a9..bbcfbb84083 100644
--- a/kotlin-native/INTEROP.md
+++ b/kotlin-native/INTEROP.md
@@ -36,7 +36,7 @@ Install libgit2 and prepare stubs for the git library:
 ```bash
 
 cd samples/gitchurn
-../../dist/bin/cinterop -def src/main/c_interop/libgit2.def \
+../../dist/bin/cinterop -def src/nativeInterop/cinterop/libgit2.def \
  -compiler-option -I/usr/local/include -o libgit2
 ```
 
@@ -47,7 +47,7 @@ Compile the client:
 <div class="sample" markdown="1" theme="idea" mode="shell">
 
 ```bash
-../../dist/bin/kotlinc src/main/kotlin \
+../../dist/bin/kotlinc src/gitChurnMain/kotlin \
  -library libgit2 -o GitChurn
 ```
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt
index bf75c8f8cb7..ab95d0aa999 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt
@@ -14,8 +14,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
@@ -59,11 +57,10 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la
     val startOffset = inlinedClass.startOffset
     val endOffset = inlinedClass.endOffset
 
-    val descriptor = WrappedSimpleFunctionDescriptor()
     IrFunctionImpl(
             startOffset, endOffset,
             DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION,
-            IrSimpleFunctionSymbolImpl(descriptor),
+            IrSimpleFunctionSymbolImpl(),
             Name.special("<${inlinedClass.name}-box>"),
             DescriptorVisibilities.PUBLIC,
             Modality.FINAL,
@@ -77,11 +74,11 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la
             isOperator = false,
             isInfix = false
     ).also { function ->
-        function.valueParameters = listOf(WrappedValueParameterDescriptor().let {
+        function.valueParameters = listOf(
             IrValueParameterImpl(
                     startOffset, endOffset,
                     IrDeclarationOrigin.DEFINED,
-                    IrValueParameterSymbolImpl(it),
+                    IrValueParameterSymbolImpl(),
                     Name.identifier("value"),
                     index = 0,
                     varargElementType = null,
@@ -91,11 +88,8 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la
                     isHidden = false,
                     isAssignable = false
             ).apply {
-                it.bind(this)
                 parent = function
-            }
-        })
-        descriptor.bind(function)
+            })
         function.parent = inlinedClass.getContainingFile()!!
     }
 }
@@ -116,11 +110,10 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context.
     val startOffset = inlinedClass.startOffset
     val endOffset = inlinedClass.endOffset
 
-    val descriptor = WrappedSimpleFunctionDescriptor()
     IrFunctionImpl(
             startOffset, endOffset,
             DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION,
-            IrSimpleFunctionSymbolImpl(descriptor),
+            IrSimpleFunctionSymbolImpl(),
             Name.special("<${inlinedClass.name}-unbox>"),
             DescriptorVisibilities.PUBLIC,
             Modality.FINAL,
@@ -134,11 +127,11 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context.
             isOperator = false,
             isInfix = false
     ).also { function ->
-        function.valueParameters = listOf(WrappedValueParameterDescriptor().let {
+        function.valueParameters = listOf(
             IrValueParameterImpl(
                     startOffset, endOffset,
                     IrDeclarationOrigin.DEFINED,
-                    IrValueParameterSymbolImpl(it),
+                    IrValueParameterSymbolImpl(),
                     Name.identifier("value"),
                     index = 0,
                     varargElementType = null,
@@ -148,11 +141,8 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context.
                     isHidden = false,
                     isAssignable = false
             ).apply {
-                it.bind(this)
                 parent = function
-            }
-        })
-        descriptor.bind(function)
+            })
         function.parent = inlinedClass.getContainingFile()!!
     }
 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
index ccffa7eeb73..c2ce9f75889 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt
@@ -41,7 +41,6 @@ import org.jetbrains.kotlin.backend.common.ir.copyToWithoutSuperTypes
 import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExport
 import org.jetbrains.kotlin.backend.konan.llvm.coverage.CoverageManager
 import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyClass
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.symbols.IrSymbol
 import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl
 import org.jetbrains.kotlin.name.FqName
@@ -138,7 +137,7 @@ internal class SpecialDeclarationsFactory(val context: Context) {
         return bridges.getOrPut(key) { createBridge(key) }
     }
 
-    private fun createBridge(key: BridgeKey): IrSimpleFunction = WrappedSimpleFunctionDescriptor().let { descriptor ->
+    private fun createBridge(key: BridgeKey): IrSimpleFunction {
         val (function, bridgeDirections) = key
         val startOffset = function.startOffset
         val endOffset = function.endOffset
@@ -148,10 +147,10 @@ internal class SpecialDeclarationsFactory(val context: Context) {
                     null
                 else this.irClass?.defaultType ?: context.irBuiltIns.anyNType
 
-        IrFunctionImpl(
+        return IrFunctionImpl(
                 startOffset, endOffset,
                 DECLARATION_ORIGIN_BRIDGE_METHOD(function),
-                IrSimpleFunctionSymbolImpl(descriptor),
+                IrSimpleFunctionSymbolImpl(),
                 "<bridge-$bridgeDirections>${function.computeFunctionName()}".synthesizedName,
                 function.visibility,
                 function.modality,
@@ -166,7 +165,6 @@ internal class SpecialDeclarationsFactory(val context: Context) {
                 isInfix = false
         ).apply {
             val bridge = this
-            descriptor.bind(bridge)
             parent = function.parent
 
             dispatchReceiverParameter = function.dispatchReceiverParameter?.let {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt
index f9b866a6735..bfc820ca7f0 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt
@@ -15,8 +15,6 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.impl.IrTryImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl
@@ -25,13 +23,12 @@ import org.jetbrains.kotlin.ir.util.irCatch
 import org.jetbrains.kotlin.name.Name
 
 internal fun makeEntryPoint(context: Context): IrFunction {
-    val entryPointDescriptor = WrappedSimpleFunctionDescriptor()
     val actualMain = context.ir.symbols.entryPoint!!.owner
     val entryPoint = IrFunctionImpl(
             actualMain.startOffset,
             actualMain.startOffset,
             IrDeclarationOrigin.DEFINED,
-            IrSimpleFunctionSymbolImpl(entryPointDescriptor),
+            IrSimpleFunctionSymbolImpl(),
             Name.identifier("Konan_start"),
             DescriptorVisibilities.PRIVATE,
             Modality.FINAL,
@@ -45,11 +42,11 @@ internal fun makeEntryPoint(context: Context): IrFunction {
             isOperator = false,
             isInfix = false
     ).also { function ->
-        function.valueParameters = listOf(WrappedValueParameterDescriptor().let {
+        function.valueParameters = listOf(
             IrValueParameterImpl(
                     actualMain.startOffset, actualMain.startOffset,
                     IrDeclarationOrigin.DEFINED,
-                    IrValueParameterSymbolImpl(it),
+                    IrValueParameterSymbolImpl(),
                     Name.identifier("args"),
                     index = 0,
                     varargElementType = null,
@@ -59,12 +56,9 @@ internal fun makeEntryPoint(context: Context): IrFunction {
                     isHidden = false,
                     isAssignable = false
             ).apply {
-                it.bind(this)
                 parent = function
-            }
-        })
+            })
     }
-    entryPointDescriptor.bind(entryPoint)
     entryPoint.annotations += buildSimpleAnnotation(context.irBuiltIns,
             actualMain.startOffset, actualMain.startOffset,
             context.ir.symbols.exportForCppRuntime.owner, "Konan_start")
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt
index afb5f15770b..8da87831f0e 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt
@@ -22,9 +22,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFieldImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedFieldDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
@@ -135,11 +132,11 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
         val startOffset = enumClass.startOffset
         val endOffset = enumClass.endOffset
 
-        val implObject = WrappedClassDescriptor().let {
+        val implObject =
             IrClassImpl(
                     startOffset, endOffset,
                     DECLARATION_ORIGIN_ENUM,
-                    IrClassSymbolImpl(it),
+                    IrClassSymbolImpl(),
                     "OBJECT".synthesizedName,
                     ClassKind.OBJECT,
                     DescriptorVisibilities.PUBLIC,
@@ -152,18 +149,16 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
                     isExpect = false,
                     isFun = false
             ).apply {
-                it.bind(this)
                 parent = enumClass
                 createParameterDeclarations()
             }
-        }
 
         val valuesType = valuesArrayType(enumClass)
-        val valuesField = WrappedFieldDescriptor().let {
+        val valuesField =
             IrFieldImpl(
                     startOffset, endOffset,
                     DECLARATION_ORIGIN_ENUM,
-                    IrFieldSymbolImpl(it),
+                    IrFieldSymbolImpl(),
                     "VALUES".synthesizedName,
                     valuesType,
                     DescriptorVisibilities.PRIVATE,
@@ -171,16 +166,14 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
                     isExternal = false,
                     isStatic = false,
             ).apply {
-                it.bind(this)
                 parent = implObject
             }
-        }
 
-        val valuesGetter = WrappedSimpleFunctionDescriptor().let {
+        val valuesGetter =
             IrFunctionImpl(
                     startOffset, endOffset,
                     DECLARATION_ORIGIN_ENUM,
-                    IrSimpleFunctionSymbolImpl(it),
+                    IrSimpleFunctionSymbolImpl(),
                     "get-VALUES".synthesizedName,
                     DescriptorVisibilities.PUBLIC,
                     Modality.FINAL,
@@ -194,10 +187,8 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
                     isOperator = false,
                     isInfix = false
             ).apply {
-                it.bind(this)
                 parent = implObject
             }
-        }
 
         val constructorOfAny = context.irBuiltIns.anyClass.owner.constructors.first()
         implObject.addSimpleDelegatingConstructor(
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index 9a6a2755326..f2350f8d43d 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -124,11 +124,7 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
             MemoryModel.STRICT -> MemoryModel.STRICT
             MemoryModel.RELAXED -> MemoryModel.RELAXED
             MemoryModel.EXPERIMENTAL -> {
-                if (!target.supportsMimallocAllocator()) {
-                    configuration.report(CompilerMessageSeverity.STRONG_WARNING,
-                            "Experimental memory model requires mimalloc allocator. Used strict memory model.")
-                    MemoryModel.STRICT
-                } else if (!target.supportsThreads()) {
+                if (!target.supportsThreads()) {
                     configuration.report(CompilerMessageSeverity.STRONG_WARNING,
                             "Experimental memory model requires threads, which are not supported on target ${target.name}. Used strict memory model.")
                     MemoryModel.STRICT
@@ -141,9 +137,7 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
                 }
             }
         }
-        val useMimalloc = if (effectiveMemoryModel == MemoryModel.EXPERIMENTAL) {
-            true // we already checked that target supports mimalloc.
-        } else if (configuration.get(KonanConfigKeys.ALLOCATION_MODE) == "mimalloc") {
+        val useMimalloc = if (configuration.get(KonanConfigKeys.ALLOCATION_MODE) == "mimalloc") {
             if (target.supportsMimallocAllocator()) {
                 true
             } else {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
index 66df2320878..c4f94887680 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt
@@ -180,7 +180,7 @@ internal val serializerPhase = konanUnitPhase(
                 this.config.configuration.languageVersionSettings,
                 config.configuration.get(CommonConfigurationKeys.METADATA_VERSION)!!,
                 config.project,
-                !expectActualLinker)
+                !expectActualLinker, includeOnlyModuleContent = true)
             serializedMetadata = serializer.serializeModule(moduleDescriptor)
         },
         name = "Serializer",
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
index a0fdba3551b..9aa4eb478af 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt
@@ -549,12 +549,11 @@ private fun KotlinStubs.createFakeKotlinExternalFunction(
         cFunctionName: String,
         isObjCMethod: Boolean
 ): IrSimpleFunction {
-    val bridgeDescriptor = WrappedSimpleFunctionDescriptor()
     val bridge = IrFunctionImpl(
             UNDEFINED_OFFSET,
             UNDEFINED_OFFSET,
             IrDeclarationOrigin.DEFINED,
-            IrSimpleFunctionSymbolImpl(bridgeDescriptor),
+            IrSimpleFunctionSymbolImpl(),
             Name.identifier(cFunctionName),
             DescriptorVisibilities.PRIVATE,
             Modality.FINAL,
@@ -568,7 +567,6 @@ private fun KotlinStubs.createFakeKotlinExternalFunction(
             isOperator = false,
             isInfix = false
     )
-    bridgeDescriptor.bind(bridge)
 
     bridge.annotations += buildSimpleAnnotation(irBuiltIns, UNDEFINED_OFFSET, UNDEFINED_OFFSET,
             symbols.symbolName.owner, cFunctionName)
@@ -1098,16 +1096,14 @@ private class ObjCBlockPointerValuePassing(
     private fun IrBuilderWithScope.generateKotlinFunctionClass(): IrConstructor {
         val symbols = stubs.symbols
 
-        val classDescriptor = WrappedClassDescriptor()
         val irClass = IrClassImpl(
                 startOffset, endOffset,
-                OBJC_BLOCK_FUNCTION_IMPL, IrClassSymbolImpl(classDescriptor),
+                OBJC_BLOCK_FUNCTION_IMPL, IrClassSymbolImpl(),
                 Name.identifier(stubs.getUniqueKotlinFunctionReferenceClassName("BlockFunctionImpl")),
                 ClassKind.CLASS, DescriptorVisibilities.PRIVATE, Modality.FINAL,
                 isCompanion = false, isInner = false, isData = false, isExternal = false,
                 isInline = false, isExpect = false, isFun = false
         )
-        classDescriptor.bind(irClass)
         irClass.createParameterDeclarations()
 
         irClass.superTypes += stubs.irBuiltIns.anyType
@@ -1121,24 +1117,21 @@ private class ObjCBlockPointerValuePassing(
                 isMutable = false, owner = irClass
         )
 
-        val constructorDescriptor = WrappedClassConstructorDescriptor()
         val constructor = IrConstructorImpl(
                 startOffset, endOffset,
                 OBJC_BLOCK_FUNCTION_IMPL,
-                IrConstructorSymbolImpl(constructorDescriptor),
+                IrConstructorSymbolImpl(),
                 Name.special("<init>"),
                 DescriptorVisibilities.PUBLIC,
                 irClass.defaultType,
                 isInline = false, isExternal = false, isPrimary = true, isExpect = false
         )
-        constructorDescriptor.bind(constructor)
         irClass.addChild(constructor)
 
-        val constructorParameterDescriptor = WrappedValueParameterDescriptor()
         val constructorParameter = IrValueParameterImpl(
                 startOffset, endOffset,
                 OBJC_BLOCK_FUNCTION_IMPL,
-                IrValueParameterSymbolImpl(constructorParameterDescriptor),
+                IrValueParameterSymbolImpl(),
                 Name.identifier("blockPointer"),
                 0,
                 symbols.nativePtrType,
@@ -1148,7 +1141,6 @@ private class ObjCBlockPointerValuePassing(
                 isHidden = false,
                 isAssignable = false
         )
-        constructorParameterDescriptor.bind(constructorParameter)
         constructor.valueParameters += constructorParameter
         constructorParameter.parent = constructor
 
@@ -1166,28 +1158,25 @@ private class ObjCBlockPointerValuePassing(
         val overriddenInvokeMethod = (functionType.classifier.owner as IrClass).simpleFunctions()
                 .single { it.name == OperatorNameConventions.INVOKE }
 
-        val invokeMethodDescriptor = WrappedSimpleFunctionDescriptor()
         val invokeMethod = IrFunctionImpl(
                 startOffset, endOffset,
                 OBJC_BLOCK_FUNCTION_IMPL,
-                IrSimpleFunctionSymbolImpl(invokeMethodDescriptor),
+                IrSimpleFunctionSymbolImpl(),
                 overriddenInvokeMethod.name,
                 DescriptorVisibilities.PUBLIC, Modality.FINAL,
                 returnType = functionType.arguments.last().typeOrNull!!,
                 isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isExpect = false,
                 isFakeOverride = false, isOperator = false, isInfix = false
         )
-        invokeMethodDescriptor.bind(invokeMethod)
         invokeMethod.overriddenSymbols += overriddenInvokeMethod.symbol
         irClass.addChild(invokeMethod)
         invokeMethod.createDispatchReceiverParameter()
 
         invokeMethod.valueParameters += (0 until parameterCount).map { index ->
-            val parameterDescriptor = WrappedValueParameterDescriptor()
             val parameter = IrValueParameterImpl(
                     startOffset, endOffset,
                     OBJC_BLOCK_FUNCTION_IMPL,
-                    IrValueParameterSymbolImpl(parameterDescriptor),
+                    IrValueParameterSymbolImpl(),
                     Name.identifier("p$index"),
                     index,
                     functionType.arguments[index].typeOrNull!!,
@@ -1197,7 +1186,6 @@ private class ObjCBlockPointerValuePassing(
                     isHidden = false,
                     isAssignable = false
             )
-            parameterDescriptor.bind(parameter)
             parameter.parent = invokeMethod
             parameter
         }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt
index 9219a076a54..82ca30abe31 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt
@@ -15,8 +15,6 @@ import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.declarations.IrVariable
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrTryImpl
@@ -81,11 +79,10 @@ internal class KotlinBridgeBuilder(
 
     fun addParameter(type: IrType): IrValueParameter {
         val index = counter++
-        val descriptor = WrappedValueParameterDescriptor()
 
         return IrValueParameterImpl(
                 bridge.startOffset, bridge.endOffset, bridge.origin,
-                IrValueParameterSymbolImpl(descriptor),
+                IrValueParameterSymbolImpl(),
                 Name.identifier("p$index"), index, type,
                 null,
                 isCrossinline = false,
@@ -93,7 +90,6 @@ internal class KotlinBridgeBuilder(
                 isHidden = false,
                 isAssignable = false
         ).apply {
-            descriptor.bind(this)
             parent = bridge
             bridge.valueParameters += this
         }
@@ -114,12 +110,11 @@ private fun createKotlinBridge(
         isExternal: Boolean,
         foreignExceptionMode: ForeignExceptionMode.Mode
 ): IrFunction {
-    val bridgeDescriptor = WrappedSimpleFunctionDescriptor()
     val bridge = IrFunctionImpl(
             startOffset,
             endOffset,
             IrDeclarationOrigin.DEFINED,
-            IrSimpleFunctionSymbolImpl(bridgeDescriptor),
+            IrSimpleFunctionSymbolImpl(),
             Name.identifier(cBridgeName),
             DescriptorVisibilities.PRIVATE,
             Modality.FINAL,
@@ -133,7 +128,6 @@ private fun createKotlinBridge(
             isOperator = false,
             isInfix = false
     )
-    bridgeDescriptor.bind(bridge)
     if (isExternal) {
         bridge.annotations += buildSimpleAnnotation(stubs.irBuiltIns, startOffset, endOffset,
                 stubs.symbols.symbolName.owner, cBridgeName)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt
index 89702ad81fb..b52879b237c 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/KonanSharedVariablesManager.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrVariable
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrGetValue
 import org.jetbrains.kotlin.ir.expressions.IrSetValue
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
@@ -44,17 +43,14 @@ internal class KonanSharedVariablesManager(val context: KonanBackendContext) : S
         }
 
         return with(originalDeclaration) {
-            WrappedVariableDescriptor().let {
-                IrVariableImpl(
-                        startOffset, endOffset, origin,
-                        IrVariableSymbolImpl(it), name, refConstructorCall.type,
-                        isVar = false,
-                        isConst = false,
-                        isLateinit = false
-                ).apply {
-                    it.bind(this)
-                    initializer = refConstructorCall
-                }
+            IrVariableImpl(
+                    startOffset, endOffset, origin,
+                    IrVariableSymbolImpl(), name, refConstructorCall.type,
+                    isVar = false,
+                    isConst = false,
+                    isLateinit = false
+            ).apply {
+                initializer = refConstructorCall
             }
         }
     }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
index 7a9a2f33a92..d75dfdb43fa 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.backend.konan.RuntimeNames
 import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.OverridingUtil
 import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
@@ -126,10 +127,13 @@ fun AnnotationDescriptor.getStringValue(name: String): String = this.getStringVa
 
 private fun getPackagesFqNames(module: ModuleDescriptor): Set<FqName> {
     val result = mutableSetOf<FqName>()
+    val packageFragmentProvider = (module as? ModuleDescriptorImpl)?.packageFragmentProviderForModuleContentWithoutDependencies
 
     fun getSubPackages(fqName: FqName) {
         result.add(fqName)
-        module.getSubPackagesOf(fqName) { true }.forEach { getSubPackages(it) }
+        val subPackages = packageFragmentProvider?.getSubPackagesOf(fqName) { true }
+                ?: module.getSubPackagesOf(fqName) { true }
+        subPackages.forEach { getSubPackages(it) }
     }
 
     getSubPackages(FqName.ROOT)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt
index 3e6228e3679..389b580b1d8 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt
@@ -60,7 +60,7 @@ internal interface DescriptorToIrTranslationMixin {
                     SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, it, descriptor
                 )
             }.also { irClass ->
-                symbolTable.withScope(descriptor) {
+                symbolTable.withScope(irClass) {
                     irClass.superTypes += descriptor.typeConstructor.supertypes.map {
                         it.toIrType()
                     }
@@ -133,7 +133,7 @@ internal interface DescriptorToIrTranslationMixin {
             origin: IrDeclarationOrigin = IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB
     ): IrSimpleFunction {
         val irFunction = symbolTable.declareSimpleFunctionWithOverrides(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, origin, functionDescriptor)
-        symbolTable.withScope(functionDescriptor) {
+        symbolTable.withScope(irFunction) {
             irFunction.returnType = functionDescriptor.returnType!!.toIrType()
             irFunction.valueParameters +=  functionDescriptor.valueParameters.map {
                 symbolTable.declareValueParameter(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED, it, it.type.toIrType())
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt
index f5758053e79..3117c5dd3ad 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt
@@ -93,7 +93,7 @@ internal class CEnumClassGenerator(
                 .findDeclarationByName<PropertyDescriptor>("value")
                 ?: error("No `value` property in ${irClass.name}")
         val irProperty = createProperty(propertyDescriptor)
-        symbolTable.withScope(propertyDescriptor) {
+        symbolTable.withScope(irProperty) {
             irProperty.backingField = symbolTable.declareField(
                     SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.PROPERTY_BACKING_FIELD,
                     propertyDescriptor, propertyDescriptor.type.toIrType(), DescriptorVisibilities.PRIVATE
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
index bb051fd43b6..ced834b7077 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt
@@ -20,8 +20,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFieldImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrPropertyImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedPropertyDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
 import org.jetbrains.kotlin.ir.symbols.*
@@ -414,13 +412,12 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
     private fun buildBoxField(declaration: IrClass) {
         val startOffset = declaration.startOffset
         val endOffset = declaration.endOffset
-        val descriptor = WrappedPropertyDescriptor()
 
         val irField = IrFieldImpl(
                 startOffset,
                 endOffset,
                 IrDeclarationOrigin.DEFINED,
-                IrFieldSymbolImpl(descriptor),
+                IrFieldSymbolImpl(),
                 Name.identifier("value"),
                 declaration.defaultType,
                 DescriptorVisibilities.PRIVATE,
@@ -434,7 +431,7 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                 startOffset,
                 endOffset,
                 IrDeclarationOrigin.DEFINED,
-                IrPropertySymbolImpl(descriptor),
+                IrPropertySymbolImpl(),
                 irField.name,
                 irField.visibility,
                 Modality.FINAL,
@@ -444,7 +441,6 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                 isDelegated = false,
                 isExternal = false
         )
-        descriptor.bind(irProperty)
         irProperty.backingField = irField
 
         declaration.addChild(irProperty)
@@ -553,11 +549,10 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl
         irConstructor.returnType
     }
 
-    val descriptor = WrappedSimpleFunctionDescriptor()
     IrFunctionImpl(
             irConstructor.startOffset, irConstructor.endOffset,
             IrDeclarationOrigin.DEFINED,
-            IrSimpleFunctionSymbolImpl(descriptor),
+            IrSimpleFunctionSymbolImpl(),
             Name.special("<constructor>"),
             irConstructor.visibility,
             Modality.FINAL,
@@ -571,7 +566,6 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl
             isOperator = false,
             isInfix = false
     ).apply {
-        descriptor.bind(this)
         parent = irConstructor.parent
 
         // Note: technically speaking, this function doesn't have access to class type parameters (since it is "static").
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
index 1a7f6d64717..7b19300b5cb 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/BridgesBuilding.kt
@@ -19,8 +19,6 @@ import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
@@ -71,11 +69,11 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
                     val arg = jobFunction.valueParameters[0]
                     val startOffset = jobFunction.startOffset
                     val endOffset = jobFunction.endOffset
-                    runtimeJobFunction = WrappedSimpleFunctionDescriptor().let {
+                    runtimeJobFunction =
                         IrFunctionImpl(
                                 startOffset, endOffset,
                                 IrDeclarationOrigin.DEFINED,
-                                IrSimpleFunctionSymbolImpl(it),
+                                IrSimpleFunctionSymbolImpl(),
                                 jobFunction.name,
                                 jobFunction.visibility,
                                 jobFunction.modality,
@@ -88,16 +86,13 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
                                 isFakeOverride = false,
                                 isOperator = false,
                                 isInfix = false
-                    ).apply {
-                            it.bind(this)
-                        }
-                    }
+                    )
 
-                    runtimeJobFunction.valueParameters += WrappedValueParameterDescriptor().let {
+                    runtimeJobFunction.valueParameters +=
                         IrValueParameterImpl(
                                 startOffset, endOffset,
                                 IrDeclarationOrigin.DEFINED,
-                                IrValueParameterSymbolImpl(it),
+                                IrValueParameterSymbolImpl(),
                                 arg.name,
                                 arg.index,
                                 type = context.irBuiltIns.anyNType,
@@ -106,8 +101,7 @@ internal class WorkersBridgesBuilding(val context: Context) : DeclarationContain
                                 isNoinline = arg.isNoinline,
                                 isHidden = arg.isHidden,
                                 isAssignable = arg.isAssignable
-                        ).apply { it.bind(this) }
-                    }
+                        )
                 }
                 val overriddenJobDescriptor = OverriddenFunctionInfo(jobFunction, runtimeJobFunction)
                 if (!overriddenJobDescriptor.needBridge) return expression
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt
index ccfde9d4e9b..d34149ac253 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFieldImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedFieldDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrLocalDelegatedPropertyReference
 import org.jetbrains.kotlin.ir.expressions.IrPropertyReference
@@ -84,11 +83,11 @@ internal class PropertyDelegationLowering(val context: Context) : FileLoweringPa
 
         val kPropertiesFieldType: IrType = context.ir.symbols.array.typeWith(kPropertyImplType)
 
-        val kPropertiesField = WrappedFieldDescriptor().let {
+        val kPropertiesField =
             IrFieldImpl(
                     SYNTHETIC_OFFSET, SYNTHETIC_OFFSET,
                     DECLARATION_ORIGIN_KPROPERTIES_FOR_DELEGATION,
-                    IrFieldSymbolImpl(it),
+                    IrFieldSymbolImpl(),
                     "KPROPERTIES".synthesizedName,
                     kPropertiesFieldType,
                     DescriptorVisibilities.PRIVATE,
@@ -96,11 +95,9 @@ internal class PropertyDelegationLowering(val context: Context) : FileLoweringPa
                     isExternal = false,
                     isStatic = true,
             ).apply {
-                it.bind(this)
                 parent = irFile
                 annotations += buildSimpleAnnotation(context.irBuiltIns, startOffset, endOffset, context.ir.symbols.sharedImmutable.owner)
             }
-        }
 
         irFile.transformChildrenVoid(object : IrElementTransformerVoidWithContext() {
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt
index e5b0ba52a0c..f3e27a7e892 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt
@@ -16,8 +16,6 @@ import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrConstructorImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
@@ -109,11 +107,11 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
         private fun lowerEnumConstructor(constructor: IrConstructor): IrConstructor {
             val startOffset = constructor.startOffset
             val endOffset = constructor.endOffset
-            val loweredConstructor = WrappedClassConstructorDescriptor().let {
+            val loweredConstructor =
                 IrConstructorImpl(
                         startOffset, endOffset,
                         constructor.origin,
-                        IrConstructorSymbolImpl(it),
+                        IrConstructorSymbolImpl(),
                         constructor.name,
                         DescriptorVisibilities.PROTECTED,
                         constructor.returnType,
@@ -122,32 +120,27 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
                         isPrimary = constructor.isPrimary,
                         isExpect = false
                 ).apply {
-                    it.bind(this)
                     parent = constructor.parent
                     val body = constructor.body!!
                     this.body = body // Will be transformed later.
                     body.setDeclarationsParent(this)
                 }
-            }
 
             fun createSynthesizedValueParameter(index: Int, name: String, type: IrType): IrValueParameter =
-                    WrappedValueParameterDescriptor().let {
-                        IrValueParameterImpl(
-                                startOffset, endOffset,
-                                DECLARATION_ORIGIN_ENUM,
-                                IrValueParameterSymbolImpl(it),
-                                Name.identifier(name),
-                                index,
-                                type,
-                                varargElementType = null,
-                                isCrossinline = false,
-                                isNoinline = false,
-                                isHidden = false,
-                                isAssignable = false
-                        ).apply {
-                            it.bind(this)
-                            parent = loweredConstructor
-                        }
+                    IrValueParameterImpl(
+                            startOffset, endOffset,
+                            DECLARATION_ORIGIN_ENUM,
+                            IrValueParameterSymbolImpl(),
+                            Name.identifier(name),
+                            index,
+                            type,
+                            varargElementType = null,
+                            isCrossinline = false,
+                            isNoinline = false,
+                            isHidden = false,
+                            isAssignable = false
+                    ).apply {
+                        parent = loweredConstructor
                     }
 
             loweredConstructor.valueParameters += createSynthesizedValueParameter(0, "name", context.irBuiltIns.stringType)
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt
index 3672d2e5b99..c7685a4a25b 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt
@@ -9,8 +9,8 @@ import org.jetbrains.kotlin.backend.common.lower.*
 import org.jetbrains.kotlin.backend.common.*
 import org.jetbrains.kotlin.backend.konan.Context
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
@@ -24,8 +24,6 @@ import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.builders.irGet
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrVariableSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrSimpleType
@@ -173,27 +171,6 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir
             else -> error("Unknown ReturnTarget: $this")
         }
 
-    private fun createSyntheticFunctionDescriptor(name: String): SimpleFunctionDescriptor {
-        val descriptor = WrappedSimpleFunctionDescriptor()
-        descriptor.bind(IrFunctionImpl(
-                SYNTHETIC_OFFSET, SYNTHETIC_OFFSET,
-                IrDeclarationOrigin.DEFINED,
-                IrSimpleFunctionSymbolImpl(descriptor),
-                Name.identifier(name),
-                DescriptorVisibilities.PUBLIC,
-                Modality.FINAL,
-                context.irBuiltIns.unitType,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false)
-        )
-        return descriptor
-    }
-
     private fun performHighLevelJump(tryScopes: List<TryScope>,
                                      index: Int,
                                      jump: HighLevelJump,
@@ -206,7 +183,7 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir
         val currentTryScope = tryScopes[index]
         currentTryScope.jumps.getOrPut(jump) {
             val type = (jump as? Return)?.target?.owner?.returnType ?: value.type
-            val symbol = IrReturnableBlockSymbolImpl(createSyntheticFunctionDescriptor("\$Finally$index"))
+            val symbol = IrReturnableBlockSymbolImpl()
             with(currentTryScope) {
                 irBuilder.run {
                     val inlinedFinally = irInlineFinally(symbol, type, expression, finallyExpression)
@@ -245,21 +222,19 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir
                     type        = context.irBuiltIns.nothingType
             )
             val transformedFinallyExpression = finallyExpression.transform(transformer, null)
-            val catchParameter = WrappedVariableDescriptor().let {
+            val catchParameter =
                 IrVariableImpl(
                         startOffset, endOffset,
                         IrDeclarationOrigin.CATCH_PARAMETER,
-                        IrVariableSymbolImpl(it),
+                        IrVariableSymbolImpl(),
                         Name.identifier("t"),
                         symbols.throwable.owner.defaultType,
                         isVar = false,
                         isConst = false,
                         isLateinit = false
                 ).apply {
-                    it.bind(this)
                     parent = this@run.parent
                 }
-            }
 
             val syntheticTry = IrTryImpl(
                     startOffset       = startOffset,
@@ -276,7 +251,7 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir
             )
             using(TryScope(syntheticTry, transformedFinallyExpression, this)) {
                 val fallThroughType = aTry.type
-                val fallThroughSymbol = IrReturnableBlockSymbolImpl(createSyntheticFunctionDescriptor("\$Fallthrough"))
+                val fallThroughSymbol = IrReturnableBlockSymbolImpl()
                 val transformedResult = aTry.tryResult.transform(transformer, null)
                 transformedTry.tryResult = irReturn(fallThroughSymbol, transformedResult)
                 for (aCatch in aTry.catches) {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionReferenceLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionReferenceLowering.kt
index f6d39c27c8a..2b15d33cdcf 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionReferenceLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionReferenceLowering.kt
@@ -25,9 +25,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrConstructorImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrInstanceInitializerCallImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
@@ -224,11 +221,11 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
         private val adaptedReferenceOriginalTarget: IrFunction? = adapteeCall?.symbol?.owner
         private val functionReferenceTarget = adaptedReferenceOriginalTarget ?: referencedFunction
 
-        private val functionReferenceClass: IrClass = WrappedClassDescriptor().let {
+        private val functionReferenceClass: IrClass =
             IrClassImpl(
                     startOffset,endOffset,
                     DECLARATION_ORIGIN_FUNCTION_REFERENCE_IMPL,
-                    IrClassSymbolImpl(it),
+                    IrClassSymbolImpl(),
                     "${functionReferenceTarget.name}\$FUNCTION_REFERENCE\$${context.functionReferenceCount++}".synthesizedName,
                     ClassKind.CLASS,
                     DescriptorVisibilities.PRIVATE,
@@ -241,11 +238,9 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
                     isExpect = false,
                     isFun = false
             ).apply {
-                it.bind(this)
                 parent = this@FunctionReferenceBuilder.parent
                 createParameterDeclarations()
             }
-        }
 
         private val functionReferenceThis = functionReferenceClass.thisReceiver!!
 
@@ -337,11 +332,11 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
             return BuiltFunctionReference(functionReferenceClass, constructor)
         }
 
-        private fun buildConstructor(): IrConstructor = WrappedClassConstructorDescriptor().let {
+        private fun buildConstructor(): IrConstructor =
             IrConstructorImpl(
                     startOffset, endOffset,
                     DECLARATION_ORIGIN_FUNCTION_REFERENCE_IMPL,
-                    IrConstructorSymbolImpl(it),
+                    IrConstructorSymbolImpl(),
                     Name.special("<init>"),
                     DescriptorVisibilities.PUBLIC,
                     functionReferenceClass.defaultType,
@@ -350,7 +345,6 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
                     isPrimary = true,
                     isExpect = false
             ).apply {
-                it.bind(this)
                 parent = functionReferenceClass
                 functionReferenceClass.declarations += this
 
@@ -387,7 +381,6 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
                     }
                 }
             }
-        }
 
         private fun getFlags() =
                 (if (referencedFunction.isSuspend) 1 else 0) + getAdaptedCallableReferenceFlags() shl 1
@@ -418,11 +411,11 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
             return false
         }
 
-        private fun buildInvokeMethod(superFunction: IrSimpleFunction): IrSimpleFunction = WrappedSimpleFunctionDescriptor().let {
+        private fun buildInvokeMethod(superFunction: IrSimpleFunction): IrSimpleFunction =
             IrFunctionImpl(
                     startOffset, endOffset,
                     DECLARATION_ORIGIN_FUNCTION_REFERENCE_IMPL,
-                    IrSimpleFunctionSymbolImpl(it),
+                    IrSimpleFunctionSymbolImpl(),
                     superFunction.name,
                     DescriptorVisibilities.PRIVATE,
                     Modality.FINAL,
@@ -436,7 +429,6 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
                     isOperator = false,
                     isInfix = false
             ).apply {
-                it.bind(this)
                 val function = this
                 parent = functionReferenceClass
                 functionReferenceClass.declarations += function
@@ -486,6 +478,5 @@ internal class FunctionReferenceLowering(val context: Context): FileLoweringPass
                     )
                 }
             }
-        }
     }
 }
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt
index e731dfe571e..3e12142b8ef 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.irDelegatingConstructorCall
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
@@ -108,11 +107,11 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
 
             val startOffset = irClass.startOffset
             val endOffset = irClass.endOffset
-            val initializeFun = WrappedSimpleFunctionDescriptor().let {
+            val initializeFun =
                 IrFunctionImpl(
                         startOffset, endOffset,
                         DECLARATION_ORIGIN_ANONYMOUS_INITIALIZER,
-                        IrSimpleFunctionSymbolImpl(it),
+                        IrSimpleFunctionSymbolImpl(),
                         "INITIALIZER".synthesizedName,
                         DescriptorVisibilities.PRIVATE,
                         Modality.FINAL,
@@ -126,7 +125,6 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
                         isOperator = false,
                         isInfix = false
                 ).apply {
-                    it.bind(this)
                     parent = irClass
                     irClass.declarations.add(this)
 
@@ -134,7 +132,6 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
 
                     body = IrBlockBodyImpl(startOffset, endOffset, initializers)
                 }
-            }
 
             for (initializer in initializers) {
                 initializer.transformChildrenVoid(object : IrElementTransformerVoid() {
@@ -175,7 +172,8 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
                 }
 
                 override fun visitConstructor(declaration: IrConstructor): IrStatement {
-                    val blockBody = declaration.body as? IrBlockBody
+                    val body = declaration.body ?: return declaration
+                    val blockBody = body as? IrBlockBody
                             ?: throw AssertionError("Unexpected constructor body: ${declaration.body}")
 
                     blockBody.statements.transformFlat {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
index 4f5c3803985..47299c61e9c 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedValueParameterDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrDelegatingConstructorCallImpl
@@ -225,11 +223,10 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
 
         // Generate `override fun init...(...) = this.initBy(...)`:
 
-        val resultDescriptor = WrappedSimpleFunctionDescriptor()
         return IrFunctionImpl(
                 constructor.startOffset, constructor.endOffset,
                 OVERRIDING_INITIALIZER_BY_CONSTRUCTOR,
-                IrSimpleFunctionSymbolImpl(resultDescriptor),
+                IrSimpleFunctionSymbolImpl(),
                 initMethod.name,
                 DescriptorVisibilities.PUBLIC,
                 Modality.OPEN,
@@ -243,7 +240,6 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
                 isOperator = false,
                 isInfix = false
         ).also { result ->
-            resultDescriptor.bind(result)
             result.parent = irClass
             result.createDispatchReceiverParameter()
             result.valueParameters += constructor.valueParameters.map { it.copyTo(result) }
@@ -323,11 +319,11 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
 
         function.valueParameters.mapTo(parameterTypes) { nativePtrType }
 
-        val newFunction = WrappedSimpleFunctionDescriptor().let {
+        val newFunction =
             IrFunctionImpl(
                     function.startOffset, function.endOffset,
                     IrDeclarationOrigin.DEFINED,
-                    IrSimpleFunctionSymbolImpl(it),
+                    IrSimpleFunctionSymbolImpl(),
                     ("imp:$selector").synthesizedName,
                     DescriptorVisibilities.PRIVATE,
                     Modality.FINAL,
@@ -340,29 +336,23 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
                     isFakeOverride = false,
                     isOperator = false,
                     isInfix = false
-            ).apply {
-                it.bind(this)
-            }
-        }
+            )
 
         newFunction.valueParameters += parameterTypes.mapIndexed { index, type ->
-            WrappedValueParameterDescriptor().let {
-                IrValueParameterImpl(
-                        function.startOffset, function.endOffset,
-                        IrDeclarationOrigin.DEFINED,
-                        IrValueParameterSymbolImpl(it),
-                        Name.identifier("p$index"),
-                        index,
-                        type,
-                        varargElementType = null,
-                        isCrossinline = false,
-                        isNoinline = false,
-                        isHidden = false,
-                        isAssignable = false
-                ).apply {
-                    it.bind(this)
-                    parent = newFunction
-                }
+            IrValueParameterImpl(
+                    function.startOffset, function.endOffset,
+                    IrDeclarationOrigin.DEFINED,
+                    IrValueParameterSymbolImpl(),
+                    Name.identifier("p$index"),
+                    index,
+                    type,
+                    varargElementType = null,
+                    isCrossinline = false,
+                    isNoinline = false,
+                    isHidden = false,
+                    isAssignable = false
+            ).apply {
+                parent = newFunction
             }
         }
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt
index 0e352602ff5..6f94d91423d 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt
@@ -14,8 +14,6 @@ import org.jetbrains.kotlin.ir.builders.irCall
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrSetValueImpl
@@ -478,11 +476,11 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
     }
 
     // These are marker functions to split up the lowering on two parts.
-    private val saveState = WrappedSimpleFunctionDescriptor().let {
+    private val saveState =
         IrFunctionImpl(
                 SYNTHETIC_OFFSET, SYNTHETIC_OFFSET,
                 IrDeclarationOrigin.DEFINED,
-                IrSimpleFunctionSymbolImpl(it),
+                IrSimpleFunctionSymbolImpl(),
                 "saveState".synthesizedName,
                 DescriptorVisibilities.PRIVATE,
                 Modality.ABSTRACT,
@@ -495,16 +493,13 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
                 isFakeOverride = false,
                 isOperator = false,
                 isInfix = false
-        ).apply {
-            it.bind(this)
-        }
-    }
+        )
 
-    private val restoreState = WrappedSimpleFunctionDescriptor().let {
+    private val restoreState =
         IrFunctionImpl(
                 SYNTHETIC_OFFSET, SYNTHETIC_OFFSET,
                 IrDeclarationOrigin.DEFINED,
-                IrSimpleFunctionSymbolImpl(it),
+                IrSimpleFunctionSymbolImpl(),
                 "restoreState".synthesizedName,
                 DescriptorVisibilities.PRIVATE,
                 Modality.ABSTRACT,
@@ -517,29 +512,24 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
                 isFakeOverride = false,
                 isOperator = false,
                 isInfix = false
-        ).apply {
-            it.bind(this)
-        }
-    }
+        )
 
     private fun IrBuilderWithScope.irVar(name: Name, type: IrType,
                                          isMutable: Boolean = false,
-                                         initializer: IrExpression? = null) = WrappedVariableDescriptor().let {
+                                         initializer: IrExpression? = null) =
         IrVariableImpl(
                 startOffset, endOffset,
                 DECLARATION_ORIGIN_COROUTINE_IMPL,
-                IrVariableSymbolImpl(it),
+                IrVariableSymbolImpl(),
                 name,
                 type,
                 isMutable,
                 isConst = false,
                 isLateinit = false
         ).apply {
-            it.bind(this)
             this.initializer = initializer
             this.parent = this@irVar.parent
         }
-    }
 
     private fun IrBuilderWithScope.irGetOrThrow(result: IrExpression): IrExpression =
             irCall(symbols.kotlinResultGetOrThrow.owner).apply {
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/RedundantCoercionsCleaner.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/RedundantCoercionsCleaner.kt
index ddbc37926d0..262bdbdaaed 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/RedundantCoercionsCleaner.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/RedundantCoercionsCleaner.kt
@@ -150,7 +150,7 @@ internal class RedundantCoercionsCleaner(val context: Context) : FileLoweringPas
                             expression
                         else {
                             val oldSymbol = expression.symbol
-                            val newSymbol = IrReturnableBlockSymbolImpl(expression.descriptor)
+                            val newSymbol = IrReturnableBlockSymbolImpl()
                             val transformedReturnableBlock = with(expression) {
                                 IrReturnableBlockImpl(
                                         startOffset = startOffset,
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt
index baa2034e8c2..81ea780dab7 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt
@@ -22,9 +22,6 @@ import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrConstructorImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedClassDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.ir.symbols.impl.IrClassSymbolImpl
@@ -335,11 +332,11 @@ internal class TestProcessor (val context: Context) {
      */
     private fun buildObjectGetter(objectSymbol: IrClassSymbol,
                                   owner: IrClass,
-                                  getterName: Name): IrSimpleFunction = WrappedSimpleFunctionDescriptor().let { descriptor ->
+                                  getterName: Name): IrSimpleFunction =
         IrFunctionImpl(
                 owner.startOffset, owner.endOffset,
                 TEST_SUITE_GENERATED_MEMBER,
-                IrSimpleFunctionSymbolImpl(descriptor),
+                IrSimpleFunctionSymbolImpl(),
                 getterName,
                 DescriptorVisibilities.PROTECTED,
                 Modality.FINAL,
@@ -353,7 +350,6 @@ internal class TestProcessor (val context: Context) {
                 isOperator = false,
                 isInfix = false
         ).apply {
-            descriptor.bind(this)
             parent = owner
 
             val superFunction = baseClassSuite.simpleFunctions()
@@ -367,7 +363,6 @@ internal class TestProcessor (val context: Context) {
                 )
             }
         }
-    }
 
     /**
      * Builds a method in `[testSuite]` class with name `[getterName]`
@@ -375,11 +370,11 @@ internal class TestProcessor (val context: Context) {
      */
     private fun buildInstanceGetter(classSymbol: IrClassSymbol,
                                     owner: IrClass,
-                                    getterName: Name): IrSimpleFunction = WrappedSimpleFunctionDescriptor().let { descriptor ->
+                                    getterName: Name): IrSimpleFunction =
         IrFunctionImpl(
                 owner.startOffset, owner.endOffset,
                 TEST_SUITE_GENERATED_MEMBER,
-                IrSimpleFunctionSymbolImpl(descriptor),
+                IrSimpleFunctionSymbolImpl(),
                 getterName,
                 DescriptorVisibilities.PROTECTED,
                 Modality.FINAL,
@@ -393,7 +388,6 @@ internal class TestProcessor (val context: Context) {
                 isOperator = false,
                 isInfix = false
         ).apply {
-            descriptor.bind(this)
             parent = owner
 
             val superFunction = baseClassSuite.simpleFunctions()
@@ -407,7 +401,6 @@ internal class TestProcessor (val context: Context) {
                 +irReturn(irCall(constructor))
             }
         }
-    }
 
     private val baseClassSuiteConstructor = baseClassSuite.constructors.single {
         it.valueParameters.size == 2
@@ -426,11 +419,11 @@ internal class TestProcessor (val context: Context) {
                                            testSuite: IrClassSymbol,
                                            owner: IrClass,
                                            functions: Collection<TestFunction>,
-                                           ignored: Boolean): IrConstructor = WrappedClassConstructorDescriptor().let { descriptor ->
+                                           ignored: Boolean): IrConstructor =
         IrConstructorImpl(
                 testSuite.owner.startOffset, testSuite.owner.endOffset,
                 TEST_SUITE_GENERATED_MEMBER,
-                IrConstructorSymbolImpl(descriptor),
+                IrConstructorSymbolImpl(),
                 Name.special("<init>"),
                 DescriptorVisibilities.PUBLIC,
                 testSuite.typeWithStarProjections,
@@ -439,7 +432,6 @@ internal class TestProcessor (val context: Context) {
                 isPrimary = true,
                 isExpect = false
         ).apply {
-            descriptor.bind(this)
             parent = owner
 
             fun IrClass.getFunction(name: String, predicate: (IrSimpleFunction) -> Boolean) =
@@ -469,7 +461,6 @@ internal class TestProcessor (val context: Context) {
                         registerTestCase, registerFunction, functions)
             }
         }
-    }
 
     private val IrClass.ignored: Boolean get() = annotations.hasAnnotation(IGNORE_FQ_NAME)
 
@@ -479,11 +470,11 @@ internal class TestProcessor (val context: Context) {
      */
     private fun buildClassSuite(testClass: IrClass,
                                 testCompanion: IrClass?,
-                                functions: Collection<TestFunction>): IrClass = WrappedClassDescriptor().let { descriptor ->
+                                functions: Collection<TestFunction>): IrClass =
         IrClassImpl(
                 testClass.startOffset, testClass.endOffset,
                 TEST_SUITE_CLASS,
-                IrClassSymbolImpl(descriptor),
+                IrClassSymbolImpl(),
                 testClass.name.synthesizeSuiteClassName(),
                 ClassKind.CLASS,
                 DescriptorVisibilities.PRIVATE,
@@ -496,7 +487,6 @@ internal class TestProcessor (val context: Context) {
                 isExpect = false,
                 isFun = false
         ).apply {
-            descriptor.bind(this)
             createParameterDeclarations()
 
             val testClassType = testClass.defaultType
@@ -531,7 +521,6 @@ internal class TestProcessor (val context: Context) {
             superTypes += symbols.baseClassSuite.typeWith(listOf(testClassType, testCompanionType))
             addFakeOverrides(context.irBuiltIns)
         }
-    }
     //endregion
 
     // region IR generation methods
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
index 36f42b5e1eb..34b48803b92 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/optimizations/Devirtualization.kt
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol
@@ -1318,13 +1317,10 @@ internal object Devirtualization {
         }
 
         fun <T : IrElement> IrStatementsBuilder<T>.irTemporary(value: IrExpression, tempName: String, type: IrType): IrVariable {
-            val descriptor = WrappedVariableDescriptor()
-
             val temporary = IrVariableImpl(
-                value.startOffset, value.endOffset, IrDeclarationOrigin.IR_TEMPORARY_VARIABLE, IrVariableSymbolImpl(descriptor),
+                value.startOffset, value.endOffset, IrDeclarationOrigin.IR_TEMPORARY_VARIABLE, IrVariableSymbolImpl(),
                 Name.identifier(tempName), type, isVar = false, isConst = false, isLateinit = false
             ).apply {
-                descriptor.bind(this)
                 this.initializer = value
             }
 
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
index 9906bdc6b82..4066a46706b 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/serialization/KonanIrlinker.kt
@@ -210,7 +210,7 @@ internal class KonanIrLinker(
             if (actualModule !== moduleDescriptor) {
                 val moduleDeserializer = deserializersForModules[actualModule] ?: error("No module deserializer for $actualModule")
                 moduleDeserializer.addModuleReachableTopLevel(idSig)
-                return symbolTable.referenceClassFromLinker(descriptor, idSig)
+                return symbolTable.referenceClassFromLinker(idSig)
             }
 
             return declaredDeclaration.getOrPut(idSig) { buildForwardDeclarationStub(descriptor) }.symbol
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt
index f53fcf0075f..2facacba862 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt
@@ -25,8 +25,6 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrVariableImpl
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
-import org.jetbrains.kotlin.ir.descriptors.WrappedFieldDescriptor
-import org.jetbrains.kotlin.ir.descriptors.WrappedVariableDescriptor
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.expressions.impl.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
@@ -69,11 +67,10 @@ internal fun IrExpression.isNullConst() = this is IrConst<*> && this.kind == IrC
 private var topLevelInitializersCounter = 0
 
 internal fun IrFile.addTopLevelInitializer(expression: IrExpression, context: KonanBackendContext, threadLocal: Boolean) {
-    val descriptor = WrappedFieldDescriptor()
     val irField = IrFieldImpl(
             expression.startOffset, expression.endOffset,
             IrDeclarationOrigin.DEFINED,
-            IrFieldSymbolImpl(descriptor),
+            IrFieldSymbolImpl(),
             "topLevelInitializer${topLevelInitializersCounter++}".synthesizedName,
             expression.type,
             DescriptorVisibilities.PRIVATE,
@@ -81,8 +78,6 @@ internal fun IrFile.addTopLevelInitializer(expression: IrExpression, context: Ko
             isExternal = false,
             isStatic = true,
     ).apply {
-        descriptor.bind(this)
-
         expression.setDeclarationsParent(this)
 
         if (threadLocal)
@@ -264,21 +259,18 @@ fun IrBuilderWithScope.irSetVar(variable: IrVariable, value: IrExpression) =
 fun IrBuilderWithScope.irCatch(type: IrType) =
         IrCatchImpl(
                 startOffset, endOffset,
-                WrappedVariableDescriptor().let { descriptor ->
-                    IrVariableImpl(
-                            startOffset,
-                            endOffset,
-                            IrDeclarationOrigin.IR_TEMPORARY_VARIABLE,
-                            IrVariableSymbolImpl(descriptor),
-                            Name.identifier("e"),
-                            type,
-                            false,
-                            false,
-                            false
-                    ).apply {
-                        descriptor.bind(this)
-                        parent = this@irCatch.parent
-                    }
+                IrVariableImpl(
+                        startOffset,
+                        endOffset,
+                        IrDeclarationOrigin.IR_TEMPORARY_VARIABLE,
+                        IrVariableSymbolImpl(),
+                        Name.identifier("e"),
+                        type,
+                        false,
+                        false,
+                        false
+                ).apply {
+                    parent = this@irCatch.parent
                 }
         )
 
@@ -345,11 +337,11 @@ fun createField(
         name: Name,
         isMutable: Boolean,
         owner: IrClass
-) = WrappedFieldDescriptor().let {
+) =
     IrFieldImpl(
             startOffset, endOffset,
             origin,
-            IrFieldSymbolImpl(it),
+            IrFieldSymbolImpl(),
             name,
             type,
             DescriptorVisibilities.PRIVATE,
@@ -357,14 +349,12 @@ fun createField(
             false,
             false,
     ).apply {
-        it.bind(this)
         owner.declarations += this
         parent = owner
     }
-}
 
 fun IrValueParameter.copy(newDescriptor: ParameterDescriptor): IrValueParameter {
-    // Aggressive use of WrappedDescriptors during deserialization
+    // Aggressive use of IrBasedDescriptors during deserialization
     // makes these types different.
     // Let's hope they not really used afterwards.
     //assert(this.descriptor.type == newDescriptor.type) {
diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index 87ee21d2406..23f738617ab 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -448,6 +448,7 @@ task run_external () {
     // Set up dependencies.
     dependsOn(tasksOf(RunExternalTestGroup))
     dependsOn("stdlibTest")
+    dependsOn("stdlibTestInWorker")
 }
 
 task daily() {
@@ -4922,10 +4923,22 @@ task override_konan_properties0(type: KonanDriverTest) {
     }
 }
 
+createStdlibTest('stdlibTest', /* inWorker = */ false)
+createStdlibTest('stdlibTestInWorker', /*inWorker = */ true)
+
 /**
  * Creates tasks to build and execute stdlib tests.
  */
-KotlinNativeTestKt.createTest(project, 'stdlibTest', KonanGTest) { task ->
+private void createStdlibTest(String name, boolean inWorker) {
+    KotlinNativeTestKt.createTest(project, name, KonanGTest) { task ->
+        configureStdlibTest(task, inWorker)
+    }
+}
+
+/**
+ * Configures tasks to build and execute stdlib tests.
+ */
+private void configureStdlibTest(KonanGTest task, boolean inWorker) {
     def sources = UtilsKt.getFilesToCompile(project,
             [ 'build/stdlib_external/stdlib', 'stdlib_external/utils.kt',
                                  'stdlib_external/collections',
@@ -4934,11 +4947,11 @@ KotlinNativeTestKt.createTest(project, 'stdlibTest', KonanGTest) { task ->
             [ 'build/stdlib_external/stdlib/test/internalAnnotations.kt' ])
 
     konanArtifacts {
-        program('stdlibTest', targets: [target.name]) {
+        program(task.name, targets: [target.name]) {
             srcFiles sources
-            baseDir "$testOutputStdlib/stdlibTest"
+            baseDir "$testOutputStdlib/$task.name"
             enableMultiplatform true
-            extraOpts '-tr',
+            extraOpts inWorker ? '-trw' : '-tr',
                     '-Xverify-ir',
                     '-Xopt-in=kotlin.RequiresOptIn,kotlin.ExperimentalStdlibApi',
                     "-friend-modules", project.rootProject.file("${project.properties['konan.home']}/klib/common/stdlib").absolutePath
diff --git a/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt b/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt
index e4148285d97..758f56c27d2 100644
--- a/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt
+++ b/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt
@@ -6,6 +6,8 @@
 package test.text
 
 
+@SharedImmutable
 internal actual val surrogateCodePointDecoding: String = "\uFFFD".repeat(3)
 
+@SharedImmutable
 internal actual val surrogateCharEncoding: ByteArray = byteArrayOf(0xEF.toByte(), 0xBF.toByte(), 0xBD.toByte())
diff --git a/kotlin-native/gradle.properties b/kotlin-native/gradle.properties
index 66f29aaeab2..938c1023fdc 100644
--- a/kotlin-native/gradle.properties
+++ b/kotlin-native/gradle.properties
@@ -18,12 +18,12 @@
 buildKotlinVersion=1.4.20-dev-2167
 buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.4.20-dev-2167,branch:default:any,pinned:true/artifacts/content/maven
 remoteRoot=konan_tests
-kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.0-dev-805,branch:default:any,pinned:true/artifacts/content/maven
-kotlinVersion=1.5.0-dev-805
-kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.0-dev-805,branch:default:any,pinned:true/artifacts/content/maven
-kotlinStdlibVersion=1.5.0-dev-805
-kotlinStdlibTestsVersion=1.5.0-dev-805
-testKotlinCompilerVersion=1.5.0-dev-805
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.0-dev-1023,branch:default:any,pinned:true/artifacts/content/maven
+kotlinVersion=1.5.0-dev-1023
+kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.5.0-dev-1023,branch:default:any,pinned:true/artifacts/content/maven
+kotlinStdlibVersion=1.5.0-dev-1023
+kotlinStdlibTestsVersion=1.5.0-dev-1023
+testKotlinCompilerVersion=1.5.0-dev-1023
 konanVersion=1.5.0
 
 # A version of Xcode required to build the Kotlin/Native compiler.
diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index 3cbd1d847b7..1d7ffe5b032 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -140,8 +140,8 @@ targetList.forEach { targetName ->
 
     createTestTask(
             project,
-            "ExperimentalMM",
-            "${targetName}ExperimentalMMRuntimeTests",
+            "ExperimentalMMMimalloc",
+            "${targetName}ExperimentalMMMimallocRuntimeTests",
             listOf(
                 "${targetName}Runtime",
                 "${targetName}ExperimentalMemoryManager",
@@ -153,10 +153,25 @@ targetList.forEach { targetName ->
         includeRuntime()
     }
 
+    createTestTask(
+            project,
+            "ExperimentalMMStdAlloc",
+            "${targetName}ExperimentalMMStdAllocRuntimeTests",
+            listOf(
+                "${targetName}Runtime",
+                "${targetName}ExperimentalMemoryManager",
+                "${targetName}Release",
+                "${targetName}StdAlloc"
+            )
+    ) {
+        includeRuntime()
+    }
+
     tasks.register("${targetName}RuntimeTests") {
         dependsOn("${targetName}StdAllocRuntimeTests")
         dependsOn("${targetName}MimallocRuntimeTests")
-        dependsOn("${targetName}ExperimentalMMRuntimeTests")
+        dependsOn("${targetName}ExperimentalMMStdAllocRuntimeTests")
+        dependsOn("${targetName}ExperimentalMMMimallocRuntimeTests")
     }
 }
 
@@ -176,8 +191,12 @@ val hostMimallocRuntimeTests by tasks.registering {
     dependsOn("${hostName}MimallocRuntimeTests")
 }
 
-val hostExperimentalMMRuntimeTests by tasks.registering {
-    dependsOn("${hostName}ExperimentalMMRuntimeTests")
+val hostExperimentalMMStdAllocRuntimeTests by tasks.registering {
+    dependsOn("${hostName}ExperimentalMMStdAllocRuntimeTests")
+}
+
+val hostExperimentalMMMimallocRuntimeTests by tasks.registering {
+    dependsOn("${hostName}ExperimentalMMMimallocRuntimeTests")
 }
 
 val assemble by tasks.registering {
diff --git a/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp b/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
index d826cd0218c..5fd2ab38e73 100644
--- a/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
+++ b/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
@@ -1218,7 +1218,7 @@ ALWAYS_INLINE void runDeallocationHooks(ContainerHeader* container) {
     CycleDetector::removeCandidateIfNeeded(obj);
 #endif  // USE_CYCLE_DETECTOR
     if (obj->has_meta_object()) {
-      ObjHeader::destroyMetaObject(&obj->typeInfoOrMeta_);
+      ObjHeader::destroyMetaObject(obj);
     }
     obj = reinterpret_cast<ObjHeader*>(reinterpret_cast<uintptr_t>(obj) + objectSize(obj));
   }
@@ -3102,7 +3102,8 @@ OBJ_GETTER(findCycle, KRef root) {
 
 }  // namespace
 
-MetaObjHeader* ObjHeader::createMetaObject(TypeInfo** location) {
+MetaObjHeader* ObjHeader::createMetaObject(ObjHeader* object) {
+  TypeInfo** location = &object->typeInfoOrMeta_;
   TypeInfo* typeInfo = *location;
   RuntimeCheck(!hasPointerBits(typeInfo, OBJECT_TAG_MASK), "Object must not be tagged");
 
@@ -3128,7 +3129,8 @@ MetaObjHeader* ObjHeader::createMetaObject(TypeInfo** location) {
   return meta;
 }
 
-void ObjHeader::destroyMetaObject(TypeInfo** location) {
+void ObjHeader::destroyMetaObject(ObjHeader* object) {
+  TypeInfo** location = &object->typeInfoOrMeta_;
   MetaObjHeader* meta = clearPointerBits(*(reinterpret_cast<MetaObjHeader**>(location)), OBJECT_TAG_MASK);
   *const_cast<const TypeInfo**>(location) = meta->typeInfo_;
   if (meta->WeakReference.counter_ != nullptr) {
diff --git a/kotlin-native/runtime/src/main/cpp/Alignment.hpp b/kotlin-native/runtime/src/main/cpp/Alignment.hpp
new file mode 100644
index 00000000000..bb97e1b1fcc
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/Alignment.hpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_ALIGNMENT_H
+#define RUNTIME_ALIGNMENT_H
+
+#include <cstddef>
+#include <cstdint>
+
+namespace kotlin {
+
+constexpr size_t kObjectAlignment = 8;
+
+constexpr inline size_t AlignUp(size_t size, size_t alignment) {
+    return (size + alignment - 1) & ~(alignment - 1);
+}
+
+inline void* AlignUp(void* ptr, size_t alignment) {
+    static_assert(sizeof(void*) == sizeof(size_t), "size_t size must be equal to pointer size for this to work");
+    return reinterpret_cast<void*>(AlignUp(reinterpret_cast<size_t>(ptr), alignment));
+}
+
+constexpr inline bool IsValidAlignment(size_t alignment) {
+    return alignment != 0 && (alignment & (alignment - 1)) == 0;
+}
+
+constexpr inline bool IsAligned(size_t size, size_t alignment) {
+    return size % alignment == 0;
+}
+
+inline bool IsAligned(void* ptr, size_t alignment) {
+    return reinterpret_cast<uintptr_t>(ptr) % alignment == 0;
+}
+
+} // namespace kotlin
+
+#endif // RUNTIME_ALIGNMENT_H
diff --git a/kotlin-native/runtime/src/main/cpp/AlignmentTest.cpp b/kotlin-native/runtime/src/main/cpp/AlignmentTest.cpp
new file mode 100644
index 00000000000..cd70996470c
--- /dev/null
+++ b/kotlin-native/runtime/src/main/cpp/AlignmentTest.cpp
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "Alignment.hpp"
+
+#include <cstddef>
+#include <tuple>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "Types.h"
+
+using namespace kotlin;
+
+namespace {
+
+template <typename... Args>
+class NamedTestWithParam : public testing::TestWithParam<std::tuple<const char*, Args...>> {
+public:
+    using Param = std::tuple<const char*, Args...>;
+
+    static std::string Print(const testing::TestParamInfo<Param>& info) { return std::string(std::get<0>(info.param)); }
+
+    template <size_t I>
+    static const typename std::tuple_element<I + 1, Param>::type& Get() {
+        const auto& param = testing::TestWithParam<Param>::GetParam();
+        return std::get<I + 1>(param);
+    }
+};
+
+#define INSTANTIATE_NAMED_TEST(testName, ...) INSTANTIATE_TEST_SUITE_P(, testName, testing::Values(__VA_ARGS__), &testName::Print)
+
+} // namespace
+
+using IsValidAlignmentTest = NamedTestWithParam<size_t, bool>;
+
+TEST_P(IsValidAlignmentTest, Test) {
+    const auto& alignment = Get<0>();
+    const auto& expected = Get<1>();
+    EXPECT_THAT(IsValidAlignment(alignment), expected);
+}
+
+INSTANTIATE_NAMED_TEST(
+        IsValidAlignmentTest,
+        std::make_tuple("0", 0, false),
+        std::make_tuple("1", 1, true),
+        std::make_tuple("2", 2, true),
+        std::make_tuple("3", 3, false),
+        std::make_tuple("4", 4, true),
+        std::make_tuple("5", 5, false),
+        std::make_tuple("6", 6, false),
+        std::make_tuple("7", 7, false),
+        std::make_tuple("8", 8, true),
+        std::make_tuple("9", 9, false),
+        std::make_tuple("10", 10, false),
+        std::make_tuple("11", 11, false),
+        std::make_tuple("12", 12, false),
+        std::make_tuple("13", 13, false),
+        std::make_tuple("14", 14, false),
+        std::make_tuple("15", 15, false),
+        std::make_tuple("16", 16, true),
+        std::make_tuple("int", alignof(int), true),
+        std::make_tuple("ptr", alignof(void*), true),
+        std::make_tuple("max", alignof(std::max_align_t), true));
+
+using IsAlignedSizeTest = NamedTestWithParam<size_t, size_t, bool>;
+
+TEST_P(IsAlignedSizeTest, Test) {
+    const auto& size = Get<0>();
+    const auto& alignment = Get<1>();
+    const auto& expected = Get<2>();
+    EXPECT_THAT(IsAligned(size, alignment), expected);
+}
+
+INSTANTIATE_NAMED_TEST(
+        IsAlignedSizeTest,
+        std::make_tuple("1_1", 1, 1, true),
+        std::make_tuple("2_1", 2, 1, true),
+        std::make_tuple("3_1", 3, 1, true),
+        std::make_tuple("4_1", 4, 1, true),
+        std::make_tuple("1_2", 1, 2, false),
+        std::make_tuple("2_2", 2, 2, true),
+        std::make_tuple("3_2", 3, 2, false),
+        std::make_tuple("4_2", 4, 2, true));
+
+using IsAlignedPointerTest = NamedTestWithParam<uintptr_t, size_t, bool>;
+
+TEST_P(IsAlignedPointerTest, Test) {
+    const auto& ptr = Get<0>();
+    const auto& alignment = Get<1>();
+    const auto& expected = Get<2>();
+    EXPECT_THAT(IsAligned(reinterpret_cast<void*>(ptr), alignment), expected);
+}
+
+INSTANTIATE_NAMED_TEST(
+        IsAlignedPointerTest,
+        std::make_tuple("0_1", 0, 1, true),
+        std::make_tuple("1_1", 1, 1, true),
+        std::make_tuple("2_1", 2, 1, true),
+        std::make_tuple("3_1", 3, 1, true),
+        std::make_tuple("4_1", 4, 1, true),
+        std::make_tuple("0_2", 0, 2, true),
+        std::make_tuple("1_2", 1, 2, false),
+        std::make_tuple("2_2", 2, 2, true),
+        std::make_tuple("3_2", 3, 2, false),
+        std::make_tuple("4_2", 4, 2, true));
+
+using AlignUpSizeTest = NamedTestWithParam<size_t, size_t, size_t>;
+
+TEST_P(AlignUpSizeTest, Test) {
+    const auto& size = Get<0>();
+    const auto& alignment = Get<1>();
+    const auto& expected = Get<2>();
+    EXPECT_THAT(AlignUp(size, alignment), expected);
+}
+
+INSTANTIATE_NAMED_TEST(
+        AlignUpSizeTest,
+        std::make_tuple("1_1", 1, 1, 1),
+        std::make_tuple("2_1", 2, 1, 2),
+        std::make_tuple("3_1", 3, 1, 3),
+        std::make_tuple("4_1", 4, 1, 4),
+        std::make_tuple("1_2", 1, 2, 2),
+        std::make_tuple("2_2", 2, 2, 2),
+        std::make_tuple("3_2", 3, 2, 4),
+        std::make_tuple("4_2", 4, 2, 4));
+
+using AlignUpPointerTest = NamedTestWithParam<uintptr_t, size_t, uintptr_t>;
+
+TEST_P(AlignUpPointerTest, Test) {
+    const auto& ptr = Get<0>();
+    const auto& alignment = Get<1>();
+    const auto& expected = Get<2>();
+    EXPECT_THAT(AlignUp(reinterpret_cast<void*>(ptr), alignment), reinterpret_cast<void*>(expected));
+}
+
+INSTANTIATE_NAMED_TEST(
+        AlignUpPointerTest,
+        std::make_tuple("0_1", 0, 1, 0),
+        std::make_tuple("1_1", 1, 1, 1),
+        std::make_tuple("2_1", 2, 1, 2),
+        std::make_tuple("3_1", 3, 1, 3),
+        std::make_tuple("4_1", 4, 1, 4),
+        std::make_tuple("0_2", 0, 2, 0),
+        std::make_tuple("1_2", 1, 2, 2),
+        std::make_tuple("2_2", 2, 2, 2),
+        std::make_tuple("3_2", 3, 2, 4),
+        std::make_tuple("4_2", 4, 2, 4));
+
+TEST(AlignmentTest, ObjectAlignment) {
+    static_assert(IsValidAlignment(kObjectAlignment), "kObjectAlignment must be a valid alignment");
+    static_assert(kObjectAlignment % alignof(KLong) == 0, "");
+    static_assert(kObjectAlignment % alignof(KDouble) == 0, "");
+}
diff --git a/kotlin-native/runtime/src/main/cpp/Alloc.h b/kotlin-native/runtime/src/main/cpp/Alloc.h
index fca43491c32..8c853edf93f 100644
--- a/kotlin-native/runtime/src/main/cpp/Alloc.h
+++ b/kotlin-native/runtime/src/main/cpp/Alloc.h
@@ -29,6 +29,10 @@ inline void* konanAllocMemory(size_t size) {
   return konan::calloc(1, size);
 }
 
+inline void* konanAllocAlignedMemory(size_t size, size_t alignment) {
+    return konan::calloc_aligned(1, size, alignment);
+}
+
 inline void konanFreeMemory(void* memory) {
   konan::free(memory);
 }
diff --git a/kotlin-native/runtime/src/main/cpp/KAssert.cpp b/kotlin-native/runtime/src/main/cpp/KAssert.cpp
index 224f6cd7336..96df6e11abc 100644
--- a/kotlin-native/runtime/src/main/cpp/KAssert.cpp
+++ b/kotlin-native/runtime/src/main/cpp/KAssert.cpp
@@ -30,3 +30,16 @@ RUNTIME_NORETURN void RuntimeAssertFailed(const char* location, const char* form
     // TODO: Write the stacktrace.
     konan::abort();
 }
+
+// TODO: this function is not used by runtime, but apparently there are
+// third-party libraries that use it (despite the fact it is not a public API).
+// Keeping the function here for now for backward compatibility, to be removed later.
+RUNTIME_NORETURN void RuntimeAssertFailed(const char* location, const char* message) {
+  char buf[1024];
+  if (location != nullptr)
+      konan::snprintf(buf, sizeof(buf), "%s: runtime assert: %s\n", location, message);
+  else
+      konan::snprintf(buf, sizeof(buf), "runtime assert: %s\n", message);
+  konan::consoleErrorUtf8(buf, konan::strnlen(buf, sizeof(buf)));
+  konan::abort();
+}
diff --git a/kotlin-native/runtime/src/main/cpp/Memory.h b/kotlin-native/runtime/src/main/cpp/Memory.h
index 5f0b0e1eb85..647eb8b35b2 100644
--- a/kotlin-native/runtime/src/main/cpp/Memory.h
+++ b/kotlin-native/runtime/src/main/cpp/Memory.h
@@ -38,19 +38,29 @@ struct MetaObjHeader;
 struct ObjHeader {
   TypeInfo* typeInfoOrMeta_;
 
+  // Returns `nullptr` if it's not a meta object.
+  static MetaObjHeader* AsMetaObject(TypeInfo* typeInfo) noexcept {
+      auto* typeInfoOrMeta = clearPointerBits(typeInfo, OBJECT_TAG_MASK);
+      if (typeInfoOrMeta != typeInfoOrMeta->typeInfo_) {
+          return reinterpret_cast<MetaObjHeader*>(typeInfoOrMeta);
+      } else {
+          return nullptr;
+      }
+  }
+
   const TypeInfo* type_info() const {
     return clearPointerBits(typeInfoOrMeta_, OBJECT_TAG_MASK)->typeInfo_;
   }
 
   bool has_meta_object() const {
-    auto* typeInfoOrMeta = clearPointerBits(typeInfoOrMeta_, OBJECT_TAG_MASK);
-    return (typeInfoOrMeta != typeInfoOrMeta->typeInfo_);
+      return AsMetaObject(typeInfoOrMeta_) != nullptr;
   }
 
   MetaObjHeader* meta_object() {
-     return has_meta_object() ?
-        reinterpret_cast<MetaObjHeader*>(clearPointerBits(typeInfoOrMeta_, OBJECT_TAG_MASK)) :
-        createMetaObject(&typeInfoOrMeta_);
+      if (auto* metaObject = AsMetaObject(typeInfoOrMeta_)) {
+          return metaObject;
+      }
+      return createMetaObject(this);
   }
 
   ALWAYS_INLINE ObjHeader** GetWeakCounterLocation();
@@ -75,8 +85,8 @@ struct ObjHeader {
     return hasPointerBits(typeInfoOrMeta_, OBJECT_TAG_PERMANENT_CONTAINER);
   }
 
-  static MetaObjHeader* createMetaObject(TypeInfo** location);
-  static void destroyMetaObject(TypeInfo** location);
+  static MetaObjHeader* createMetaObject(ObjHeader* object);
+  static void destroyMetaObject(ObjHeader* object);
 };
 
 // Header of value type array objects. Keep layout in sync with that of object header.
diff --git a/kotlin-native/runtime/src/main/cpp/TypeInfo.h b/kotlin-native/runtime/src/main/cpp/TypeInfo.h
index 669962de6ce..ef3c302f6fd 100644
--- a/kotlin-native/runtime/src/main/cpp/TypeInfo.h
+++ b/kotlin-native/runtime/src/main/cpp/TypeInfo.h
@@ -157,6 +157,8 @@ struct TypeInfo {
     inline VTableElement* vtable() {
       return reinterpret_cast<VTableElement*>(this + 1);
     }
+
+    inline bool IsArray() const { return instanceSize_ < 0; }
 #endif
 };
 
diff --git a/kotlin-native/runtime/src/mm/cpp/ExtraObjectData.cpp b/kotlin-native/runtime/src/mm/cpp/ExtraObjectData.cpp
new file mode 100644
index 00000000000..4fc9b1a4914
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ExtraObjectData.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "ExtraObjectData.hpp"
+
+#include "PointerBits.h"
+#include "Weak.h"
+
+#ifdef KONAN_OBJC_INTEROP
+#include "ObjCMMAPI.h"
+#endif
+
+using namespace kotlin;
+
+// static
+mm::ExtraObjectData& mm::ExtraObjectData::Install(ObjHeader* object) noexcept {
+    TypeInfo* typeInfo = object->typeInfoOrMeta_;
+    if (auto* metaObject = ObjHeader::AsMetaObject(typeInfo)) {
+        return mm::ExtraObjectData::FromMetaObjHeader(metaObject);
+    }
+
+    RuntimeCheck(!hasPointerBits(typeInfo, OBJECT_TAG_MASK), "Object must not be tagged");
+
+    auto* data = new ExtraObjectData(typeInfo);
+
+    TypeInfo* old = __sync_val_compare_and_swap(&object->typeInfoOrMeta_, typeInfo, reinterpret_cast<TypeInfo*>(data));
+    if (old != typeInfo) {
+        // Somebody else created `mm::ExtraObjectData` for this object
+        delete data;
+        return *reinterpret_cast<mm::ExtraObjectData*>(old);
+    }
+
+    return *data;
+}
+
+// static
+void mm::ExtraObjectData::Uninstall(ObjHeader* object) noexcept {
+    RuntimeAssert(object->has_meta_object(), "Object must have a meta object set");
+
+    auto& data = ExtraObjectData::FromMetaObjHeader(object->meta_object());
+
+    *const_cast<const TypeInfo**>(&object->typeInfoOrMeta_) = data.typeInfo_;
+
+    delete &data;
+}
+
+mm::ExtraObjectData::~ExtraObjectData() {
+    if (weakReferenceCounter_) {
+        WeakReferenceCounterClear(weakReferenceCounter_);
+        ZeroHeapRef(&weakReferenceCounter_);
+    }
+
+#ifdef KONAN_OBJC_INTEROP
+    Kotlin_ObjCExport_releaseAssociatedObject(associatedObject_);
+#endif
+}
diff --git a/kotlin-native/runtime/src/mm/cpp/ExtraObjectData.hpp b/kotlin-native/runtime/src/mm/cpp/ExtraObjectData.hpp
new file mode 100644
index 00000000000..f88524af2ee
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ExtraObjectData.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_MM_EXTRA_OBJECT_DATA_H
+#define RUNTIME_MM_EXTRA_OBJECT_DATA_H
+
+#include <cstddef>
+#include <cstdint>
+
+#include "Memory.h"
+#include "TypeInfo.h"
+#include "Utils.hpp"
+
+namespace kotlin {
+namespace mm {
+
+// Optional data that's lazily allocated only for objects that need it.
+class ExtraObjectData : private Pinned {
+public:
+    MetaObjHeader* AsMetaObjHeader() noexcept { return reinterpret_cast<MetaObjHeader*>(this); }
+    static ExtraObjectData& FromMetaObjHeader(MetaObjHeader* header) noexcept { return *reinterpret_cast<ExtraObjectData*>(header); }
+
+    static ExtraObjectData& Install(ObjHeader* object) noexcept;
+    static void Uninstall(ObjHeader* object) noexcept;
+
+#ifdef KONAN_OBJC_INTEROP
+    void** GetAssociatedObjectLocation() noexcept { return &associatedObject_; }
+#endif
+
+    ObjHeader** GetWeakCounterLocation() noexcept { return &weakReferenceCounter_; }
+
+private:
+    explicit ExtraObjectData(const TypeInfo* typeInfo) noexcept : typeInfo_(typeInfo) {}
+    ~ExtraObjectData();
+
+    // Must be first to match `TypeInfo` layout.
+    const TypeInfo* typeInfo_;
+
+#ifdef KONAN_OBJC_INTEROP
+    void* associatedObject_ = nullptr;
+#endif
+
+    // TODO: Need to respect when marking.
+    ObjHeader* weakReferenceCounter_ = nullptr;
+};
+
+} // namespace mm
+} // namespace kotlin
+
+#endif // RUNTIME_MM_EXTRA_OBJECT_DATA_H
diff --git a/kotlin-native/runtime/src/mm/cpp/ExtraObjectDataTest.cpp b/kotlin-native/runtime/src/mm/cpp/ExtraObjectDataTest.cpp
new file mode 100644
index 00000000000..594c47e0305
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ExtraObjectDataTest.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "ExtraObjectData.hpp"
+
+#include <atomic>
+#include <thread>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "TestSupport.hpp"
+
+using namespace kotlin;
+
+TEST(ExtraObjectDataTest, Install) {
+    TypeInfo typeInfo;
+    typeInfo.typeInfo_ = &typeInfo;
+    ObjHeader object;
+    object.typeInfoOrMeta_ = &typeInfo;
+
+    ASSERT_FALSE(object.has_meta_object());
+
+    auto& extraData = mm::ExtraObjectData::Install(&object);
+
+    EXPECT_TRUE(object.has_meta_object());
+    EXPECT_THAT(object.meta_object(), extraData.AsMetaObjHeader());
+    EXPECT_THAT(object.type_info(), &typeInfo);
+
+    mm::ExtraObjectData::Uninstall(&object);
+
+    EXPECT_FALSE(object.has_meta_object());
+    EXPECT_THAT(object.type_info(), &typeInfo);
+}
+
+TEST(ExtraObjectDataTest, ConcurrentInstall) {
+    TypeInfo typeInfo;
+    typeInfo.typeInfo_ = &typeInfo;
+    ObjHeader object;
+    object.typeInfoOrMeta_ = &typeInfo;
+
+    constexpr int kThreadCount = kDefaultThreadCount;
+
+    std::atomic<bool> canStart(false);
+    std::atomic<int> readyCount(0);
+    std::vector<std::thread> threads;
+    std::vector<mm::ExtraObjectData*> actual(kThreadCount, nullptr);
+
+    for (int i = 0; i < kThreadCount; ++i) {
+        threads.emplace_back([i, &actual, &object, &canStart, &readyCount]() {
+            ++readyCount;
+            while (!canStart) {
+            }
+            auto& extraData = mm::ExtraObjectData::Install(&object);
+            actual[i] = &extraData;
+        });
+    }
+
+    while (readyCount < kThreadCount) {
+    }
+    canStart = true;
+
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    std::vector<mm::ExtraObjectData*> expected(kThreadCount, actual[0]);
+
+    EXPECT_THAT(actual, testing::ElementsAreArray(expected));
+
+    mm::ExtraObjectData::Uninstall(&object);
+}
diff --git a/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp b/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp
index e0b0e0a80e2..cc06903da16 100644
--- a/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp
+++ b/kotlin-native/runtime/src/mm/cpp/GlobalData.hpp
@@ -6,6 +6,7 @@
 #ifndef RUNTIME_MM_GLOBAL_DATA_H
 #define RUNTIME_MM_GLOBAL_DATA_H
 
+#include "ObjectFactory.hpp"
 #include "GlobalsRegistry.hpp"
 #include "StableRefRegistry.hpp"
 #include "ThreadRegistry.hpp"
@@ -19,9 +20,10 @@ class GlobalData : private Pinned {
 public:
     static GlobalData& Instance() noexcept { return instance_; }
 
-    ThreadRegistry& threadRegistry() { return threadRegistry_; }
-    GlobalsRegistry& globalsRegistry() { return globalsRegistry_; }
-    StableRefRegistry& stableRefRegistry() { return stableRefRegistry_; }
+    ThreadRegistry& threadRegistry() noexcept { return threadRegistry_; }
+    GlobalsRegistry& globalsRegistry() noexcept { return globalsRegistry_; }
+    StableRefRegistry& stableRefRegistry() noexcept { return stableRefRegistry_; }
+    ObjectFactory& objectFactory() noexcept { return objectFactory_; }
 
 private:
     GlobalData();
@@ -32,6 +34,7 @@ private:
     ThreadRegistry threadRegistry_;
     GlobalsRegistry globalsRegistry_;
     StableRefRegistry stableRefRegistry_;
+    ObjectFactory objectFactory_;
 };
 
 } // namespace mm
diff --git a/kotlin-native/runtime/src/mm/cpp/Memory.cpp b/kotlin-native/runtime/src/mm/cpp/Memory.cpp
index 184736dc66d..84a47c0512f 100644
--- a/kotlin-native/runtime/src/mm/cpp/Memory.cpp
+++ b/kotlin-native/runtime/src/mm/cpp/Memory.cpp
@@ -5,6 +5,8 @@
 
 #include "Memory.h"
 
+#include "Exceptions.h"
+#include "ExtraObjectData.hpp"
 #include "GlobalsRegistry.hpp"
 #include "KAssert.h"
 #include "Porting.h"
@@ -57,6 +59,39 @@ ALWAYS_INLINE mm::ThreadData* GetThreadData(MemoryState* state) {
 
 } // namespace
 
+ObjHeader** ObjHeader::GetWeakCounterLocation() {
+    return mm::ExtraObjectData::FromMetaObjHeader(this->meta_object()).GetWeakCounterLocation();
+}
+
+#ifdef KONAN_OBJC_INTEROP
+
+void* ObjHeader::GetAssociatedObject() {
+    if (!has_meta_object()) {
+        return nullptr;
+    }
+    return *GetAssociatedObjectLocation();
+}
+
+void** ObjHeader::GetAssociatedObjectLocation() {
+    return mm::ExtraObjectData::FromMetaObjHeader(this->meta_object()).GetAssociatedObjectLocation();
+}
+
+void ObjHeader::SetAssociatedObject(void* obj) {
+    *GetAssociatedObjectLocation() = obj;
+}
+
+#endif // KONAN_OBJC_INTEROP
+
+// static
+MetaObjHeader* ObjHeader::createMetaObject(ObjHeader* object) {
+    return mm::ExtraObjectData::Install(object).AsMetaObjHeader();
+}
+
+// static
+void ObjHeader::destroyMetaObject(ObjHeader* object) {
+    mm::ExtraObjectData::Uninstall(object);
+}
+
 ALWAYS_INLINE bool isShareable(const ObjHeader* obj) {
     // TODO: Remove when legacy MM is gone.
     return true;
@@ -74,6 +109,22 @@ extern "C" void RestoreMemory(MemoryState*) {
     // TODO: Remove when legacy MM is gone.
 }
 
+extern "C" RUNTIME_NOTHROW OBJ_GETTER(AllocInstance, const TypeInfo* typeInfo) {
+    auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData();
+    auto* object = threadData->objectFactoryThreadQueue().CreateObject(typeInfo);
+    RETURN_OBJ(object);
+}
+
+extern "C" OBJ_GETTER(AllocArrayInstance, const TypeInfo* typeInfo, int32_t elements) {
+    if (elements < 0) {
+        ThrowIllegalArgumentException();
+    }
+    auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData();
+    auto* array = threadData->objectFactoryThreadQueue().CreateArray(typeInfo, static_cast<uint32_t>(elements));
+    // `ArrayHeader` and `ObjHeader` are expected to be compatible.
+    RETURN_OBJ(reinterpret_cast<ObjHeader*>(array));
+}
+
 extern "C" OBJ_GETTER(InitSingleton, ObjHeader** location, const TypeInfo* typeInfo, void (*ctor)(ObjHeader*)) {
     auto* threadData = mm::ThreadRegistry::Instance().CurrentThreadData();
     // TODO: This should only be called if singleton is actually created here. It's possible that the
diff --git a/kotlin-native/runtime/src/mm/cpp/ObjectFactory.cpp b/kotlin-native/runtime/src/mm/cpp/ObjectFactory.cpp
new file mode 100644
index 00000000000..33b6bb9b497
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ObjectFactory.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "ObjectFactory.hpp"
+
+#include "Alignment.hpp"
+#include "Alloc.h"
+#include "GlobalData.hpp"
+#include "Types.h"
+
+using namespace kotlin;
+
+ObjHeader* mm::ObjectFactory::ThreadQueue::CreateObject(const TypeInfo* typeInfo) noexcept {
+    RuntimeAssert(!typeInfo->IsArray(), "Must not be an array");
+    size_t allocSize = typeInfo->instanceSize_;
+    auto& node = producer_.Insert(allocSize);
+    auto* object = static_cast<ObjHeader*>(node.Data());
+    object->typeInfoOrMeta_ = const_cast<TypeInfo*>(typeInfo);
+    return object;
+}
+
+ArrayHeader* mm::ObjectFactory::ThreadQueue::CreateArray(const TypeInfo* typeInfo, uint32_t count) noexcept {
+    RuntimeAssert(typeInfo->IsArray(), "Must be an array");
+    uint32_t arraySize = static_cast<uint32_t>(-typeInfo->instanceSize_) * count;
+    // Note: array body is aligned, but for size computation it is enough to align the sum.
+    size_t allocSize = AlignUp(sizeof(ArrayHeader) + arraySize, kObjectAlignment);
+    auto& node = producer_.Insert(allocSize);
+    auto* array = static_cast<ArrayHeader*>(node.Data());
+    array->typeInfoOrMeta_ = const_cast<TypeInfo*>(typeInfo);
+    array->count_ = count;
+    return array;
+}
+
+bool mm::ObjectFactory::Iterator::IsArray() noexcept {
+    // `ArrayHeader` and `ObjHeader` are kept compatible, so the former can
+    // be always casted to the other.
+    auto* object = static_cast<ObjHeader*>((*iterator_).Data());
+    return object->type_info()->IsArray();
+}
+
+ObjHeader* mm::ObjectFactory::Iterator::GetObjHeader() noexcept {
+    auto* object = static_cast<ObjHeader*>((*iterator_).Data());
+    RuntimeAssert(!object->type_info()->IsArray(), "Must not be an array");
+    return object;
+}
+
+ArrayHeader* mm::ObjectFactory::Iterator::GetArrayHeader() noexcept {
+    auto* array = static_cast<ArrayHeader*>((*iterator_).Data());
+    RuntimeAssert(array->type_info()->IsArray(), "Must be an array");
+    return array;
+}
+
+mm::ObjectFactory::ObjectFactory() noexcept = default;
+mm::ObjectFactory::~ObjectFactory() = default;
+
+// static
+mm::ObjectFactory& mm::ObjectFactory::Instance() noexcept {
+    return GlobalData::Instance().objectFactory();
+}
diff --git a/kotlin-native/runtime/src/mm/cpp/ObjectFactory.hpp b/kotlin-native/runtime/src/mm/cpp/ObjectFactory.hpp
new file mode 100644
index 00000000000..cb5968e9831
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ObjectFactory.hpp
@@ -0,0 +1,316 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#ifndef RUNTIME_MM_OBJECT_FACTORY_H
+#define RUNTIME_MM_OBJECT_FACTORY_H
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+
+#include "Alignment.hpp"
+#include "Alloc.h"
+#include "CppSupport.hpp"
+#include "Memory.h"
+#include "Mutex.hpp"
+#include "Utils.hpp"
+
+namespace kotlin {
+namespace mm {
+
+namespace internal {
+
+// A queue that is constructed by collecting subqueues from several `Producer`s.
+// This is essentially a heterogeneous `MultiSourceQueue` on top of a singly linked list that
+// uses `konanAllocMemory` and `konanFreeMemory`
+// TODO: Consider merging with `MultiSourceQueue` somehow.
+template <size_t DataAlignment>
+class ObjectFactoryStorage : private Pinned {
+    static_assert(IsValidAlignment(DataAlignment), "DataAlignment is not a valid alignment");
+
+public:
+    // This class does not know its size at compile-time.
+    class Node : private Pinned {
+        constexpr static size_t DataOffset() noexcept { return AlignUp(sizeof(Node), DataAlignment); }
+
+    public:
+        ~Node() = default;
+
+        static void operator delete(void* ptr) noexcept { konanFreeMemory(ptr); }
+
+        // Note: This can only be trivially destructible data, as nobody can invoke its destructor.
+        void* Data() noexcept {
+            constexpr size_t kDataOffset = DataOffset();
+            void* ptr = reinterpret_cast<uint8_t*>(this) + kDataOffset;
+            RuntimeAssert(IsAligned(ptr, DataAlignment), "Data=%p is not aligned to %zu", ptr, DataAlignment);
+            return ptr;
+        }
+
+        // It's a caller responsibility to know if the underlying data is `T`.
+        template <typename T>
+        T& Data() noexcept {
+            return *static_cast<T*>(Data());
+        }
+
+    private:
+        friend class ObjectFactoryStorage;
+
+        Node() noexcept = default;
+
+        static void* operator new(size_t size, size_t dataSize) noexcept {
+            size_t dataSizeAligned = AlignUp(dataSize, DataAlignment);
+            size_t totalAlignment = std::max(alignof(Node), DataAlignment);
+            size_t totalSize = AlignUp(sizeof(Node) + dataSizeAligned, totalAlignment);
+            RuntimeAssert(
+                    DataOffset() + dataSize <= totalSize, "totalSize %zu is not enough to fit data %zu at offset %zu", totalSize, dataSize,
+                    DataOffset());
+            void* ptr = konanAllocAlignedMemory(totalSize, totalAlignment);
+            if (!ptr) {
+                // TODO: Try doing GC first.
+                konan::consoleErrorf("Out of memory trying to allocate %zu. Aborting.\n", totalSize);
+                konan::abort();
+            }
+            RuntimeAssert(IsAligned(ptr, totalAlignment), "Allocator returned unaligned to %zu pointer %p", totalAlignment, ptr);
+            return ptr;
+        }
+
+        std::unique_ptr<Node> next_;
+        // There's some more data of an unknown (at compile-time) size here, but it cannot be represented
+        // with C++ members.
+    };
+
+    class Producer : private MoveOnly {
+    public:
+        explicit Producer(ObjectFactoryStorage& owner) noexcept : owner_(owner) {}
+
+        ~Producer() { Publish(); }
+
+        Node& Insert(size_t dataSize) noexcept {
+            AssertCorrect();
+            auto* nodePtr = new (dataSize) Node();
+            std::unique_ptr<Node> node(nodePtr);
+            if (!root_) {
+                RuntimeAssert(last_ == nullptr, "Unsynchronized root_ and last_");
+                root_ = std::move(node);
+            } else {
+                RuntimeAssert(last_ != nullptr, "Unsynchronized root_ and last_");
+                last_->next_ = std::move(node);
+            }
+
+            last_ = nodePtr;
+            RuntimeAssert(root_ != nullptr, "Must not be empty");
+            AssertCorrect();
+            return *nodePtr;
+        }
+
+        template <typename T, typename... Args>
+        Node& Insert(Args&&... args) noexcept {
+            static_assert(alignof(T) <= DataAlignment, "Cannot insert type with alignment bigger than DataAlignment");
+            static_assert(std_support::is_trivially_destructible_v<T>, "Type must be trivially destructible");
+            auto& node = Insert(sizeof(T));
+            new (node.Data()) T(std::forward<Args>(args)...);
+            return node;
+        }
+
+        // Merge `this` queue with owning `ObjectFactoryStorage`.
+        // `this` will have empty queue after the call.
+        // This call is performed without heap allocations. TODO: Test that no allocations are happening.
+        void Publish() noexcept {
+            AssertCorrect();
+            if (!root_) {
+                return;
+            }
+
+            std::lock_guard<SpinLock> guard(owner_.mutex_);
+
+            owner_.AssertCorrectUnsafe();
+
+            if (!owner_.root_) {
+                owner_.root_ = std::move(root_);
+            } else {
+                owner_.last_->next_ = std::move(root_);
+            }
+
+            owner_.last_ = last_;
+            last_ = nullptr;
+
+            RuntimeAssert(root_ == nullptr, "Must be empty");
+            AssertCorrect();
+            RuntimeAssert(owner_.root_ != nullptr, "Must not be empty");
+            owner_.AssertCorrectUnsafe();
+        }
+
+    private:
+        friend class ObjectFactoryStorage;
+
+        ALWAYS_INLINE void AssertCorrect() const noexcept {
+            if (root_ == nullptr) {
+                RuntimeAssert(last_ == nullptr, "last_ must be null");
+            } else {
+                RuntimeAssert(last_ != nullptr, "last_ must not be null");
+                RuntimeAssert(last_->next_ == nullptr, "last_ must not have next");
+            }
+        }
+
+        ObjectFactoryStorage& owner_; // weak
+        std::unique_ptr<Node> root_;
+        Node* last_ = nullptr;
+    };
+
+    class Iterator {
+    public:
+        Node& operator*() noexcept { return *node_; }
+        Node* operator->() noexcept { return node_; }
+
+        Iterator& operator++() noexcept {
+            previousNode_ = node_;
+            node_ = node_->next_.get();
+            return *this;
+        }
+
+        bool operator==(const Iterator& rhs) const noexcept { return node_ == rhs.node_; }
+
+        bool operator!=(const Iterator& rhs) const noexcept { return node_ != rhs.node_; }
+
+    private:
+        friend class ObjectFactoryStorage;
+
+        Iterator(Node* previousNode, Node* node) noexcept : previousNode_(previousNode), node_(node) {}
+
+        Node* previousNode_; // Kept for `Iterable::EraseAndAdvance`.
+        Node* node_;
+    };
+
+    class Iterable : private MoveOnly {
+    public:
+        explicit Iterable(ObjectFactoryStorage& owner) noexcept : owner_(owner), guard_(owner_.mutex_) {}
+
+        Iterator begin() noexcept { return Iterator(nullptr, owner_.root_.get()); }
+        Iterator end() noexcept { return Iterator(owner_.last_, nullptr); }
+
+        void EraseAndAdvance(Iterator& iterator) noexcept { iterator.node_ = owner_.EraseUnsafe(iterator.previousNode_); }
+
+    private:
+        ObjectFactoryStorage& owner_; // weak
+        std::unique_lock<SpinLock> guard_;
+    };
+
+    // Lock `ObjectFactoryStorage` for safe iteration.
+    Iterable Iter() noexcept { return Iterable(*this); }
+
+private:
+    // Expects `mutex_` to be held by the current thread.
+    Node* EraseUnsafe(Node* previousNode) noexcept {
+        RuntimeAssert(root_ != nullptr, "Must not be empty");
+        AssertCorrectUnsafe();
+
+        if (previousNode == nullptr) {
+            // Deleting the root.
+            root_ = std::move(root_->next_);
+            if (!root_) {
+                last_ = nullptr;
+            }
+            AssertCorrectUnsafe();
+            return root_.get();
+        }
+
+        auto node = std::move(previousNode->next_);
+        previousNode->next_ = std::move(node->next_);
+        if (!previousNode->next_) {
+            last_ = previousNode;
+        }
+
+        AssertCorrectUnsafe();
+        return previousNode->next_.get();
+    }
+
+    // Expects `mutex_` to be held by the current thread.
+    ALWAYS_INLINE void AssertCorrectUnsafe() const noexcept {
+        if (root_ == nullptr) {
+            RuntimeAssert(last_ == nullptr, "last_ must be null");
+        } else {
+            RuntimeAssert(last_ != nullptr, "last_ must not be null");
+            RuntimeAssert(last_->next_ == nullptr, "last_ must not have next");
+        }
+    }
+
+    std::unique_ptr<Node> root_;
+    Node* last_ = nullptr;
+    SpinLock mutex_;
+};
+
+} // namespace internal
+
+class ObjectFactory : private Pinned {
+public:
+    using Storage = internal::ObjectFactoryStorage<kObjectAlignment>;
+
+    class ThreadQueue : private MoveOnly {
+    public:
+        explicit ThreadQueue(ObjectFactory& owner) noexcept : producer_(owner.storage_) {}
+
+        ObjHeader* CreateObject(const TypeInfo* typeInfo) noexcept;
+        ArrayHeader* CreateArray(const TypeInfo* typeInfo, uint32_t count) noexcept;
+
+        void Publish() noexcept { producer_.Publish(); }
+
+    private:
+        Storage::Producer producer_;
+    };
+
+    class Iterator {
+    public:
+        Storage::Node& operator*() noexcept { return *iterator_; }
+
+        Iterator& operator++() noexcept {
+            ++iterator_;
+            return *this;
+        }
+
+        bool operator==(const Iterator& rhs) const noexcept { return iterator_ == rhs.iterator_; }
+
+        bool operator!=(const Iterator& rhs) const noexcept { return iterator_ != rhs.iterator_; }
+
+        bool IsArray() noexcept;
+
+        ObjHeader* GetObjHeader() noexcept;
+        ArrayHeader* GetArrayHeader() noexcept;
+
+    private:
+        friend class ObjectFactory;
+
+        explicit Iterator(Storage::Iterator iterator) noexcept : iterator_(std::move(iterator)) {}
+
+        Storage::Iterator iterator_;
+    };
+
+    class Iterable {
+    public:
+        Iterable(ObjectFactory& owner) noexcept : iter_(owner.storage_.Iter()) {}
+
+        Iterator begin() noexcept { return Iterator(iter_.begin()); }
+        Iterator end() noexcept { return Iterator(iter_.end()); }
+
+        void EraseAndAdvance(Iterator& iterator) noexcept { iter_.EraseAndAdvance(iterator.iterator_); }
+
+    private:
+        Storage::Iterable iter_;
+    };
+
+    ObjectFactory() noexcept;
+    ~ObjectFactory();
+
+    static ObjectFactory& Instance() noexcept;
+
+    Iterable Iter() noexcept { return Iterable(*this); }
+
+private:
+    Storage storage_;
+};
+
+} // namespace mm
+} // namespace kotlin
+
+#endif // RUNTIME_MM_OBJECT_FACTORY_H
diff --git a/kotlin-native/runtime/src/mm/cpp/ObjectFactoryTest.cpp b/kotlin-native/runtime/src/mm/cpp/ObjectFactoryTest.cpp
new file mode 100644
index 00000000000..f3c4a6a0e54
--- /dev/null
+++ b/kotlin-native/runtime/src/mm/cpp/ObjectFactoryTest.cpp
@@ -0,0 +1,573 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the LICENSE file.
+ */
+
+#include "ObjectFactory.hpp"
+
+#include <atomic>
+#include <thread>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "CppSupport.hpp"
+#include "TestSupport.hpp"
+
+using namespace kotlin;
+
+template <size_t DataAlignment>
+using ObjectFactoryStorage = mm::internal::ObjectFactoryStorage<DataAlignment>;
+
+using ObjectFactoryStorageRegular = ObjectFactoryStorage<alignof(void*)>;
+
+namespace {
+
+template <size_t DataAlignment>
+std::vector<void*> Collect(ObjectFactoryStorage<DataAlignment>& storage) {
+    std::vector<void*> result;
+    for (auto& node : storage.Iter()) {
+        result.push_back(node.Data());
+    }
+    return result;
+}
+
+template <typename T, size_t DataAlignment>
+std::vector<T> Collect(ObjectFactoryStorage<DataAlignment>& storage) {
+    std::vector<T> result;
+    for (auto& node : storage.Iter()) {
+        result.push_back(*static_cast<T*>(node.Data()));
+    }
+    return result;
+}
+
+struct MoveOnlyImpl : private MoveOnly {
+    MoveOnlyImpl(int value1, int value2) : value1(value1), value2(value2) {}
+
+    int value1;
+    int value2;
+};
+
+struct PinnedImpl : private Pinned {
+    PinnedImpl(int value1, int value2, int value3) : value1(value1), value2(value2), value3(value3) {}
+
+    int value1;
+    int value2;
+    int value3;
+};
+
+struct MaxAlignedData {
+    explicit MaxAlignedData(int value) : value(value) {}
+
+    std::max_align_t padding;
+    int value;
+};
+
+} // namespace
+
+TEST(ObjectFactoryStorageTest, Empty) {
+    ObjectFactoryStorageRegular storage;
+
+    auto actual = Collect(storage);
+
+    EXPECT_THAT(actual, testing::IsEmpty());
+}
+
+TEST(ObjectFactoryStorageTest, DoNotPublish) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    producer.Insert<int>(1);
+    producer.Insert<int>(2);
+
+    auto actual = Collect(storage);
+
+    EXPECT_THAT(actual, testing::IsEmpty());
+}
+
+TEST(ObjectFactoryStorageTest, Publish) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer1(storage);
+    ObjectFactoryStorageRegular::Producer producer2(storage);
+
+    producer1.Insert<int>(1);
+    producer1.Insert<int>(2);
+    producer2.Insert<int>(10);
+    producer2.Insert<int>(20);
+
+    producer1.Publish();
+    producer2.Publish();
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::ElementsAre(1, 2, 10, 20));
+}
+
+TEST(ObjectFactoryStorageTest, PublishDifferentTypes) {
+    ObjectFactoryStorage<alignof(MaxAlignedData)> storage;
+    ObjectFactoryStorage<alignof(MaxAlignedData)>::Producer producer(storage);
+
+    producer.Insert<int>(1);
+    producer.Insert<size_t>(2);
+    producer.Insert<MoveOnlyImpl>(3, 4);
+    producer.Insert<PinnedImpl>(5, 6, 7);
+    producer.Insert<MaxAlignedData>(8);
+
+    producer.Publish();
+
+    auto actual = storage.Iter();
+    auto it = actual.begin();
+    EXPECT_THAT(it->Data<int>(), 1);
+    ++it;
+    EXPECT_THAT(it->Data<size_t>(), 2);
+    ++it;
+    auto& moveOnly = it->Data<MoveOnlyImpl>();
+    EXPECT_THAT(moveOnly.value1, 3);
+    EXPECT_THAT(moveOnly.value2, 4);
+    ++it;
+    auto& pinned = it->Data<PinnedImpl>();
+    EXPECT_THAT(pinned.value1, 5);
+    EXPECT_THAT(pinned.value2, 6);
+    EXPECT_THAT(pinned.value3, 7);
+    ++it;
+    auto& maxAlign = it->Data<MaxAlignedData>();
+    EXPECT_THAT(maxAlign.value, 8);
+    ++it;
+    EXPECT_THAT(it, actual.end());
+}
+
+TEST(ObjectFactoryStorageTest, PublishSeveralTimes) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    // Add 2 elements and publish.
+    producer.Insert<int>(1);
+    producer.Insert<int>(2);
+    producer.Publish();
+
+    // Add another element and publish.
+    producer.Insert<int>(3);
+    producer.Publish();
+
+    // Publish without adding elements.
+    producer.Publish();
+
+    // Add yet another two elements and publish.
+    producer.Insert<int>(4);
+    producer.Insert<int>(5);
+    producer.Publish();
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::ElementsAre(1, 2, 3, 4, 5));
+}
+
+TEST(ObjectFactoryStorageTest, PublishInDestructor) {
+    ObjectFactoryStorageRegular storage;
+
+    {
+        ObjectFactoryStorageRegular::Producer producer(storage);
+        producer.Insert<int>(1);
+        producer.Insert<int>(2);
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::ElementsAre(1, 2));
+}
+
+TEST(ObjectFactoryStorageTest, EraseFirst) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    producer.Insert<int>(1);
+    producer.Insert<int>(2);
+    producer.Insert<int>(3);
+
+    producer.Publish();
+
+    {
+        auto iter = storage.Iter();
+        for (auto it = iter.begin(); it != iter.end();) {
+            if (it->Data<int>() == 1) {
+                iter.EraseAndAdvance(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::ElementsAre(2, 3));
+}
+
+TEST(ObjectFactoryStorageTest, EraseMiddle) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    producer.Insert<int>(1);
+    producer.Insert<int>(2);
+    producer.Insert<int>(3);
+
+    producer.Publish();
+
+    {
+        auto iter = storage.Iter();
+        for (auto it = iter.begin(); it != iter.end();) {
+            if (it->Data<int>() == 2) {
+                iter.EraseAndAdvance(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::ElementsAre(1, 3));
+}
+
+TEST(ObjectFactoryStorageTest, EraseLast) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    producer.Insert<int>(1);
+    producer.Insert<int>(2);
+    producer.Insert<int>(3);
+
+    producer.Publish();
+
+    {
+        auto iter = storage.Iter();
+        for (auto it = iter.begin(); it != iter.end();) {
+            if (it->Data<int>() == 3) {
+                iter.EraseAndAdvance(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::ElementsAre(1, 2));
+}
+
+TEST(ObjectFactoryStorageTest, EraseAll) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    producer.Insert<int>(1);
+    producer.Insert<int>(2);
+    producer.Insert<int>(3);
+
+    producer.Publish();
+
+    {
+        auto iter = storage.Iter();
+        for (auto it = iter.begin(); it != iter.end();) {
+            iter.EraseAndAdvance(it);
+        }
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::IsEmpty());
+}
+
+TEST(ObjectFactoryStorageTest, EraseTheOnlyElement) {
+    ObjectFactoryStorageRegular storage;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+
+    producer.Insert<int>(1);
+
+    producer.Publish();
+
+    {
+        auto iter = storage.Iter();
+        auto it = iter.begin();
+        iter.EraseAndAdvance(it);
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::IsEmpty());
+}
+
+TEST(ObjectFactoryStorageTest, ConcurrentPublish) {
+    ObjectFactoryStorageRegular storage;
+    constexpr int kThreadCount = kDefaultThreadCount;
+    std::atomic<bool> canStart(false);
+    std::atomic<int> readyCount(0);
+    std::vector<std::thread> threads;
+    std::vector<int> expected;
+
+    for (int i = 0; i < kThreadCount; ++i) {
+        expected.push_back(i);
+        threads.emplace_back([i, &storage, &canStart, &readyCount]() {
+            ObjectFactoryStorageRegular::Producer producer(storage);
+            producer.Insert<int>(i);
+            ++readyCount;
+            while (!canStart) {
+            }
+            producer.Publish();
+        });
+    }
+
+    while (readyCount < kThreadCount) {
+    }
+    canStart = true;
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::UnorderedElementsAreArray(expected));
+}
+
+TEST(ObjectFactoryStorageTest, IterWhileConcurrentPublish) {
+    ObjectFactoryStorageRegular storage;
+    constexpr int kStartCount = 50;
+    constexpr int kThreadCount = kDefaultThreadCount;
+
+    std::vector<int> expectedBefore;
+    std::vector<int> expectedAfter;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+    for (int i = 0; i < kStartCount; ++i) {
+        expectedBefore.push_back(i);
+        expectedAfter.push_back(i);
+        producer.Insert<int>(i);
+    }
+    producer.Publish();
+
+    std::atomic<bool> canStart(false);
+    std::atomic<int> readyCount(0);
+    std::atomic<int> startedCount(0);
+    std::vector<std::thread> threads;
+    for (int i = 0; i < kThreadCount; ++i) {
+        int j = i + kStartCount;
+        expectedAfter.push_back(j);
+        threads.emplace_back([j, &storage, &canStart, &startedCount, &readyCount]() {
+            ObjectFactoryStorageRegular::Producer producer(storage);
+            producer.Insert<int>(j);
+            ++readyCount;
+            while (!canStart) {
+            }
+            ++startedCount;
+            producer.Publish();
+        });
+    }
+
+    std::vector<int> actualBefore;
+    {
+        auto iter = storage.Iter();
+        while (readyCount < kThreadCount) {
+        }
+        canStart = true;
+        while (startedCount < kThreadCount) {
+        }
+
+        for (auto& node : iter) {
+            int element = *static_cast<int*>(node.Data());
+            actualBefore.push_back(element);
+        }
+    }
+
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    EXPECT_THAT(actualBefore, testing::ElementsAreArray(expectedBefore));
+
+    auto actualAfter = Collect<int>(storage);
+
+    EXPECT_THAT(actualAfter, testing::UnorderedElementsAreArray(expectedAfter));
+}
+
+TEST(ObjectFactoryStorageTest, EraseWhileConcurrentPublish) {
+    ObjectFactoryStorageRegular storage;
+    constexpr int kStartCount = 50;
+    constexpr int kThreadCount = kDefaultThreadCount;
+
+    std::vector<int> expectedAfter;
+    ObjectFactoryStorageRegular::Producer producer(storage);
+    for (int i = 0; i < kStartCount; ++i) {
+        if (i % 2 == 0) {
+            expectedAfter.push_back(i);
+        }
+        producer.Insert<int>(i);
+    }
+    producer.Publish();
+
+    std::atomic<bool> canStart(false);
+    std::atomic<int> readyCount(0);
+    std::atomic<int> startedCount(0);
+    std::vector<std::thread> threads;
+    for (int i = 0; i < kThreadCount; ++i) {
+        int j = i + kStartCount;
+        expectedAfter.push_back(j);
+        threads.emplace_back([j, &storage, &canStart, &startedCount, &readyCount]() {
+            ObjectFactoryStorageRegular::Producer producer(storage);
+            producer.Insert<int>(j);
+            ++readyCount;
+            while (!canStart) {
+            }
+            ++startedCount;
+            producer.Publish();
+        });
+    }
+
+    {
+        auto iter = storage.Iter();
+        while (readyCount < kThreadCount) {
+        }
+        canStart = true;
+        while (startedCount < kThreadCount) {
+        }
+
+        for (auto it = iter.begin(); it != iter.end();) {
+            if (it->Data<int>() % 2 != 0) {
+                iter.EraseAndAdvance(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    auto actual = Collect<int>(storage);
+
+    EXPECT_THAT(actual, testing::UnorderedElementsAreArray(expectedAfter));
+}
+
+using mm::ObjectFactory;
+
+namespace {
+
+std::unique_ptr<TypeInfo> MakeObjectTypeInfo(int32_t size) {
+    auto typeInfo = std_support::make_unique<TypeInfo>();
+    typeInfo->typeInfo_ = typeInfo.get();
+    typeInfo->instanceSize_ = size;
+    return typeInfo;
+}
+
+std::unique_ptr<TypeInfo> MakeArrayTypeInfo(int32_t elementSize) {
+    auto typeInfo = std_support::make_unique<TypeInfo>();
+    typeInfo->typeInfo_ = typeInfo.get();
+    typeInfo->instanceSize_ = -elementSize;
+    return typeInfo;
+}
+
+} // namespace
+
+TEST(ObjectFactoryTest, CreateObject) {
+    auto typeInfo = MakeObjectTypeInfo(24);
+    ObjectFactory objectFactory;
+    ObjectFactory::ThreadQueue threadQueue(objectFactory);
+
+    auto* object = threadQueue.CreateObject(typeInfo.get());
+    threadQueue.Publish();
+
+    auto iter = objectFactory.Iter();
+    auto it = iter.begin();
+    EXPECT_FALSE(it.IsArray());
+    EXPECT_THAT(it.GetObjHeader(), object);
+    ++it;
+    EXPECT_THAT(it, iter.end());
+}
+
+TEST(ObjectFactoryTest, CreateArray) {
+    auto typeInfo = MakeArrayTypeInfo(24);
+    ObjectFactory objectFactory;
+    ObjectFactory::ThreadQueue threadQueue(objectFactory);
+
+    auto* array = threadQueue.CreateArray(typeInfo.get(), 3);
+    threadQueue.Publish();
+
+    auto iter = objectFactory.Iter();
+    auto it = iter.begin();
+    EXPECT_TRUE(it.IsArray());
+    EXPECT_THAT(it.GetArrayHeader(), array);
+    ++it;
+    EXPECT_THAT(it, iter.end());
+}
+
+TEST(ObjectFactoryTest, Erase) {
+    auto objectTypeInfo = MakeObjectTypeInfo(24);
+    auto arrayTypeInfo = MakeArrayTypeInfo(24);
+    ObjectFactory objectFactory;
+    ObjectFactory::ThreadQueue threadQueue(objectFactory);
+
+    for (int i = 0; i < 10; ++i) {
+        threadQueue.CreateObject(objectTypeInfo.get());
+        threadQueue.CreateArray(arrayTypeInfo.get(), 3);
+    }
+
+    threadQueue.Publish();
+
+    {
+        auto iter = objectFactory.Iter();
+        for (auto it = iter.begin(); it != iter.end();) {
+            if (it.IsArray()) {
+                iter.EraseAndAdvance(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    {
+        auto iter = objectFactory.Iter();
+        int count = 0;
+        for (auto it = iter.begin(); it != iter.end(); ++it, ++count) {
+            EXPECT_FALSE(it.IsArray());
+        }
+        EXPECT_THAT(count, 10);
+    }
+}
+
+TEST(ObjectFactoryTest, ConcurrentPublish) {
+    auto typeInfo = MakeObjectTypeInfo(24);
+    ObjectFactory objectFactory;
+    constexpr int kThreadCount = kDefaultThreadCount;
+    std::atomic<bool> canStart(false);
+    std::atomic<int> readyCount(0);
+    std::vector<std::thread> threads;
+    std::mutex expectedMutex;
+    std::vector<ObjHeader*> expected;
+
+    for (int i = 0; i < kThreadCount; ++i) {
+        threads.emplace_back([&typeInfo, &objectFactory, &canStart, &readyCount, &expected, &expectedMutex]() {
+            ObjectFactory::ThreadQueue threadQueue(objectFactory);
+            auto* object = threadQueue.CreateObject(typeInfo.get());
+            {
+                std::lock_guard<std::mutex> guard(expectedMutex);
+                expected.push_back(object);
+            }
+            ++readyCount;
+            while (!canStart) {
+            }
+            threadQueue.Publish();
+        });
+    }
+
+    while (readyCount < kThreadCount) {
+    }
+    canStart = true;
+    for (auto& t : threads) {
+        t.join();
+    }
+
+    auto iter = objectFactory.Iter();
+    std::vector<ObjHeader*> actual;
+    for (auto it = iter.begin(); it != iter.end(); ++it) {
+        actual.push_back(it.GetObjHeader());
+    }
+
+    EXPECT_THAT(actual, testing::UnorderedElementsAreArray(expected));
+}
diff --git a/kotlin-native/runtime/src/mm/cpp/Stubs.cpp b/kotlin-native/runtime/src/mm/cpp/Stubs.cpp
index bc79217b2cd..869760b745a 100644
--- a/kotlin-native/runtime/src/mm/cpp/Stubs.cpp
+++ b/kotlin-native/runtime/src/mm/cpp/Stubs.cpp
@@ -15,44 +15,8 @@ ALWAYS_INLINE bool isPermanentOrFrozen(const ObjHeader* obj) {
     TODO();
 }
 
-ObjHeader** ObjHeader::GetWeakCounterLocation() {
-    TODO();
-}
-
-#ifdef KONAN_OBJC_INTEROP
-
-void* ObjHeader::GetAssociatedObject() {
-    TODO();
-}
-
-void** ObjHeader::GetAssociatedObjectLocation() {
-    TODO();
-}
-
-void ObjHeader::SetAssociatedObject(void* obj) {
-    TODO();
-}
-
-#endif // KONAN_OBJC_INTEROP
-
-static MetaObjHeader* createMetaObject(TypeInfo** location) {
-    TODO();
-}
-
-static void destroyMetaObject(TypeInfo** location) {
-    TODO();
-}
-
 extern "C" {
 
-RUNTIME_NOTHROW OBJ_GETTER(AllocInstance, const TypeInfo* type_info) {
-    TODO();
-}
-
-OBJ_GETTER(AllocArrayInstance, const TypeInfo* type_info, int32_t elements) {
-    TODO();
-}
-
 OBJ_GETTER(InitThreadLocalSingleton, ObjHeader** location, const TypeInfo* typeInfo, void (*ctor)(ObjHeader*)) {
     TODO();
 }
diff --git a/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp b/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp
index b5f18dc1853..5e09933297f 100644
--- a/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp
+++ b/kotlin-native/runtime/src/mm/cpp/ThreadData.hpp
@@ -9,6 +9,7 @@
 #include <atomic>
 #include <pthread.h>
 
+#include "ObjectFactory.hpp"
 #include "GlobalsRegistry.hpp"
 #include "StableRefRegistry.hpp"
 #include "ThreadLocalStorage.hpp"
@@ -26,7 +27,8 @@ public:
         threadId_(threadId),
         globalsThreadQueue_(GlobalsRegistry::Instance()),
         stableRefThreadQueue_(StableRefRegistry::Instance()),
-        state_(ThreadState::kRunnable) {}
+        state_(ThreadState::kRunnable),
+        objectFactoryThreadQueue_(ObjectFactory::Instance()) {}
 
     ~ThreadData() = default;
 
@@ -42,12 +44,15 @@ public:
 
     ThreadState setState(ThreadState state) noexcept { return state_.exchange(state); }
 
+    ObjectFactory::ThreadQueue& objectFactoryThreadQueue() noexcept { return objectFactoryThreadQueue_; }
+
 private:
     const pthread_t threadId_;
     GlobalsRegistry::ThreadQueue globalsThreadQueue_;
     ThreadLocalStorage tls_;
     StableRefRegistry::ThreadQueue stableRefThreadQueue_;
     std::atomic<ThreadState> state_;
+    ObjectFactory::ThreadQueue objectFactoryThreadQueue_;
 };
 
 } // namespace mm
diff --git a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstBinaries.kt b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstBinaries.kt
index 2ebaad90d8c..3c90fdc4ce2 100644
--- a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstBinaries.kt
+++ b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstBinaries.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -23,7 +23,7 @@ class JsReplTestAgainstBinaries : AbstractJsReplTest() {
     private val dependencies = readLibrariesFromConfiguration(environment.configuration)
 
     init {
-        val nameTable = NameTables(emptyList())
+        val nameTable = NameTables(emptyList(), mappedNames = mutableMapOf())
         val compiler = JsScriptDependencyCompiler(environment.configuration, nameTable, createSymbolTable())
         val runtimeBinary = compiler.compile(dependencies)
 
diff --git a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstKlib.kt b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstKlib.kt
index 6d0239c18c4..6c33f486da7 100644
--- a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstKlib.kt
+++ b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/JsReplTestAgainstKlib.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -21,7 +21,7 @@ class JsReplTestAgainstKlib : AbstractJsReplTest() {
     private var dependencyCode: String? = null
 
     override fun createCompilationState(): JsReplCompilationState {
-        val nameTables = NameTables(emptyList())
+        val nameTables = NameTables(emptyList(), mappedNames = mutableMapOf())
         val symbolTable = SymbolTable(IdSignatureDescriptor(JsManglerDesc), IrFactoryImpl)
         val dependencyCompiler = JsScriptDependencyCompiler(environment.configuration, nameTables, symbolTable)
         val dependencies = readLibrariesFromConfiguration(environment.configuration)
diff --git a/libraries/stdlib/js-ir/src/kotlin/jsClass_js-ir.kt b/libraries/stdlib/js-ir/src/kotlin/jsClass_js-ir.kt
index 1524617027c..ae2312e1f1f 100644
--- a/libraries/stdlib/js-ir/src/kotlin/jsClass_js-ir.kt
+++ b/libraries/stdlib/js-ir/src/kotlin/jsClass_js-ir.kt
@@ -5,4 +5,7 @@
 
 package kotlin.js
 
+// DON'T USE! Use `K::class.js` instead.
+// The declaration kept only for backward compatibility with older compilers
+// TODO remove, but when?
 internal external fun <T : Any> jsClass(): JsClass<T>
diff --git a/libraries/stdlib/jvm/runtime/kotlin/Metadata.kt b/libraries/stdlib/jvm/runtime/kotlin/Metadata.kt
index c39338e5612..ad9c1cb49bd 100644
--- a/libraries/stdlib/jvm/runtime/kotlin/Metadata.kt
+++ b/libraries/stdlib/jvm/runtime/kotlin/Metadata.kt
@@ -66,11 +66,12 @@ public annotation class Metadata(
      * * 0 - this is a multi-file class facade or part, compiled with `-Xmultifile-parts-inherit`.
      * * 1 - this class file is compiled by a pre-release version of Kotlin and is not visible to release versions.
      * * 2 - this class file is a compiled Kotlin script source file (.kts).
-     * * 3 - the metadata of this class file is not supposed to be read by the compiler, whose major.minor version is less than
-     *   the major.minor version of this metadata ([metadataVersion]).
-     * * 4 - this class file is compiled with the new Kotlin compiler backend introduced in Kotlin 1.4.
-     * * 5 - if the class file is compiled with the new Kotlin compiler backend, the metadata has been verified by the author and
-     *   no metadata incompatibility diagnostic should be reported at the call site.
+     * * 3 - "strict metadata version semantics". The metadata of this class file is not supposed to be read by the compiler,
+     *   whose major.minor version is less than the major.minor version of this metadata ([metadataVersion]).
+     * * 4 - this class file is compiled with the new Kotlin compiler backend (JVM IR) introduced in Kotlin 1.4.
+     * * 5 - this class file has stable metadata and ABI. This is used only for class files compiled with JVM IR (see flag #4) or FIR (#6),
+     *   and prevents metadata incompatibility diagnostics from being reported where the class is used.
+     * * 6 - this class file is compiled with the new Kotlin compiler frontend (FIR).
      */
     @SinceKotlin("1.1")
     @get:JvmName("xi")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt
index acd22bb043a..5e2e9fbdca2 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt
@@ -266,13 +266,13 @@ class DukatIntegrationIT : BaseGradleIT() {
             "${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}"
         }
 
-        val externalSrcs = "build/externals/both-jsIr/src"
+        val externalSrcs = "build/externals/both-js-ir/src"
         project.build("compileKotlinJsLegacy") {
             assertSuccessful()
             assertTasksExecuted(":irGenerateExternalsIntegrated")
 
             assertSingleFileExists(externalSrcs, "index.module_decamelize.kt")
-            val legacyExternals = "build/externals/both-jsLegacy/src"
+            val legacyExternals = "build/externals/both-js-legacy/src"
             val directoryFile = fileInWorkingDir(legacyExternals)
             assertTrue(
                 !directoryFile.exists(),
@@ -351,13 +351,13 @@ class DukatIntegrationIT : BaseGradleIT() {
             """.trimIndent()
         }
 
-        val externalSrcs = "build/externals/both-jsLegacy/src"
+        val externalSrcs = "build/externals/both-js-legacy/src"
         project.build("compileKotlinJsLegacy") {
             assertSuccessful()
 
             assertSingleFileExists(externalSrcs, "index.d.jar")
 
-            val irExternals = "build/externals/both-jsIr/src"
+            val irExternals = "build/externals/both-js-ir/src"
             val directoryFile = fileInWorkingDir(irExternals)
             assertTrue(
                 !directoryFile.exists(),
@@ -381,14 +381,14 @@ class DukatIntegrationIT : BaseGradleIT() {
             """.trimIndent()
         }
 
-        val externalSrcs = "build/externals/both-jsIr/src"
+        val externalSrcs = "build/externals/both-js-ir/src"
         project.build("assemble", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) {
             assertSuccessful()
 
             assertTasksExecuted(":irGenerateExternalsIntegrated")
 
             assertSingleFileExists(externalSrcs, "index.module_decamelize.kt")
-            val legacyExternals = "build/externals/both-jsLegacy/src"
+            val legacyExternals = "build/externals/both-js-legacy/src"
             val directoryFile = fileInWorkingDir(legacyExternals)
             assertTrue(
                 !directoryFile.exists(),
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
index 812957c1d70..312c0551031 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
@@ -704,8 +704,8 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
 
             assertTasksExecuted(":app:browserProductionWebpack")
 
-            assertFileExists("build/js/packages/kotlin-js-browser-base-jsIr")
-            assertFileExists("build/js/packages/kotlin-js-browser-base-jsLegacy")
+            assertFileExists("build/js/packages/kotlin-js-browser-base-js-ir")
+            assertFileExists("build/js/packages/kotlin-js-browser-base-js-legacy")
             assertFileExists("build/js/packages/kotlin-js-browser-lib")
             assertFileExists("build/js/packages/kotlin-js-browser-app")
 
@@ -719,7 +719,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
                 assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin.js")
                 assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-app.js")
                 assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-lib.js")
-                assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-base-jsLegacy.js")
+                assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-base-js-legacy.js")
 
                 assertFileExists("app/build/distributions/app.js.map")
             }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt
index 10739c00fca..fef595b5e93 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt
@@ -127,6 +127,12 @@ open class NpmProject(@Transient val compilation: KotlinJsCompilation) {
 
         val targetName = if (target.name.isNotEmpty() && target.name.toLowerCase() != "js") {
             target.name
+                .replace(DECAMELIZE_REGEX) {
+                    it.groupValues
+                        .drop(1)
+                        .joinToString(prefix = "-", separator = "-")
+                }
+                .toLowerCase()
         } else null
 
         return sequenceOf(
@@ -146,5 +152,7 @@ open class NpmProject(@Transient val compilation: KotlinJsCompilation) {
         const val PRE_PACKAGE_JSON = "pre-package.json"
         const val NODE_MODULES = "node_modules"
         const val DIST_FOLDER = "kotlin"
+
+        private val DECAMELIZE_REGEX = "([A-Z])".toRegex()
     }
 }
\ No newline at end of file
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
index a5ca5b6a189..9a5c7b5996a 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
@@ -123,22 +123,42 @@ internal fun CirSimpleType.buildType(
     )
 }
 
-@Suppress("NOTHING_TO_INLINE")
-private inline fun buildSimpleType(classifier: ClassifierDescriptor, arguments: List<TypeProjection>, isMarkedNullable: Boolean) =
-    simpleType(
+private fun buildSimpleType(classifier: ClassifierDescriptor, arguments: List<TypeProjection>, isMarkedNullable: Boolean): SimpleType {
+    val reorderedArguments = if (arguments.isNotEmpty() && classifier is ClassDescriptor && classifier.isInner) {
+        val totalArguments = arguments.size
+        var remainingArguments = totalArguments
+
+        ArrayList<TypeProjection>(totalArguments).also { reorderedArguments ->
+            var currentClassifier: ClassDescriptor = classifier
+
+            while (true) {
+                val argumentsForCurrentClassifier = currentClassifier.declaredTypeParameters.size
+                for (i in 0 until argumentsForCurrentClassifier) {
+                    reorderedArguments += arguments[remainingArguments - argumentsForCurrentClassifier + i]
+                }
+                remainingArguments -= argumentsForCurrentClassifier
+
+                if (remainingArguments == 0) break
+                currentClassifier = currentClassifier.containingDeclaration as ClassDescriptor
+            }
+        }
+    } else arguments
+
+    return simpleType(
         annotations = Annotations.EMPTY,
         constructor = classifier.typeConstructor,
-        arguments = arguments,
+        arguments = reorderedArguments,
         nullable = isMarkedNullable,
         kotlinTypeRefiner = null
     )
+}
 
-@Suppress("NOTHING_TO_INLINE")
-private inline fun buildExpandedType(classifier: TypeAliasDescriptor, arguments: List<TypeProjection>, isMarkedNullable: Boolean) =
-    TypeAliasExpander.NON_REPORTING.expand(
+private fun buildExpandedType(classifier: TypeAliasDescriptor, arguments: List<TypeProjection>, isMarkedNullable: Boolean): SimpleType {
+    return TypeAliasExpander.NON_REPORTING.expand(
         TypeAliasExpansion.create(null, classifier, arguments),
         Annotations.EMPTY
     ).makeNullableAsSpecified(isMarkedNullable)
+}
 
 
 private inline fun <reified T : ClassifierDescriptorWithTypeParameters> ClassifierDescriptorWithTypeParameters.checkClassifierType(): T {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
index 6f2d7f958d0..043ee6dd38b 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirType.kt
@@ -61,8 +61,10 @@ sealed class CirClassOrTypeAliasType : CirSimpleType() {
     abstract val classifierId: ClassId
     abstract val arguments: List<CirTypeProjection>
 
-    override fun appendDescriptionTo(builder: StringBuilder) {
-        builder.append(classifierId.asString())
+    override fun appendDescriptionTo(builder: StringBuilder) = appendDescriptionTo(builder, shortNameOnly = false)
+
+    protected open fun appendDescriptionTo(builder: StringBuilder, shortNameOnly: Boolean) {
+        builder.append(if (shortNameOnly) classifierId.relativeClassName.shortName().asString() else classifierId.asString())
         if (arguments.isNotEmpty()) arguments.joinTo(builder, prefix = "<", postfix = ">")
         super.appendDescriptionTo(builder)
     }
@@ -71,12 +73,13 @@ sealed class CirClassOrTypeAliasType : CirSimpleType() {
 abstract class CirClassType : CirClassOrTypeAliasType(), CirHasVisibility {
     abstract val outerType: CirClassType?
 
-    override fun appendDescriptionTo(builder: StringBuilder) {
-        outerType?.let {
-            it.appendDescriptionTo(builder)
+    override fun appendDescriptionTo(builder: StringBuilder, shortNameOnly: Boolean) {
+        val outerType = outerType
+        if (outerType != null) {
+            outerType.appendDescriptionTo(builder)
             builder.append('.')
         }
-        super.appendDescriptionTo(builder)
+        super.appendDescriptionTo(builder, shortNameOnly = outerType != null)
     }
 }
 
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
index e5585ef8b5b..2041142cef2 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
@@ -147,10 +147,10 @@ object CirTypeFactory {
             val declaredTypeParametersCount = classDescriptor.declaredTypeParameters.size
             outerType = createClassTypeWithAllOuterTypes(
                 classDescriptor = classDescriptor.containingDeclaration as ClassDescriptor,
-                arguments = arguments.subList(0, arguments.size - declaredTypeParametersCount),
+                arguments = arguments.subList(declaredTypeParametersCount, arguments.size),
                 isMarkedNullable = false // don't pass nullable flag to outer types
             )
-            remainingArguments = arguments.subList(arguments.size - declaredTypeParametersCount, arguments.size)
+            remainingArguments = arguments.subList(0, declaredTypeParametersCount)
         } else {
             outerType = null
             remainingArguments = arguments
diff --git a/plugins/fir/fir-plugin-prototype/build.gradle.kts b/plugins/fir/fir-plugin-prototype/build.gradle.kts
index c4a1836160e..a8b40c9c9f0 100644
--- a/plugins/fir/fir-plugin-prototype/build.gradle.kts
+++ b/plugins/fir/fir-plugin-prototype/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(project(":compiler:fir:checkers"))
-    testCompile(projectTests(":compiler:fir:analysis-tests"))
+    testCompile(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testCompile(project(":compiler:frontend"))
 
     testCompileOnly(project(":kotlin-reflect-api"))
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
index 8f47bfc6ef5..d830bc55b1c 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt
@@ -66,7 +66,7 @@ open class SerializerIrGenerator(
         lateinit var prop: IrProperty
 
         // how to (auto)create backing field and getter/setter?
-        compilerContext.symbolTable.withReferenceScope(irClass.descriptor) {
+        compilerContext.symbolTable.withReferenceScope(irClass) {
             prop = generateSimplePropertyWithBackingField(desc, irClass)
 
             // TODO: Do not use descriptors here
@@ -84,7 +84,7 @@ open class SerializerIrGenerator(
         }
 
         anonymousInit.buildWithScope { initIrBody ->
-            compilerContext.symbolTable.withReferenceScope(initIrBody.descriptor) {
+            compilerContext.symbolTable.withReferenceScope(initIrBody) {
                 initIrBody.body =
                     DeclarationIrBuilder(compilerContext, initIrBody.symbol, initIrBody.startOffset, initIrBody.endOffset).irBlockBody {
                         val localDesc = irTemporary(
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index b572a5b6367..5869152cd70 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -8,6 +8,7 @@ val depenencyProjects = arrayOf(
     ":generators",
     ":compiler",
     ":compiler:tests-common-new",
+    ":compiler:tests-for-compiler-generator",
     ":js:js.tests",
     ":compiler:tests-java8",
     ":core:descriptors.runtime"
@@ -20,6 +21,8 @@ dependencies {
     }
 
     testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
+    testRuntimeOnly(platform("org.junit:junit-bom:5.7.0"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter")
 }
 
 sourceSets {
diff --git a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
index 287b3fe3dd3..559832b2d0c 100644
--- a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
+++ b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
@@ -7,14 +7,13 @@ package org.jetbrains.kotlin.pill.generateAllTests;
 
 import org.jetbrains.kotlin.generators.tests.*;
 import org.jetbrains.kotlin.generators.InconsistencyChecker;
-import org.jetbrains.kotlin.test.generators.GenerateNewCompilerTestsKt;
+import org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt;
 
 import java.util.List;
 
 public class Main {
     public static void main(String[] args) {
         GenerateCompilerTestsKt.main(args);
-        GenerateNewCompilerTestsKt.main(args);
         GenerateTestsKt.main(args);
         GenerateJsTestsKt.main(args);
         GenerateJava8TestsKt.main(args);
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJsCompilerImpls.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJsCompilerImpls.kt
index 87a021b7a70..b0fe99601aa 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJsCompilerImpls.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJsCompilerImpls.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.scripting.repl.js.readLibrariesFromConfiguration
 import kotlin.script.experimental.api.*
 
 class JsScriptCompilerWithDependenciesProxy(private val environment: KotlinCoreEnvironment) : ScriptCompilerProxy {
-    private val nameTables = NameTables(emptyList())
+    private val nameTables = NameTables(emptyList(), mappedNames = mutableMapOf())
     private val symbolTable = SymbolTable(IdSignatureDescriptor(JsManglerDesc), IrFactoryImpl)
     private val dependencies: List<ModuleDescriptor> = readLibrariesFromConfiguration(environment.configuration)
     private val compiler = JsCoreScriptingCompiler(environment, nameTables, symbolTable, dependencies)
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
index e7c9210f1a2..2dd85ee1592 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactories
 import org.jetbrains.kotlin.codegen.DefaultCodegenFactory
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
 import org.jetbrains.kotlin.codegen.state.GenerationState
-import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.languageVersionSettings
@@ -235,7 +234,7 @@ private fun generate(
     sourceFiles,
     kotlinCompilerConfiguration
 ).codegenFactory(
-    if (kotlinCompilerConfiguration.getBoolean(JVMConfigurationKeys.IR) || kotlinCompilerConfiguration.getBoolean(CommonConfigurationKeys.USE_FIR))
+    if (kotlinCompilerConfiguration.getBoolean(JVMConfigurationKeys.IR))
         JvmIrCodegenFactory(
             kotlinCompilerConfiguration.get(CLIConfigurationKeys.PHASE_CONFIG) ?: PhaseConfig(jvmPhases)
         ) else DefaultCodegenFactory
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplCompiler.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplCompiler.kt
index 49553c54c31..ea537e441af 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplCompiler.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplCompiler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -21,7 +21,7 @@ class JsReplCompiler(private val environment: KotlinCoreEnvironment) : ReplCompi
     override fun createState(lock: ReentrantReadWriteLock): IReplStageState<*> {
         return JsReplCompilationState(
             lock,
-            NameTables(emptyList()),
+            NameTables(emptyList(), mappedNames = mutableMapOf()),
             readLibrariesFromConfiguration(environment.configuration),
             ReplCodeAnalyzerBase.ResettableAnalyzerState(),
             SymbolTable(IdSignatureDescriptor(JsManglerDesc), IrFactoryImpl)
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplUtils.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplUtils.kt
index d9da0c9b29a..fb73899385c 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplUtils.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/repl/js/JsReplUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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.
  */
 
@@ -172,7 +172,7 @@ class DependencyLoader {
 
     fun writeNames(nameTables: NameTables): ByteArray {
         val result = StringBuilder()
-        for (entry in nameTables.mappedNames) {
+        for (entry in nameTables.mappedNames.orEmpty()) {
             result.append("${entry.key} ${entry.value}" + System.lineSeparator())
         }
         return result.toString().toByteArray(Charset.defaultCharset())
diff --git a/plugins/scripting/scripting-compiler/testData/compiler/kt42530.kts b/plugins/scripting/scripting-compiler/testData/compiler/kt42530.kts
new file mode 100644
index 00000000000..dcde2199a13
--- /dev/null
+++ b/plugins/scripting/scripting-compiler/testData/compiler/kt42530.kts
@@ -0,0 +1,5 @@
+
+fun Int.isOdd() = (this % 2) == 1
+val list: List<Pair<Int, String>> = listOf(1 to "a", 2 to "b")
+val (odds, evens) = list.partition { (i, _) -> i.isOdd() }
+odds
diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTest.kt
index 174579f0f3e..73e4f3c8ec4 100644
--- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTest.kt
+++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTest.kt
@@ -76,6 +76,16 @@ class ScriptTest : TestCase() {
         })
     }
 
+    fun testKt42530() {
+        val aClass = compileScript("kt42530.kts", StandardScriptDefinition)
+        Assert.assertNotNull(aClass)
+        val out = captureOut {
+            val anObj = tryConstructClassFromStringArgs(aClass!!, emptyList())
+            Assert.assertNotNull(anObj)
+        }
+        assertEqualsTrimmed("[(1, a)]", out)
+    }
+
     private fun compileScript(
         scriptPath: String,
         scriptDefinition: KotlinScriptDefinition,
diff --git a/settings.gradle b/settings.gradle
index 01a97906baa..761b6d7ab2d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -121,6 +121,7 @@ include ":benchmarks",
         ":compiler:tests-mutes:tc-integration",
         ":compiler:tests-common-jvm6",
         ":compiler:tests-against-klib",
+        ":compiler:tests-for-compiler-generator",
         ":dukat",
         ":js:js.ast",
         ":js:js.serializer",
@@ -326,7 +327,8 @@ include ":compiler:fir:cones",
         ":compiler:fir:checkers",
         ":compiler:fir:checkers:checkers-component-generator",
         ":compiler:fir:entrypoint",
-        ":compiler:fir:analysis-tests"
+        ":compiler:fir:analysis-tests",
+        ":compiler:fir:analysis-tests:legacy-fir-tests"
 
 include ":compiler:test-infrastructure",
         ":compiler:test-infrastructure-utils",
diff --git a/tests/mute-common.csv b/tests/mute-common.csv
index b85ef64c32d..66d3525abdf 100644
--- a/tests/mute-common.csv
+++ b/tests/mute-common.csv
@@ -81,3 +81,4 @@ org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.CompilationE
 org.jetbrains.kotlin.idea.caches.resolve.IdeLightClassTestGenerated.CompilationErrors.testJvmPackageName, Invalid behavior of old lightclasses in common tests,,
 org.jetbrains.uast.test.kotlin.SimpleKotlinRenderLogTest.testReceiverFun, Analysing of facade annotation with receiver site is broken (connected with KT-40403),,
 org.jetbrains.kotlin.checkers.FirPsiCheckerTestGenerated.Regression.testJet53,,, FLAKY
+org.jetbrains.kotlin.idea.caches.resolve.MultiModuleHighlightingTest.testLanguageVersionsViaFacets,,, FLAKY