[stdlib] Use moved throw helpers from kotlin.internal package

^KT-79334

Author: vsukharev

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/PreSerializationSymbols.kt

@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.ir.types.classOrNull
 import org.jetbrains.kotlin.ir.types.impl.IrDynamicTypeImpl
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.*
-import org.jetbrains.kotlin.name.StandardClassIds.BASE_KOTLIN_PACKAGE
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
 
@@ -150,6 +149,10 @@ interface PreSerializationKlibSymbols : PreSerializationSymbols {
         override val genericSharedVariableBox: SharedVariableBoxClassInfo = findSharedVariableBoxClass(null)
         override val syntheticConstructorMarker: IrClassSymbol =
             ClassId(StandardNames.KOTLIN_INTERNAL_FQ_NAME, Name.identifier("SyntheticConstructorMarker")).classSymbol()
+        override val throwUninitializedPropertyAccessException: IrSimpleFunctionSymbol =
+            THROW_UNINITIALIZED_PROPERTY_ACCESS_NAME.internalCallableId.functionSymbol()
+        override val throwUnsupportedOperationException: IrSimpleFunctionSymbol =
+            THROW_UNSUPPORTED_OPERATION_NAME.internalCallableId.functionSymbol()
     }
 
     companion object {
@@ -158,6 +161,10 @@ interface PreSerializationKlibSymbols : PreSerializationSymbols {
         const val GET_COROUTINE_CONTEXT_NAME = "getCoroutineContext"
         const val COROUTINE_CONTEXT_NAME = "coroutineContext"
         const val DEFAULT_CONSTRUCTOR_MARKET_NAME = "DefaultConstructorMarker"
+
+        private val kotlinInternalPackageFqn = FqName.fromSegments(listOf("kotlin", "internal"))
+        private val String.internalCallableId: CallableId
+            get() = CallableId(kotlinInternalPackageFqn, Name.identifier(this))
     }
 }
 
@@ -182,11 +189,6 @@ interface PreSerializationJsSymbols : PreSerializationWebSymbols {
     val jsOutlinedFunctionAnnotationSymbol: IrClassSymbol
 
     open class Impl(irBuiltIns: IrBuiltIns) : PreSerializationJsSymbols, PreSerializationWebSymbols.Impl(irBuiltIns) {
-        override val throwUninitializedPropertyAccessException: IrSimpleFunctionSymbol =
-            CallableIds.throwUninitializedPropertyAccessException.functionSymbol()
-        override val throwUnsupportedOperationException: IrSimpleFunctionSymbol =
-            CallableIds.throwUnsupportedOperationException.functionSymbol()
-
         override val defaultConstructorMarker: IrClassSymbol = ClassIds.defaultConstructorMarker.classSymbol()
 
         override val suspendCoroutineUninterceptedOrReturn: IrSimpleFunctionSymbol =
@@ -200,13 +202,6 @@ interface PreSerializationJsSymbols : PreSerializationWebSymbols {
             private const val COROUTINE_SUSPEND_OR_RETURN_JS_NAME = "suspendCoroutineUninterceptedOrReturnJS"
 
             private object CallableIds {
-                private val String.rootCallableId: CallableId
-                    get() = CallableId(kotlinPackageFqn, Name.identifier(this))
-                val throwUninitializedPropertyAccessException: CallableId =
-                    PreSerializationKlibSymbols.THROW_UNINITIALIZED_PROPERTY_ACCESS_NAME.rootCallableId
-                val throwUnsupportedOperationException: CallableId =
-                    PreSerializationKlibSymbols.THROW_UNSUPPORTED_OPERATION_NAME.rootCallableId
-
                 private val String.baseJsCallableId: CallableId
                     get() = CallableId(StandardClassIds.BASE_JS_PACKAGE, Name.identifier(this))
                 val suspendCoroutineUninterceptedOrReturn: CallableId = COROUTINE_SUSPEND_OR_RETURN_JS_NAME.baseJsCallableId
@@ -226,11 +221,6 @@ interface PreSerializationJsSymbols : PreSerializationWebSymbols {
 
 interface PreSerializationWasmSymbols : PreSerializationWebSymbols {
     open class Impl(irBuiltIns: IrBuiltIns) : PreSerializationWasmSymbols, PreSerializationWebSymbols.Impl(irBuiltIns) {
-        override val throwUninitializedPropertyAccessException: IrSimpleFunctionSymbol =
-            CallableIds.throwUninitializedPropertyAccessException.functionSymbol()
-        override val throwUnsupportedOperationException: IrSimpleFunctionSymbol =
-            CallableIds.throwUnsupportedOperationException.functionSymbol()
-
         override val defaultConstructorMarker: IrClassSymbol = ClassIds.defaultConstructorMarker.classSymbol()
 
         override val suspendCoroutineUninterceptedOrReturn: IrSimpleFunctionSymbol =
@@ -244,10 +234,6 @@ interface PreSerializationWasmSymbols : PreSerializationWebSymbols {
             private object CallableIds {
                 private val String.internalCallableId: CallableId
                     get() = CallableId(wasmInternalFqName, Name.identifier(this))
-                val throwUninitializedPropertyAccessException: CallableId =
-                    PreSerializationKlibSymbols.THROW_UNINITIALIZED_PROPERTY_ACCESS_NAME.internalCallableId
-                val throwUnsupportedOperationException: CallableId =
-                    PreSerializationKlibSymbols.THROW_UNSUPPORTED_OPERATION_NAME.internalCallableId
 
                 val suspendCoroutineUninterceptedOrReturn: CallableId = COROUTINE_SUSPEND_OR_RETURN_NAME.internalCallableId
                 val coroutineGetContext: CallableId = PreSerializationKlibSymbols.GET_COROUTINE_CONTEXT_NAME.internalCallableId
@@ -269,10 +255,6 @@ interface PreSerializationNativeSymbols : PreSerializationKlibSymbols {
     open class Impl(irBuiltIns: IrBuiltIns) : PreSerializationNativeSymbols, PreSerializationKlibSymbols.Impl(irBuiltIns) {
         override val asserts: Iterable<IrSimpleFunctionSymbol> = CallableIds.asserts.functionSymbols()
 
-        override val throwUninitializedPropertyAccessException: IrSimpleFunctionSymbol =
-            CallableIds.throwUninitializedPropertyAccessException.functionSymbol()
-        override val throwUnsupportedOperationException: IrSimpleFunctionSymbol =
-            CallableIds.throwUnsupportedOperationException.functionSymbol()
         override val defaultConstructorMarker: IrClassSymbol = ClassIds.defaultConstructorMarker.classSymbol()
         override val isAssertionArgumentEvaluationEnabled: IrSimpleFunctionSymbol =
             CallableIds.isAssertionArgumentEvaluationEnabled.functionSymbol()
@@ -290,10 +272,6 @@ interface PreSerializationNativeSymbols : PreSerializationKlibSymbols {
                 // Internal functions
                 private val String.internalCallableId: CallableId
                     get() = CallableId(kotlinNativeInternalPackageName, Name.identifier(this))
-                val throwUninitializedPropertyAccessException: CallableId =
-                    PreSerializationKlibSymbols.THROW_UNINITIALIZED_PROPERTY_ACCESS_NAME.capitalizeAsciiOnly().internalCallableId
-                val throwUnsupportedOperationException: CallableId =
-                    PreSerializationKlibSymbols.THROW_UNSUPPORTED_OPERATION_NAME.capitalizeAsciiOnly().internalCallableId
                 val suspendCoroutineUninterceptedOrReturn: CallableId = COROUTINE_SUSPEND_OR_RETURN_NAME.internalCallableId
                 val getCoroutineContext: CallableId = PreSerializationKlibSymbols.GET_COROUTINE_CONTEXT_NAME.internalCallableId
 

compiler/testData/codegen/box/delegatedProperty/local/localDelegatedPropertyCall.fir.inlined.ir

@@ -342,7 +342,7 @@ FILE fqName:<root> fileName:/localDelegatedPropertyCall.kt
                       ARG prop: RICH_PROPERTY_REFERENCE type=kotlin.reflect.KProperty0<kotlin.String> origin=PROPERTY_REFERENCE_FOR_DELEGATE reflectionTarget='val x: kotlin.String by (...)'
                         getter: FUN LOCAL_FUNCTION_FOR_LAMBDA name:<get-x> visibility:local modality:FINAL returnType:kotlin.Nothing
                           BLOCK_BODY
-                            CALL 'internal final fun throwUnsupportedOperationException (message: kotlin.String): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null
+                            CALL 'internal final fun throwUnsupportedOperationException (message: kotlin.String): kotlin.Nothing declared in kotlin.internal' type=kotlin.Nothing origin=null
                               ARG message: CONST String type=kotlin.String value="Not supported for local property reference."
             CALL 'local final fun <get-x> (): kotlin.String declared in <root>.box' type=kotlin.String origin=GET_LOCAL_PROPERTY
           CATCH parameter=val e: kotlin.UnsupportedOperationException declared in <root>.box

kotlin-native/runtime/src/main/kotlin/kotlin/native/internal/RuntimeUtils.kt

@@ -79,20 +79,6 @@ internal fun ThrowNoWhenBranchMatchedException(): Nothing {
     throw NoWhenBranchMatchedException()
 }
 
-// TODO KT-79334: Drop this fun after bootstrap update, and use `kotlin.internal.throwUninitializedPropertyAccessException` instead
-@UsedFromCompilerGeneratedCode
-@PublishedApi
-internal fun ThrowUninitializedPropertyAccessException(propertyName: String): Nothing {
-    kotlin.internal.throwUninitializedPropertyAccessException(propertyName)
-}
-
-// TODO KT-79334: Drop this fun after bootstrap update, and use `kotlin.internal.throwUnsupportedOperationException` instead
-@UsedFromCompilerGeneratedCode
-@PublishedApi
-internal fun ThrowUnsupportedOperationException(message: String): Nothing {
-    kotlin.internal.throwUnsupportedOperationException(message)
-}
-
 @ExportForCppRuntime
 internal fun ThrowIllegalArgumentException() : Nothing {
     throw IllegalArgumentException()

libraries/stdlib/common-non-jvm/src/kotlin/internal/ThrowHelpers.kt

@@ -8,10 +8,12 @@ package kotlin.internal
 @Suppress("DEPRECATION_ERROR")
 @PublishedApi
 @SinceKotlin("2.3")
+@UsedFromCompilerGeneratedCode
 internal fun throwUninitializedPropertyAccessException(name: String): Nothing =
     throw UninitializedPropertyAccessException("lateinit property $name has not been initialized")
 
 @PublishedApi
 @SinceKotlin("2.3")
+@UsedFromCompilerGeneratedCode
 internal fun throwUnsupportedOperationException(message: String): Nothing =
     throw UnsupportedOperationException(message)

libraries/stdlib/js/runtime/reflectRuntime.kt

@@ -7,6 +7,7 @@ package kotlin.js
 
 import kotlin.internal.UsedFromCompilerGeneratedCode
 import kotlin.internal.throwIrLinkageError
+import kotlin.internal.throwUnsupportedOperationException
 import kotlin.reflect.KProperty
 
 @UsedFromCompilerGeneratedCode

libraries/tools/binary-compatibility-validator/klib-public-api/kotlin-stdlib.api

@@ -12825,12 +12825,6 @@ final fun kotlin.native.internal/ThrowNullPointerException(): kotlin/Nothing //
 // Targets: [native]
 final fun kotlin.native.internal/ThrowTypeCastException(kotlin/Any, kotlin/String): kotlin/Nothing // kotlin.native.internal/ThrowTypeCastException|ThrowTypeCastException(kotlin.Any;kotlin.String){}[0]
 
-// Targets: [native]
-final fun kotlin.native.internal/ThrowUninitializedPropertyAccessException(kotlin/String): kotlin/Nothing // kotlin.native.internal/ThrowUninitializedPropertyAccessException|ThrowUninitializedPropertyAccessException(kotlin.String){}[0]
-
-// Targets: [native]
-final fun kotlin.native.internal/ThrowUnsupportedOperationException(kotlin/String): kotlin/Nothing // kotlin.native.internal/ThrowUnsupportedOperationException|ThrowUnsupportedOperationException(kotlin.String){}[0]
-
 // Targets: [native]
 final fun kotlin.native.internal/areEqualByValue(kotlin.native.internal/NativePtr, kotlin.native.internal/NativePtr): kotlin/Boolean // kotlin.native.internal/areEqualByValue|areEqualByValue(kotlin.native.internal.NativePtr;kotlin.native.internal.NativePtr){}[0]