diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java
index ac14d865311..427adda503c 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java
@@ -5266,12 +5266,6 @@ public class DiagnosticCompilerTestFirTestdataTestGenerated extends AbstractDiag
             runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.kt");
         }
 
-        @Test
-        @TestMetadata("castForFunctionsWithDifferentArities.kt")
-        public void testCastForFunctionsWithDifferentArities() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt");
-        }
-
         @Test
         @TestMetadata("classLiteralForParameter.kt")
         public void testClassLiteralForParameter() throws Exception {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
index 9f298d8c952..77c2701006c 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
@@ -5266,12 +5266,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated
             runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.kt");
         }
 
-        @Test
-        @TestMetadata("castForFunctionsWithDifferentArities.kt")
-        public void testCastForFunctionsWithDifferentArities() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt");
-        }
-
         @Test
         @TestMetadata("classLiteralForParameter.kt")
         public void testClassLiteralForParameter() throws Exception {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.fir.txt
deleted file mode 100644
index 24c451c7714..00000000000
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.fir.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-FILE: castForFunctionsWithDifferentArities.kt
-    public final fun test(b: R|kotlin/Boolean|, block1: R|kotlin/Any.() -> kotlin/Unit|, block2: R|(kotlin/Any.(kotlin/Any?) -> kotlin/Unit)?|): R|kotlin/Unit| {
-        when () {
-            R|<local>/b| ->  {
-                R|kotlin/requireNotNull|<R|kotlin/Any.() -> kotlin/Unit|>(R|<local>/block1|)
-            }
-            else ->  {
-                R|kotlin/requireNotNull|<R|kotlin/Any.(kotlin/Any?) -> kotlin/Unit|>(R|<local>/block2|)
-            }
-        }
-
-    }
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt
deleted file mode 100644
index 84a3dde466d..00000000000
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// ISSUE: KT-63865
-
-fun test(b: Boolean, block1: Any.() -> Unit, block2: (Any.(Any?) -> Unit)?) {
-    if (b) {
-        requireNotNull(block1)
-    } else {
-        requireNotNull(block2)
-    }
-}
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java
index f9d504eed58..b10497fbfec 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestGenerated.java
@@ -5266,12 +5266,6 @@ public class FirLightTreeDiagnosticsTestGenerated extends AbstractFirLightTreeDi
             runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.kt");
         }
 
-        @Test
-        @TestMetadata("castForFunctionsWithDifferentArities.kt")
-        public void testCastForFunctionsWithDifferentArities() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt");
-        }
-
         @Test
         @TestMetadata("classLiteralForParameter.kt")
         public void testClassLiteralForParameter() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java
index 0011a752fb0..d711a5b3ffc 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticTestGenerated.java
@@ -5266,12 +5266,6 @@ public class FirPsiDiagnosticTestGenerated extends AbstractFirPsiDiagnosticTest
             runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.kt");
         }
 
-        @Test
-        @TestMetadata("castForFunctionsWithDifferentArities.kt")
-        public void testCastForFunctionsWithDifferentArities() throws Exception {
-            runTest("compiler/fir/analysis-tests/testData/resolveWithStdlib/castForFunctionsWithDifferentArities.kt");
-        }
-
         @Test
         @TestMetadata("classLiteralForParameter.kt")
         public void testClassLiteralForParameter() throws Exception {
diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt
index 00b8744f6c3..585f8b561c6 100644
--- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt
+++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt
@@ -69,7 +69,7 @@ interface ConeInferenceContext : TypeSystemInferenceExtensionContext, ConeTypeCo
     ): SimpleTypeMarker {
         val attributesList = attributes?.filterIsInstanceTo<ConeAttribute<*>, MutableList<ConeAttribute<*>>>(mutableListOf())
         val coneAttributes: ConeAttributes = if (isExtensionFunction) {
-            require(constructor is ConeClassLikeLookupTag)
+            require(constructor is ConeClassLikeLookupTag && constructor.isSomeFunctionType(session))
             // We don't want to create new instance of ConeAttributes which
             //   contains only CompilerConeAttributes.ExtensionFunctionType
             //   to avoid memory consumption
diff --git a/plugins/compose-compiler-plugin b/plugins/compose-compiler-plugin
deleted file mode 160000
index 0312be77c25..00000000000
--- a/plugins/compose-compiler-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0312be77c25514fb26c3a4238a609f74a9b76a5b