Value classes: Generate @JvmInline annotation for inline classes

but not for value classes.
Since inline classes and value classes share the same flag, we use
presence of the annotation to distinguish them.

compiler/backend/src/org/jetbrains/kotlin/codegen/ErasedInlineClassBodyCodegen.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.resolve.InlineClassDescriptorResolver
+import org.jetbrains.kotlin.resolve.JVM_INLINE_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.resolve.descriptorUtil.secondaryConstructors
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.Synthetic
@@ -55,6 +56,13 @@ class ErasedInlineClassBodyCodegen(
         generateUnboxMethod()
         generateFunctionsFromAny()
         generateSpecializedEqualsStub()
+        generateJvmInlineAnnotation()
+    }
+
+    private fun generateJvmInlineAnnotation() {
+        if (descriptor.isInline) {
+            v.newAnnotation(JVM_INLINE_ANNOTATION_FQ_NAME.topLevelClassAsmType().descriptor, true).visitEnd()
+        }
     }
 
     private fun generateFunctionsFromAny() {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -28,7 +28,7 @@ public final class Test : R|kotlin/Any| {
 
 }
 
-public final inline class Z : R|kotlin/Any| {
+@R|kotlin/jvm/JvmInline|() public final inline class Z : R|kotlin/Any| {
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
@@ -41,3 +41,4 @@ public final inline class Z : R|kotlin/Any| {
     public constructor(x: R|kotlin/Int|): R|test/Z|
 
 }
+

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt

@@ -1,4 +1,4 @@
-public final inline class Z : R|kotlin/Any| {
+@R|kotlin/jvm/JvmInline|() public final inline class Z : R|kotlin/Any| {
     public open operator fun equals(other: R|kotlin/Any?|): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
@@ -11,3 +11,4 @@ public final inline class Z : R|kotlin/Any| {
     @R|kotlin/PublishedApi|() internal constructor(value: R|kotlin/Int|): R|test/Z|
 
 }
+

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmSymbols.kt

@@ -8,6 +8,7 @@
 package org.jetbrains.kotlin.backend.jvm
 
 import org.jetbrains.kotlin.backend.common.ir.Symbols
+import org.jetbrains.kotlin.backend.common.ir.addChild
 import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
 import org.jetbrains.kotlin.backend.jvm.intrinsics.IrIntrinsicMethods
 import org.jetbrains.kotlin.builtins.StandardNames
@@ -29,6 +30,7 @@ import org.jetbrains.kotlin.ir.types.*
 import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.JVM_INLINE_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.Variance
@@ -73,6 +75,7 @@ class JvmSymbols(
                 "kotlin.coroutines.jvm.internal" -> kotlinCoroutinesJvmInternalPackage
                 "kotlin.jvm.internal" -> kotlinJvmInternalPackage
                 "kotlin.jvm.functions" -> kotlinJvmFunctionsPackage
+                "kotlin.jvm" -> kotlinJvmPackage
                 "kotlin.reflect" -> kotlinReflectPackage
                 "java.lang" -> javaLangPackage
                 else -> error("Other packages are not supported yet: $fqName")
@@ -392,6 +395,12 @@ class JvmSymbols(
         }
     }
 
+    val jvmInlineAnnotation: IrClassSymbol = createClass(JVM_INLINE_ANNOTATION_FQ_NAME, ClassKind.ANNOTATION_CLASS).apply {
+        owner.addConstructor {
+            isPrimary = true
+        }
+    }
+
     private data class PropertyReferenceKey(
         val mutable: Boolean,
         val parameterCount: Int,

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmInlineClassLowering.kt

@@ -28,10 +28,7 @@ import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
-import org.jetbrains.kotlin.ir.expressions.impl.IrCallImpl
+import org.jetbrains.kotlin.ir.expressions.impl.*
-import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
-import org.jetbrains.kotlin.ir.expressions.impl.IrSetValueImpl
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
 import org.jetbrains.kotlin.ir.transformStatement
 import org.jetbrains.kotlin.ir.types.IrType
@@ -42,6 +39,7 @@ import org.jetbrains.kotlin.ir.util.*
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.JVM_INLINE_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 val jvmInlineClassPhase = makeIrFilePhase(
@@ -98,11 +96,21 @@ private class JvmInlineClassLowering(private val context: JvmBackendContext) : F
             buildBoxFunction(declaration)
             buildUnboxFunction(declaration)
             buildSpecializedEqualsMethod(declaration)
+            addJvmInlineAnnotation(declaration)
         }
 
         return declaration
     }
 
+    private fun addJvmInlineAnnotation(declaration: IrClass) {
+        if (declaration.hasAnnotation(JVM_INLINE_ANNOTATION_FQ_NAME)) return
+        val constructor = context.ir.symbols.jvmInlineAnnotation.constructors.first()
+        declaration.annotations = declaration.annotations + IrConstructorCallImpl.fromSymbolOwner(
+            constructor.owner.returnType,
+            constructor
+        )
+    }
+
     private fun transformFunctionFlat(function: IrFunction): List<IrDeclaration>? {
         if (function.isPrimaryInlineClassConstructor)
             return null

compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt

@@ -66,7 +66,9 @@ class DescriptorSerializer private constructor(
         val builder = ProtoBuf.Class.newBuilder()
 
         val flags = Flags.getClassFlags(
-            hasAnnotations(classDescriptor),
+            // Since 1.4.30 isInline & isValue are the same flag. To distinguish them we generate @JvmInline annotation.
+            // See ClassDescriptor.isInlineClass() function.
+            hasAnnotations(classDescriptor) || classDescriptor.isInline,
             ProtoEnumFlags.descriptorVisibility(normalizeVisibility(classDescriptor)),
             ProtoEnumFlags.modality(classDescriptor.modality),
             ProtoEnumFlags.classKind(classDescriptor.kind, classDescriptor.isCompanionObject),

compiler/testData/codegen/bytecodeListing/inlineClasses/annotatedPropertyWithInlineClassTypeInSignature.txt

@@ -25,6 +25,7 @@ public final class C {
     public final method getReturnType-a_XrcN0(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'annotatedPropertyWithInlineClassTypeInSignature.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/annotationsOnHiddenConstructor.txt

@@ -58,6 +58,7 @@ public final class Test {
     public final inner class Test$Inner
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'annotationsOnHiddenConstructor.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/companionObjectInsideInlineClass.txt

@@ -7,6 +7,7 @@ public final class Foo$Companion {
     public final inner class Foo$Companion
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Foo {
     // source: 'companionObjectInsideInlineClass.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/computablePropertiesInsideInlineClass.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Foo {
     // source: 'computablePropertiesInsideInlineClass.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/constructor.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class IC1 {
     // source: 'constructor.kt'
@@ -16,6 +17,7 @@ public final class IC1 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class IC11 {
     // source: 'constructor.kt'
@@ -34,6 +36,7 @@ public final class IC11 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class IC2 {
     // source: 'constructor.kt'
@@ -52,6 +55,7 @@ public final class IC2 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class IC4 {
     // source: 'constructor.kt'
@@ -70,6 +74,7 @@ public final class IC4 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 final class PIC1 {
     // source: 'constructor.kt'
@@ -88,6 +93,7 @@ final class PIC1 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 final class PIC11 {
     // source: 'constructor.kt'
@@ -106,6 +112,7 @@ final class PIC11 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 final class PIC2 {
     // source: 'constructor.kt'
@@ -124,6 +131,7 @@ final class PIC2 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 final class PIC4 {
     // source: 'constructor.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/constructorsWithDefaultParameterValues.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Test {
     // source: 'constructorsWithDefaultParameterValues.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMethodsInInlineClass.txt

@@ -17,6 +17,7 @@ public interface IFoo {
     public final inner class IFoo$DefaultImpls
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class L {
     // source: 'defaultInterfaceMethodsInInlineClass.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class InlineCharSequence {
     // source: 'inlineCharSequence.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCharSequence_ir.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class InlineCharSequence {
     // source: 'inlineCharSequence.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassMembersVisibility.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'inlineClassMembersVisibility.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassTypeParametersInConstructor.txt

@@ -76,6 +76,7 @@ public abstract class TestSealed {
     public final inner class TestSealed$Case
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'inlineClassTypeParametersInConstructor.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithInlineClassUnderlyingType.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z1 {
     // source: 'inlineClassWithInlineClassUnderlyingType.kt'
@@ -16,6 +17,7 @@ public final class Z1 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z2 {
     // source: 'inlineClassWithInlineClassUnderlyingType.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineClassWithManyKindsOfMembers.txt

@@ -56,6 +56,7 @@ public interface IFoo {
     public abstract method setOverridingVar(p0: int): void
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'inlineClassWithManyKindsOfMembers.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class UInt {
     // source: 'UIntArrayWithFullJdk.kt'
@@ -16,6 +17,7 @@ public final class UInt {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class UIntArray {
     // source: 'UIntArrayWithFullJdk.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/inlineCollection/UIntArrayWithFullJdk_ir.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class UInt {
     // source: 'UIntArrayWithFullJdk.kt'
@@ -16,6 +17,7 @@ public final class UInt {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class UIntArray {
     // source: 'UIntArrayWithFullJdk.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/javaDefaultInterfaceMember.txt

@@ -23,6 +23,7 @@ public interface KFooUnrelated {
     public abstract method foo(): void
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Test1 {
     // source: 'javaDefaultInterfaceMember.kt'
@@ -41,6 +42,7 @@ public final class Test1 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Test2 {
     // source: 'javaDefaultInterfaceMember.kt'
@@ -59,6 +61,7 @@ public final class Test2 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Test3 {
     // source: 'javaDefaultInterfaceMember.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/jvmName.txt

@@ -6,6 +6,7 @@ public final class C {
     public final @kotlin.jvm.JvmName @org.jetbrains.annotations.NotNull method test(@org.jetbrains.annotations.NotNull p0: java.lang.Object): java.lang.Object
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Foo {
     // source: 'jvmName.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.txt

@@ -6,6 +6,7 @@ public final class JvmOverloadsOnTopLevelFunctionReturningInlineClassValueKt {
     public final static @kotlin.jvm.JvmOverloads method testTopLevelFunction(p0: int): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/memberExtensionProperty.txt

@@ -4,6 +4,7 @@ public interface StrS {
     public abstract method getS(@org.jetbrains.annotations.NotNull p0: java.lang.String): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z1 {
     // source: 'memberExtensionProperty.kt'
@@ -23,6 +24,7 @@ public final class Z1 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z2 {
     // source: 'memberExtensionProperty.kt'
@@ -42,6 +44,7 @@ public final class Z2 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z3 {
     // source: 'memberExtensionProperty.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/noArgConstructorForInlineClassParameter.txt

@@ -8,6 +8,7 @@ public final class Test {
     public final method getZ-a_XrcN0(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'noArgConstructorForInlineClassParameter.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/noBridgesForErasedInlineClass.txt

@@ -4,6 +4,7 @@ public interface A {
     public abstract method foo(p0: java.lang.Object): void
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Foo {
     // source: 'noBridgesForErasedInlineClass.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/nullabilityInExpansion.txt

@@ -19,6 +19,7 @@ public final class NullabilityInExpansionKt {
     public final static @org.jetbrains.annotations.NotNull method zwrapNbox(p0: int): Z1
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Q1 {
     // source: 'nullabilityInExpansion.kt'
@@ -37,6 +38,7 @@ public final class Q1 {
     public synthetic final method unbox-impl(): java.lang.Integer
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Q2 {
     // source: 'nullabilityInExpansion.kt'
@@ -55,6 +57,7 @@ public final class Q2 {
     public synthetic final method unbox-impl(): java.lang.Integer
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class QN {
     // source: 'nullabilityInExpansion.kt'
@@ -73,6 +76,7 @@ public final class QN {
     public synthetic final method unbox-impl(): Q1
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class S1 {
     // source: 'nullabilityInExpansion.kt'
@@ -91,6 +95,7 @@ public final class S1 {
     public synthetic final method unbox-impl(): java.lang.String
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class S2 {
     // source: 'nullabilityInExpansion.kt'
@@ -109,6 +114,7 @@ public final class S2 {
     public synthetic final method unbox-impl(): java.lang.String
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class SN {
     // source: 'nullabilityInExpansion.kt'
@@ -127,6 +133,7 @@ public final class SN {
     public synthetic final method unbox-impl(): java.lang.String
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class SN2 {
     // source: 'nullabilityInExpansion.kt'
@@ -145,6 +152,7 @@ public final class SN2 {
     public synthetic final method unbox-impl(): java.lang.String
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class W1 {
     // source: 'nullabilityInExpansion.kt'
@@ -163,6 +171,7 @@ public final class W1 {
     public synthetic final method unbox-impl(): java.lang.String
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class W2 {
     // source: 'nullabilityInExpansion.kt'
@@ -181,6 +190,7 @@ public final class W2 {
     public synthetic final method unbox-impl(): java.lang.String
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class WN {
     // source: 'nullabilityInExpansion.kt'
@@ -199,6 +209,7 @@ public final class WN {
     public synthetic final method unbox-impl(): W1
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z1 {
     // source: 'nullabilityInExpansion.kt'
@@ -217,6 +228,7 @@ public final class Z1 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z2 {
     // source: 'nullabilityInExpansion.kt'
@@ -235,6 +247,7 @@ public final class Z2 {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class ZN {
     // source: 'nullabilityInExpansion.kt'
@@ -253,6 +266,7 @@ public final class ZN {
     public synthetic final method unbox-impl(): Z1
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class ZN2 {
     // source: 'nullabilityInExpansion.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/nullableAndNotNullPrimitive.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class IC {
     // source: 'nullableAndNotNullPrimitive.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/overridingGenericMethodWithInlineClassParameterType.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class CFoo {
     // source: 'overridingGenericMethodWithInlineClassParameterType.kt'
@@ -25,6 +26,7 @@ public interface IFoo {
     public abstract method foo(p0: java.lang.Object): void
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'overridingGenericMethodWithInlineClassParameterType.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/overridingGenericMethodWithInlineClassReturnType.txt

@@ -4,6 +4,7 @@ public interface A {
     public abstract method foo(): java.lang.Object
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Foo {
     // source: 'overridingGenericMethodWithInlineClassReturnType.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/primaryValsWithDifferentVisibilities.txt

@@ -4,6 +4,7 @@ public interface IValue {
     public abstract method getValue(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class TestInternal {
     // source: 'primaryValsWithDifferentVisibilities.kt'
@@ -21,6 +22,7 @@ public final class TestInternal {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class TestOverriding {
     // source: 'primaryValsWithDifferentVisibilities.kt'
@@ -39,6 +41,7 @@ public final class TestOverriding {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class TestPrivate {
     // source: 'primaryValsWithDifferentVisibilities.kt'
@@ -56,6 +59,7 @@ public final class TestPrivate {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class TestPublic {
     // source: 'primaryValsWithDifferentVisibilities.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/publishedApiAnnotationOnInlineClassConstructor.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Z {
     // source: 'publishedApiAnnotationOnInlineClassConstructor.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/shapeOfInlineClassWithPrimitive.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class Foo {
     // source: 'shapeOfInlineClassWithPrimitive.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/new.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class test/IC {
     // source: 'new.kt'

compiler/testData/codegen/bytecodeListing/inlineClasses/stdlibManglingIn1430/old.txt

@@ -4,6 +4,7 @@ public final class kotlin/_2Kt {
     public final static method foo-wfSZ3cc(p0: int, p1: int): void
 }
 
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class test/IC {
     // source: '1.kt'

compiler/testData/codegen/bytecodeListing/kt42879.txt

@@ -1,3 +1,4 @@
+@kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class A {
     // source: 'kt42879.kt'

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverrideWithInlineClass/InlineIntOverridesObject.txt

@@ -14,7 +14,7 @@ public open class KFooZ : test.IFoo<test.Z> {
     public open fun foo(): test.Z
 }
 
-public final value class Z {
+@kotlin.jvm.JvmInline public final value class Z {
     public constructor Z(/*0*/ kotlin.Int)
     public final val value: kotlin.Int
 }

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclaration.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class Foo {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class Foo {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,21 +19,21 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    public final value enum class InlineEnum : kotlin.Enum<kotlin.InlineEnum> {
+        public final value enum class InlineEnum : kotlin.Enum<kotlin.jvm.InlineEnum> {
             private constructor InlineEnum()
             public final override /*1*/ /*fake_override*/ val name: kotlin.String
             public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
             protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineEnum): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.jvm.InlineEnum): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.InlineEnum!>!
+            public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.jvm.InlineEnum!>!
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
             // Static members
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineEnum
+            public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.jvm.InlineEnum
-        public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineEnum>
+            public final /*synthesized*/ fun values(): kotlin.Array<kotlin.jvm.InlineEnum>
         }
 
         public value interface InlineInterface {
@@ -54,3 +56,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: -InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: -InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final value class Foo {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
@@ -17,21 +19,21 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    public final value enum class InlineEnum : kotlin.Enum<kotlin.InlineEnum> {
+        public final value enum class InlineEnum : kotlin.Enum<kotlin.jvm.InlineEnum> {
             private constructor InlineEnum()
             public final override /*1*/ /*fake_override*/ val name: kotlin.String
             public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
             protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.InlineEnum): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kotlin.jvm.InlineEnum): kotlin.Int
             public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
-        public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.InlineEnum!>!
+            public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<kotlin.jvm.InlineEnum!>!
             public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 
             // Static members
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.InlineEnum
+            public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kotlin.jvm.InlineEnum
-        public final /*synthesized*/ fun values(): kotlin.Array<kotlin.InlineEnum>
+            public final /*synthesized*/ fun values(): kotlin.Array<kotlin.jvm.InlineEnum>
         }
 
         public value object InlineObject {
@@ -48,10 +50,11 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class NotVal {
+        @kotlin.jvm.JvmInline public final value class NotVal {
             public constructor NotVal(/*0*/ x: kotlin.Int)
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final annotation class JvmInline : kotlin.Annotation {
             public constructor JvmInline()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -11,7 +13,7 @@ package kotlin {
 
         public final class TestErr1 {
             public constructor TestErr1(/*0*/ a: kotlin.Int)
-        public constructor TestErr1(/*0*/ x: kotlin.X)
+            public constructor TestErr1(/*0*/ x: kotlin.jvm.X)
             public final val a: kotlin.Int
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -20,8 +22,8 @@ package kotlin {
 
         public final class TestErr2 {
             public constructor TestErr2(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
-        public constructor TestErr2(/*0*/ x: kotlin.X)
+            public constructor TestErr2(/*0*/ x: kotlin.jvm.X)
-        public constructor TestErr2(/*0*/ z: kotlin.Z)
+            public constructor TestErr2(/*0*/ z: kotlin.jvm.Z)
             public final val a: kotlin.Int
             public final val b: kotlin.Int
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -31,7 +33,7 @@ package kotlin {
 
         public final class TestOk1 {
             public constructor TestOk1(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
-        public constructor TestOk1(/*0*/ x: kotlin.X)
+            public constructor TestOk1(/*0*/ x: kotlin.jvm.X)
             public final val a: kotlin.Int
             public final val b: kotlin.Int
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -39,7 +41,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class X {
+        @kotlin.jvm.JvmInline public final value class X {
             public constructor X(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -47,7 +49,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Z {
+        @kotlin.jvm.JvmInline public final value class Z {
             public constructor Z(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -55,3 +57,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final annotation class JvmInline : kotlin.Annotation {
             public constructor JvmInline()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -43,7 +45,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Z {
+        @kotlin.jvm.JvmInline public final value class Z {
             public constructor Z(/*0*/ data: kotlin.Int)
             public final val data: kotlin.Int
             public final val testVal: kotlin.Int
@@ -55,3 +57,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.txt

@@ -1,30 +1,32 @@
 package
 
 package kotlin {
-    public fun testFunVsExt(/*0*/ x: kotlin.X): kotlin.Unit
+
+    package kotlin.jvm {
+        public fun testFunVsExt(/*0*/ x: kotlin.jvm.X): kotlin.Unit
         public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Unit
-    public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.X): kotlin.Unit
+        public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.jvm.X): kotlin.Unit
-    public fun testMixed(/*0*/ x: kotlin.X, /*1*/ y: kotlin.Int): kotlin.Unit
+        public fun testMixed(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.Int): kotlin.Unit
-    public fun testMixed(/*0*/ x: kotlin.X, /*1*/ y: kotlin.X): kotlin.Unit
+        public fun testMixed(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.jvm.X): kotlin.Unit
-    public fun testNewType(/*0*/ name: kotlin.Name): kotlin.Unit
+        public fun testNewType(/*0*/ name: kotlin.jvm.Name): kotlin.Unit
-    public fun testNewType(/*0*/ s: kotlin.Str): kotlin.Unit
+        public fun testNewType(/*0*/ s: kotlin.jvm.Str): kotlin.Unit
-    public fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: kotlin.X, /*1*/ y: T): kotlin.Unit
+        public fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: T): kotlin.Unit
-    public fun testNonGenericVsGeneric(/*0*/ x: kotlin.X, /*1*/ y: kotlin.Number): kotlin.Unit
+        public fun testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.Number): kotlin.Unit
-    public fun testNullableVsNonNull1(/*0*/ s: kotlin.Str): kotlin.Unit
+        public fun testNullableVsNonNull1(/*0*/ s: kotlin.jvm.Str): kotlin.Unit
-    public fun testNullableVsNonNull1(/*0*/ s: kotlin.Str?): kotlin.Unit
+        public fun testNullableVsNonNull1(/*0*/ s: kotlin.jvm.Str?): kotlin.Unit
-    public fun testNullableVsNonNull2(/*0*/ ns: kotlin.NStr): kotlin.Unit
+        public fun testNullableVsNonNull2(/*0*/ ns: kotlin.jvm.NStr): kotlin.Unit
-    public fun testNullableVsNonNull2(/*0*/ ns: kotlin.NStr?): kotlin.Unit
+        public fun testNullableVsNonNull2(/*0*/ ns: kotlin.jvm.NStr?): kotlin.Unit
-    public fun testSimple(/*0*/ x: kotlin.X): kotlin.Unit
+        public fun testSimple(/*0*/ x: kotlin.jvm.X): kotlin.Unit
-    public fun testSimple(/*0*/ z: kotlin.Z): kotlin.Unit
+        public fun testSimple(/*0*/ z: kotlin.jvm.Z): kotlin.Unit
-    public fun kotlin.X.testFunVsExt(): kotlin.Unit
+        public fun kotlin.jvm.X.testFunVsExt(): kotlin.Unit
 
         public final class C</*0*/ TC : kotlin.Number> {
             public constructor C</*0*/ TC : kotlin.Number>()
             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 final fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: kotlin.X, /*1*/ y: T): kotlin.Unit
+            public final fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: T): kotlin.Unit
-        public final fun testNonGenericVsGeneric(/*0*/ x: kotlin.X, /*1*/ y: TC): kotlin.Unit
+            public final fun testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: TC): kotlin.Unit
-        public final fun testNonGenericVsGeneric(/*0*/ x: kotlin.X, /*1*/ y: kotlin.Number): kotlin.Unit
+            public final fun testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.Number): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
@@ -35,7 +37,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class NStr {
+        @kotlin.jvm.JvmInline public final value class NStr {
             public constructor NStr(/*0*/ str: kotlin.String?)
             public final val str: kotlin.String?
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -43,7 +45,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Name {
+        @kotlin.jvm.JvmInline public final value class Name {
             public constructor Name(/*0*/ name: kotlin.String)
             public final val name: kotlin.String
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -51,7 +53,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Str {
+        @kotlin.jvm.JvmInline public final value class Str {
             public constructor Str(/*0*/ str: kotlin.String)
             public final val str: kotlin.String
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -59,7 +61,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class X {
+        @kotlin.jvm.JvmInline public final value class X {
             public constructor X(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -67,7 +69,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Z {
+        @kotlin.jvm.JvmInline public final value class Z {
             public constructor Z(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -75,3 +77,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.kt

@@ -1,7 +1,7 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesConflictOnInheritance.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final annotation class JvmInline : kotlin.Annotation {
             public constructor JvmInline()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -9,7 +11,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Name {
+        @kotlin.jvm.JvmInline public final value class Name {
             public constructor Name(/*0*/ name: kotlin.String)
             public final val name: kotlin.String
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,22 +19,22 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    public interface NameAndPasswordVerifier : kotlin.NameVerifier, kotlin.PasswordVerifier {
+        public interface NameAndPasswordVerifier : kotlin.jvm.NameVerifier, kotlin.jvm.PasswordVerifier {
             public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-        public abstract override /*1*/ /*fake_override*/ fun verify(/*0*/ name: kotlin.Name): kotlin.Unit
+            public abstract override /*1*/ /*fake_override*/ fun verify(/*0*/ name: kotlin.jvm.Name): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun verify(/*0*/ password: kotlin.Password): kotlin.Unit
+            public abstract override /*1*/ /*fake_override*/ fun verify(/*0*/ password: kotlin.jvm.Password): kotlin.Unit
         }
 
         public interface NameVerifier {
             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 fun verify(/*0*/ name: kotlin.Name): kotlin.Unit
+            public abstract fun verify(/*0*/ name: kotlin.jvm.Name): kotlin.Unit
         }
 
-    @kotlin.JvmInline public final value class Password {
+        @kotlin.jvm.JvmInline public final value class Password {
             public constructor Password(/*0*/ password: kotlin.String)
             public final val password: kotlin.String
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -44,6 +46,7 @@ package kotlin {
             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 fun verify(/*0*/ password: kotlin.Password): kotlin.Unit
+            public abstract fun verify(/*0*/ password: kotlin.jvm.Password): kotlin.Unit
+        }
     }
 }

compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/identityComparisonWithValueClasses.txt

@@ -1,9 +1,11 @@
 package
 
 package kotlin {
-    public fun test(/*0*/ f1: kotlin.Foo, /*1*/ f2: kotlin.Foo, /*2*/ b1: kotlin.Bar, /*3*/ fn1: kotlin.Foo?, /*4*/ fn2: kotlin.Foo?): kotlin.Unit
 
-    @kotlin.JvmInline public final value class Bar {
+    package kotlin.jvm {
+        public fun test(/*0*/ f1: kotlin.jvm.Foo, /*1*/ f2: kotlin.jvm.Foo, /*2*/ b1: kotlin.jvm.Bar, /*3*/ fn1: kotlin.jvm.Foo?, /*4*/ fn2: kotlin.jvm.Foo?): kotlin.Unit
+
+        @kotlin.jvm.JvmInline public final value class Bar {
             public constructor Bar(/*0*/ y: kotlin.String)
             public final val y: kotlin.String
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -11,7 +13,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Foo {
+        @kotlin.jvm.JvmInline public final value class Foo {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -26,3 +28,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/jvmInlineApplicability.txt

@@ -2,30 +2,32 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final class C {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final class C {
             public constructor C()
             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
         }
 
-    @kotlin.JvmInline public final data class DC {
+        @kotlin.jvm.JvmInline public final data class DC {
             public constructor DC(/*0*/ a: kotlin.Any)
             public final val a: kotlin.Any
             public final operator /*synthesized*/ fun component1(): kotlin.Any
-        public final /*synthesized*/ fun copy(/*0*/ a: kotlin.Any = ...): kotlin.DC
+            public final /*synthesized*/ fun copy(/*0*/ a: kotlin.Any = ...): kotlin.jvm.DC
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public interface I {
+        @kotlin.jvm.JvmInline public interface I {
             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
         }
 
-    @kotlin.JvmInline public final inline class IC {
+        @kotlin.jvm.JvmInline public final inline class IC {
             public constructor IC(/*0*/ a: kotlin.Any)
             public final val a: kotlin.Any
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -40,14 +42,14 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public object O {
+        @kotlin.jvm.JvmInline public object O {
             private constructor O()
             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
         }
 
-    @kotlin.JvmInline public final value class VC {
+        @kotlin.jvm.JvmInline public final value class VC {
             public constructor VC(/*0*/ a: kotlin.Any)
             public final val a: kotlin.Any
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -55,3 +57,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/lateinitValueClasses.txt

@@ -1,10 +1,12 @@
 package
 
 package kotlin {
-    public lateinit var a: kotlin.Foo
+
+    package kotlin.jvm {
+        public lateinit var a: kotlin.jvm.Foo
         public fun foo(): kotlin.Unit
 
-    @kotlin.JvmInline public final value class Foo {
+        @kotlin.jvm.JvmInline public final value class Foo {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -19,3 +21,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt

@@ -2,7 +2,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FIR_IDENTICAL
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class Foo {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class Foo {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,3 +19,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // FIR_IDENTICAL
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class ConstructorWithDefaultVisibility {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class ConstructorWithDefaultVisibility {
             public constructor ConstructorWithDefaultVisibility(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -10,7 +12,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class InternalConstructor {
+        @kotlin.jvm.JvmInline public final value class InternalConstructor {
             internal constructor InternalConstructor(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -25,7 +27,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class PrivateConstructor {
+        @kotlin.jvm.JvmInline public final value class PrivateConstructor {
             private constructor PrivateConstructor(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -33,7 +35,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class ProtectedConstructor {
+        @kotlin.jvm.JvmInline public final value class ProtectedConstructor {
             protected constructor ProtectedConstructor(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -41,7 +43,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class PublicConstructor {
+        @kotlin.jvm.JvmInline public final value class PublicConstructor {
             public constructor PublicConstructor(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -49,3 +51,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/propertiesWithBackingFieldsInsideValueClass.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public interface A {
             public abstract val goodSize: kotlin.Int
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -16,7 +18,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Foo : kotlin.A, kotlin.B {
+        @kotlin.jvm.JvmInline public final value class Foo : kotlin.jvm.A, kotlin.jvm.B {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val a0: kotlin.Int
             public final val a1: kotlin.Int = 0
@@ -38,3 +40,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/recursiveValueClasses.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class Id</*0*/ T> {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class Id</*0*/ T> {
             public constructor Id</*0*/ T>(/*0*/ x: T)
             public final val x: T
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,91 +19,92 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test1 {
+        @kotlin.jvm.JvmInline public final value class Test1 {
-        public constructor Test1(/*0*/ x: kotlin.Test1)
+            public constructor Test1(/*0*/ x: kotlin.jvm.Test1)
-        public final val x: kotlin.Test1
+            public final val x: kotlin.jvm.Test1
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test2A {
+        @kotlin.jvm.JvmInline public final value class Test2A {
-        public constructor Test2A(/*0*/ x: kotlin.Test2B)
+            public constructor Test2A(/*0*/ x: kotlin.jvm.Test2B)
-        public final val x: kotlin.Test2B
+            public final val x: kotlin.jvm.Test2B
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test2B {
+        @kotlin.jvm.JvmInline public final value class Test2B {
-        public constructor Test2B(/*0*/ x: kotlin.Test2A)
+            public constructor Test2B(/*0*/ x: kotlin.jvm.Test2A)
-        public final val x: kotlin.Test2A
+            public final val x: kotlin.jvm.Test2A
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test3A {
+        @kotlin.jvm.JvmInline public final value class Test3A {
-        public constructor Test3A(/*0*/ x: kotlin.Test3B)
+            public constructor Test3A(/*0*/ x: kotlin.jvm.Test3B)
-        public final val x: kotlin.Test3B
+            public final val x: kotlin.jvm.Test3B
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test3B {
+        @kotlin.jvm.JvmInline public final value class Test3B {
-        public constructor Test3B(/*0*/ x: kotlin.Test3C)
+            public constructor Test3B(/*0*/ x: kotlin.jvm.Test3C)
-        public final val x: kotlin.Test3C
+            public final val x: kotlin.jvm.Test3C
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test3C {
+        @kotlin.jvm.JvmInline public final value class Test3C {
-        public constructor Test3C(/*0*/ x: kotlin.Test3A)
+            public constructor Test3C(/*0*/ x: kotlin.jvm.Test3A)
-        public final val x: kotlin.Test3A
+            public final val x: kotlin.jvm.Test3A
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestNullable {
+        @kotlin.jvm.JvmInline public final value class TestNullable {
-        public constructor TestNullable(/*0*/ x: kotlin.TestNullable?)
+            public constructor TestNullable(/*0*/ x: kotlin.jvm.TestNullable?)
-        public final val x: kotlin.TestNullable?
+            public final val x: kotlin.jvm.TestNullable?
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestRecursionInArray {
+        @kotlin.jvm.JvmInline public final value class TestRecursionInArray {
-        public constructor TestRecursionInArray(/*0*/ x: kotlin.Array<kotlin.TestRecursionInArray>)
+            public constructor TestRecursionInArray(/*0*/ x: kotlin.Array<kotlin.jvm.TestRecursionInArray>)
-        public final val x: kotlin.Array<kotlin.TestRecursionInArray>
+            public final val x: kotlin.Array<kotlin.jvm.TestRecursionInArray>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestRecursionInTypeArguments {
+        @kotlin.jvm.JvmInline public final value class TestRecursionInTypeArguments {
-        public constructor TestRecursionInTypeArguments(/*0*/ x: kotlin.collections.List<kotlin.TestRecursionInTypeArguments>)
+            public constructor TestRecursionInTypeArguments(/*0*/ x: kotlin.collections.List<kotlin.jvm.TestRecursionInTypeArguments>)
-        public final val x: kotlin.collections.List<kotlin.TestRecursionInTypeArguments>
+            public final val x: kotlin.collections.List<kotlin.jvm.TestRecursionInTypeArguments>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestRecursionInUpperBounds</*0*/ T : kotlin.TestRecursionInUpperBounds<T>> {
+        @kotlin.jvm.JvmInline public final value class TestRecursionInUpperBounds</*0*/ T : kotlin.jvm.TestRecursionInUpperBounds<T>> {
-        public constructor TestRecursionInUpperBounds</*0*/ T : kotlin.TestRecursionInUpperBounds<T>>(/*0*/ x: T)
+            public constructor TestRecursionInUpperBounds</*0*/ T : kotlin.jvm.TestRecursionInUpperBounds<T>>(/*0*/ x: T)
             public final val x: T
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestRecursionThroughId {
+        @kotlin.jvm.JvmInline public final value class TestRecursionThroughId {
-        public constructor TestRecursionThroughId(/*0*/ x: kotlin.Id<kotlin.TestRecursionThroughId>)
+            public constructor TestRecursionThroughId(/*0*/ x: kotlin.jvm.Id<kotlin.jvm.TestRecursionThroughId>)
-        public final val x: kotlin.Id<kotlin.TestRecursionThroughId>
+            public final val x: kotlin.jvm.Id<kotlin.jvm.TestRecursionThroughId>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class IC1 {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class IC1 {
             public constructor IC1(/*0*/ x: kotlin.Any)
             public final val x: kotlin.Any
             public final fun box(): kotlin.Unit
@@ -14,7 +16,7 @@ package kotlin {
             public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
         }
 
-    @kotlin.JvmInline public final value class IC2 {
+        @kotlin.jvm.JvmInline public final value class IC2 {
             public constructor IC2(/*0*/ x: kotlin.Any)
             public final val x: kotlin.Any
             public final fun box(): kotlin.Any
@@ -28,7 +30,7 @@ package kotlin {
             public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
         }
 
-    @kotlin.JvmInline public final value class IC3 {
+        @kotlin.jvm.JvmInline public final value class IC3 {
             public constructor IC3(/*0*/ x: kotlin.Any)
             public final val x: kotlin.Any
             public final fun box(/*0*/ x: kotlin.Any): kotlin.Any
@@ -39,7 +41,7 @@ package kotlin {
             public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Any
         }
 
-    @kotlin.JvmInline public final value class IC4 : kotlin.WithBox {
+        @kotlin.jvm.JvmInline public final value class IC4 : kotlin.jvm.WithBox {
             public constructor IC4(/*0*/ s: kotlin.String)
             public final val s: kotlin.String
             public open override /*1*/ fun box(): kotlin.String
@@ -48,7 +50,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class IC5 {
+        @kotlin.jvm.JvmInline public final value class IC5 {
             public constructor IC5(/*0*/ i: kotlin.Int)
             public constructor IC5(/*0*/ a: kotlin.String)
             public final val a: kotlin.String
@@ -71,3 +73,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassCanOnlyImplementInterfaces.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public abstract class AbstractBaseClass {
             public constructor AbstractBaseClass()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -29,7 +31,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestExtendsAbstractClass : kotlin.AbstractBaseClass {
+        @kotlin.jvm.JvmInline public final value class TestExtendsAbstractClass : kotlin.jvm.AbstractBaseClass {
             public constructor TestExtendsAbstractClass(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,7 +39,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestExtendsOpenClass : kotlin.OpenBaseClass {
+        @kotlin.jvm.JvmInline public final value class TestExtendsOpenClass : kotlin.jvm.OpenBaseClass {
             public constructor TestExtendsOpenClass(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -45,7 +47,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class TestImplementsInterface : kotlin.BaseInterface {
+        @kotlin.jvm.JvmInline public final value class TestImplementsInterface : kotlin.jvm.BaseInterface {
             public constructor TestImplementsInterface(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -53,3 +55,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassCannotImplementInterfaceByDelegation.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    public object FooImpl : kotlin.IFoo {
+    package kotlin.jvm {
+
+        public object FooImpl : kotlin.jvm.IFoo {
             private constructor FooImpl()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -22,7 +24,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test1 : kotlin.IFoo {
+        @kotlin.jvm.JvmInline public final value class Test1 : kotlin.jvm.IFoo {
             public constructor Test1(/*0*/ x: kotlin.Any)
             public final val x: kotlin.Any
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -30,11 +32,12 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test2 : kotlin.IFoo {
+        @kotlin.jvm.JvmInline public final value class Test2 : kotlin.jvm.IFoo {
-        public constructor Test2(/*0*/ x: kotlin.IFoo)
+            public constructor Test2(/*0*/ x: kotlin.jvm.IFoo)
-        public final val x: kotlin.IFoo
+            public final val x: kotlin.jvm.IFoo
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.kt

@@ -1,7 +1,7 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassConstructorParameterWithDefaultValue.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final annotation class JvmInline : kotlin.Annotation {
             public constructor JvmInline()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -9,7 +11,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Test {
+        @kotlin.jvm.JvmInline public final value class Test {
             public constructor Test(/*0*/ x: kotlin.Int = ...)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,3 +19,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassDeclarationCheck.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class A0 {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class A0 {
             public constructor A0(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -10,28 +12,28 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A1 {
+        @kotlin.jvm.JvmInline public final value class A1 {
             public constructor A1()
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A2 {
+        @kotlin.jvm.JvmInline public final value class A2 {
             public constructor A2()
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A3 {
+        @kotlin.jvm.JvmInline public final value class A3 {
             public constructor A3(/*0*/ x: kotlin.Int)
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A4 {
+        @kotlin.jvm.JvmInline public final value class A4 {
             public constructor A4(/*0*/ x: kotlin.Int)
             public final var x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -39,7 +41,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A5 {
+        @kotlin.jvm.JvmInline public final value class A5 {
             public constructor A5(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
             public final val x: kotlin.Int
             public final val y: kotlin.Int
@@ -48,7 +50,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A6 {
+        @kotlin.jvm.JvmInline public final value class A6 {
             public constructor A6(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
             public final val y: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -56,7 +58,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A7 {
+        @kotlin.jvm.JvmInline public final value class A7 {
             public constructor A7(/*0*/ vararg x: kotlin.Int /*kotlin.IntArray*/)
             public final val x: kotlin.IntArray
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -64,7 +66,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A8 {
+        @kotlin.jvm.JvmInline public final value class A8 {
             public constructor A8(/*0*/ x: kotlin.Int)
             public open val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -72,7 +74,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class A9 {
+        @kotlin.jvm.JvmInline public final value class A9 {
             public constructor A9(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -86,7 +88,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        @kotlin.JvmInline public final value class C2 {
+            @kotlin.jvm.JvmInline public final value class C2 {
                 public constructor C2(/*0*/ x: kotlin.Int)
                 public final val x: kotlin.Int
                 public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -100,7 +102,7 @@ package kotlin {
                 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
                 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-            @kotlin.JvmInline public final value class C1 {
+                @kotlin.jvm.JvmInline public final value class C1 {
                     public constructor C1(/*0*/ x: kotlin.Int)
                     public final val x: kotlin.Int
                     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -116,7 +118,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-        @kotlin.JvmInline public final value class C3 {
+            @kotlin.jvm.JvmInline public final value class C3 {
                 public constructor C3(/*0*/ x: kotlin.Int)
                 public final val x: kotlin.Int
                 public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -125,7 +127,7 @@ package kotlin {
             }
         }
 
-    @kotlin.JvmInline public final value class D0 {
+        @kotlin.jvm.JvmInline public final value class D0 {
             public constructor D0(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -161,7 +163,7 @@ package kotlin {
             public constructor D4(/*0*/ x: kotlin.String)
             public final val x: kotlin.String
             public final operator /*synthesized*/ fun component1(): kotlin.String
-        public final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ...): kotlin.D4
+            public final /*synthesized*/ fun copy(/*0*/ x: kotlin.String = ...): kotlin.jvm.D4
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
@@ -174,3 +176,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.kt

@@ -1,7 +1,7 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassImplementsCollection.txt

@@ -2,6 +2,8 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final annotation class JvmInline : kotlin.Annotation {
             public constructor JvmInline()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -9,7 +11,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class UInt {
+        @kotlin.jvm.JvmInline public final value class UInt {
             public constructor UInt(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,12 +19,12 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class UIntArray : kotlin.collections.Collection<kotlin.UInt> {
+        @kotlin.jvm.JvmInline public final value class UIntArray : kotlin.collections.Collection<kotlin.jvm.UInt> {
             public constructor UIntArray(/*0*/ storage: kotlin.IntArray)
             public open override /*1*/ val size: kotlin.Int
             private final val storage: kotlin.IntArray
-        public open override /*1*/ fun contains(/*0*/ element: kotlin.UInt): kotlin.Boolean
+            public open override /*1*/ fun contains(/*0*/ element: kotlin.jvm.UInt): kotlin.Boolean
-        public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.UInt>): kotlin.Boolean
+            public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.jvm.UInt>): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
             public open override /*1*/ fun isEmpty(): kotlin.Boolean
@@ -30,3 +32,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingType.txt

@@ -2,7 +2,9 @@ package
 
 package kotlin {
 
-    @kotlin.JvmInline public final value class Bar {
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class Bar {
             public constructor Bar(/*0*/ u: kotlin.Unit)
             public final val u: kotlin.Unit
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -10,7 +12,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class BarNullable {
+        @kotlin.jvm.JvmInline public final value class BarNullable {
             public constructor BarNullable(/*0*/ u: kotlin.Unit?)
             public final val u: kotlin.Unit?
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -18,7 +20,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Baz {
+        @kotlin.jvm.JvmInline public final value class Baz {
             public constructor Baz(/*0*/ u: kotlin.Nothing)
             public final val u: kotlin.Nothing
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -26,7 +28,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class BazNullable {
+        @kotlin.jvm.JvmInline public final value class BazNullable {
             public constructor BazNullable(/*0*/ u: kotlin.Nothing?)
             public final val u: kotlin.Nothing?
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -34,7 +36,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class Foo</*0*/ T> {
+        @kotlin.jvm.JvmInline public final value class Foo</*0*/ T> {
             public constructor Foo</*0*/ T>(/*0*/ x: T)
             public final val x: T
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -42,7 +44,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class FooGenericArray</*0*/ T> {
+        @kotlin.jvm.JvmInline public final value class FooGenericArray</*0*/ T> {
             public constructor FooGenericArray</*0*/ T>(/*0*/ x: kotlin.Array<T>)
             public final val x: kotlin.Array<T>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -50,7 +52,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class FooGenericArray2</*0*/ T> {
+        @kotlin.jvm.JvmInline public final value class FooGenericArray2</*0*/ T> {
             public constructor FooGenericArray2</*0*/ T>(/*0*/ x: kotlin.Array<kotlin.Array<T>>)
             public final val x: kotlin.Array<kotlin.Array<T>>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -58,7 +60,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class FooNullable</*0*/ T> {
+        @kotlin.jvm.JvmInline public final value class FooNullable</*0*/ T> {
             public constructor FooNullable</*0*/ T>(/*0*/ x: T?)
             public final val x: T?
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -66,7 +68,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class FooStarProjectedArray {
+        @kotlin.jvm.JvmInline public final value class FooStarProjectedArray {
             public constructor FooStarProjectedArray(/*0*/ x: kotlin.Array<*>)
             public final val x: kotlin.Array<*>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -74,7 +76,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class FooStarProjectedArray2 {
+        @kotlin.jvm.JvmInline public final value class FooStarProjectedArray2 {
             public constructor FooStarProjectedArray2(/*0*/ x: kotlin.Array<kotlin.Array<*>>)
             public final val x: kotlin.Array<kotlin.Array<*>>
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -89,3 +91,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.fir.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 import kotlin.reflect.KClass
 

compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.kt

@@ -1,6 +1,6 @@
 // !LANGUAGE: +InlineClasses
 
-package kotlin
+package kotlin.jvm
 
 import kotlin.reflect.KClass
 

compiler/testData/diagnostics/tests/valueClasses/valueClassesInsideAnnotations.txt

@@ -2,33 +2,35 @@ package
 
 package kotlin {
 
+    package kotlin.jvm {
+
         public final annotation class Ann1 : kotlin.Annotation {
-        public constructor Ann1(/*0*/ a: kotlin.MyInt)
+            public constructor Ann1(/*0*/ a: kotlin.jvm.MyInt)
-        public final val a: kotlin.MyInt
+            public final val a: kotlin.jvm.MyInt
             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 annotation class Ann2 : kotlin.Annotation {
-        public constructor Ann2(/*0*/ a: kotlin.Array<kotlin.MyString>)
+            public constructor Ann2(/*0*/ a: kotlin.Array<kotlin.jvm.MyString>)
-        public final val a: kotlin.Array<kotlin.MyString>
+            public final val a: kotlin.Array<kotlin.jvm.MyString>
             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 annotation class Ann3 : kotlin.Annotation {
-        public constructor Ann3(/*0*/ vararg a: kotlin.MyInt /*kotlin.Array<out kotlin.MyInt>*/)
+            public constructor Ann3(/*0*/ vararg a: kotlin.jvm.MyInt /*kotlin.Array<out kotlin.jvm.MyInt>*/)
-        public final val a: kotlin.Array<out kotlin.MyInt>
+            public final val a: kotlin.Array<out kotlin.jvm.MyInt>
             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 annotation class Ann4 : kotlin.Annotation {
-        public constructor Ann4(/*0*/ a: kotlin.reflect.KClass<kotlin.MyInt>)
+            public constructor Ann4(/*0*/ a: kotlin.reflect.KClass<kotlin.jvm.MyInt>)
-        public final val a: kotlin.reflect.KClass<kotlin.MyInt>
+            public final val a: kotlin.reflect.KClass<kotlin.jvm.MyInt>
             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
@@ -41,7 +43,7 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class MyInt {
+        @kotlin.jvm.JvmInline public final value class MyInt {
             public constructor MyInt(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -49,7 +51,7 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
 
-    @kotlin.JvmInline public final value class MyString {
+        @kotlin.jvm.JvmInline public final value class MyString {
             public constructor MyString(/*0*/ x: kotlin.String)
             public final val x: kotlin.String
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -57,3 +59,4 @@ package kotlin {
             public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.fir.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -UNUSED_ANONYMOUS_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.kt

@@ -1,7 +1,7 @@
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE, -UNUSED_ANONYMOUS_PARAMETER
 
-package kotlin
+package kotlin.jvm
 
 annotation class JvmInline
 

compiler/testData/diagnostics/tests/valueClasses/varargsOnParametersOfValueClassType.txt

@@ -1,35 +1,37 @@
 package
 
 package kotlin {
-    public fun f1(/*0*/ vararg a: kotlin.Foo /*kotlin.Array<out kotlin.Foo>*/): kotlin.Unit
+
-    public fun f2(/*0*/ vararg a: kotlin.Foo? /*kotlin.Array<out kotlin.Foo?>*/): kotlin.Unit
+    package kotlin.jvm {
+        public fun f1(/*0*/ vararg a: kotlin.jvm.Foo /*kotlin.Array<out kotlin.jvm.Foo>*/): kotlin.Unit
+        public fun f2(/*0*/ vararg a: kotlin.jvm.Foo? /*kotlin.Array<out kotlin.jvm.Foo?>*/): kotlin.Unit
 
         public final class A {
             public constructor A()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun f3(/*0*/ a0: kotlin.Int, /*1*/ vararg a1: kotlin.Foo /*kotlin.Array<out kotlin.Foo>*/): kotlin.Unit
+            public final fun f3(/*0*/ a0: kotlin.Int, /*1*/ vararg a1: kotlin.jvm.Foo /*kotlin.Array<out kotlin.jvm.Foo>*/): kotlin.Unit
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
         public final annotation class Ann : kotlin.Annotation {
-        public constructor Ann(/*0*/ vararg f: kotlin.Foo /*kotlin.Array<out kotlin.Foo>*/)
+            public constructor Ann(/*0*/ vararg f: kotlin.jvm.Foo /*kotlin.Array<out kotlin.jvm.Foo>*/)
-        public final val f: kotlin.Array<out kotlin.Foo>
+            public final val f: kotlin.Array<out kotlin.jvm.Foo>
             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 B {
-        public constructor B(/*0*/ vararg s: kotlin.Foo /*kotlin.Array<out kotlin.Foo>*/)
+            public constructor B(/*0*/ vararg s: kotlin.jvm.Foo /*kotlin.Array<out kotlin.jvm.Foo>*/)
-        public constructor B(/*0*/ a: kotlin.Int, /*1*/ vararg s: kotlin.Foo /*kotlin.Array<out kotlin.Foo>*/)
+            public constructor B(/*0*/ a: kotlin.Int, /*1*/ vararg s: kotlin.jvm.Foo /*kotlin.Array<out kotlin.jvm.Foo>*/)
-        public final val s: kotlin.Array<out kotlin.Foo>
+            public final val s: kotlin.Array<out kotlin.jvm.Foo>
             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
         }
 
-    @kotlin.JvmInline public final value class Foo {
+        @kotlin.jvm.JvmInline public final value class Foo {
             public constructor Foo(/*0*/ x: kotlin.Int)
             public final val x: kotlin.Int
             public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -44,3 +46,4 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+}

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -24,7 +24,7 @@ public final class Test {
         public final fun <get-z>(): test.Z
 }
 
-public final value class Z {
+@kotlin.jvm.JvmInline /* annotation class not found */ public final value class Z {
     /*primary*/ public constructor Z(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
         public final fun <get-x>(): kotlin.Int