KT-47939 fixes after review

compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJavaSamInterfaceConstructorReferenceChecker.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.fir.analysis.jvm.checkers.expression
 
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
 import org.jetbrains.kotlin.diagnostics.reportOn
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
@@ -23,7 +22,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 object FirJavaSamInterfaceConstructorReferenceChecker : FirQualifiedAccessExpressionChecker() {
     override fun check(expression: FirQualifiedAccessExpression, context: CheckerContext, reporter: DiagnosticReporter) {
         if (expression !is FirCallableReferenceAccess) return
-        if (!context.languageVersionSettings.supportsFeature(LanguageFeature.ProhibitJavaSamInterfaceConstructorReference)) return
 
         val reference = expression.calleeReference as? FirResolvedNamedReference ?: return
         val referredSymbol = reference.resolvedSymbol

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AdapterGenerator.kt

@@ -577,12 +577,18 @@ internal class AdapterGenerator(
                 IrDeclarationOrigin.ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE
             )
             irAdapterFunction.valueParameters = listOf(irFunctionParameter)
-            irAdapterFunction.body = irFactory.createExpressionBody(
+            irAdapterFunction.body = irFactory.createBlockBody(
                 startOffset, endOffset,
-                IrTypeOperatorCallImpl(
-                    startOffset, endOffset,
-                    irSamType, IrTypeOperator.SAM_CONVERSION, irSamType,
-                    IrGetValueImpl(startOffset, endOffset, irFunctionParameter.symbol)
+                listOf(
+                    IrReturnImpl(
+                        startOffset, endOffset, components.irBuiltIns.nothingType,
+                        irAdapterFunction.symbol,
+                        IrTypeOperatorCallImpl(
+                            startOffset, endOffset,
+                            irSamType, IrTypeOperator.SAM_CONVERSION, irSamType,
+                            IrGetValueImpl(startOffset, endOffset, irFunctionParameter.symbol)
+                        )
+                    )
                 )
             )
             symbolTable.leaveScope(irAdapterFunction)

compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt

@@ -45,7 +45,7 @@ fun FirBasedSymbol<*>.getDeprecation(callSite: FirElement?): DeprecationInfo? {
 
 fun FirAnnotationContainer.getDeprecationInfos(currentVersion: ApiVersion): DeprecationsPerUseSite {
     val deprecationByUseSite = mutableMapOf<AnnotationUseSiteTarget?, DeprecationInfo>()
-    val fromJava = this.safeAs<FirDeclaration>()?.isJavaOrEnhancement == true
+    val fromJava = this is FirDeclaration && this.isJavaOrEnhancement
     annotations.extractDeprecationInfoPerUseSite(currentVersion, fromJava).toMap(deprecationByUseSite)
 
     if (this is FirProperty) {