diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index b5b973c69a3..058ffd30047 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -33705,7 +33705,7 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             @Test
             @TestMetadata("recursiveMultiFieldValueClasses.kt")
             public void testRecursiveMultiFieldValueClasses() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt");
             }
 
             @Test
@@ -33771,7 +33771,7 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             @Test
             @TestMetadata("valueClassWithForbiddenUnderlyingTypeMultiField.kt")
             public void testValueClassWithForbiddenUnderlyingTypeMultiField() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt");
             }
 
             @Test
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 2d7b6b5c48f..5528581ee09 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -33801,7 +33801,7 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             @Test
             @TestMetadata("recursiveMultiFieldValueClasses.kt")
             public void testRecursiveMultiFieldValueClasses() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt");
             }
 
             @Test
@@ -33867,7 +33867,7 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             @Test
             @TestMetadata("valueClassWithForbiddenUnderlyingTypeMultiField.kt")
             public void testValueClassWithForbiddenUnderlyingTypeMultiField() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt");
             }
 
             @Test
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index 80db07a69e0..dd3499d386f 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -33705,7 +33705,7 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             @Test
             @TestMetadata("recursiveMultiFieldValueClasses.kt")
             public void testRecursiveMultiFieldValueClasses() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt");
             }
 
             @Test
@@ -33771,7 +33771,7 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             @Test
             @TestMetadata("valueClassWithForbiddenUnderlyingTypeMultiField.kt")
             public void testValueClassWithForbiddenUnderlyingTypeMultiField() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt");
             }
 
             @Test
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
index 54574cd2cac..08e0c133ba1 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
@@ -20984,7 +20984,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("classLiteralOnInlineClass.kt")
         public void testClassLiteralOnInlineClass() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt");
         }
 
         @Test
@@ -21032,7 +21032,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("constructorImplVisibilityGeneric.kt")
         public void testConstructorImplVisibilityGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt");
         }
 
         @Test
@@ -21464,7 +21464,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("inlineClassBothEqualsOverride.kt")
         public void testInlineClassBothEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt");
         }
 
         @Test
@@ -21482,19 +21482,19 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("inlineClassEqualsConsistency.kt")
         public void testInlineClassEqualsConsistency() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt");
         }
 
         @Test
         @TestMetadata("inlineClassEqualsOverriddenForCollections.kt")
         public void testInlineClassEqualsOverriddenForCollections() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt");
         }
 
         @Test
         @TestMetadata("inlineClassEqualsOverride.kt")
         public void testInlineClassEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt");
         }
 
         @Test
@@ -21584,13 +21584,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("inlineClassTypedEqualsGenerics.kt")
         public void testInlineClassTypedEqualsGenerics() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt");
         }
 
         @Test
         @TestMetadata("inlineClassUntypedEqualsOverriden.kt")
         public void testInlineClassUntypedEqualsOverriden() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt");
         }
 
         @Test
@@ -21740,25 +21740,25 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("inlineInCompanion.kt")
         public void testInlineInCompanion() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt");
         }
 
         @Test
         @TestMetadata("inlineInCompanionGeneric.kt")
         public void testInlineInCompanionGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt");
         }
 
         @Test
         @TestMetadata("inlineOverInlineWithCustomEquals.kt")
         public void testInlineOverInlineWithCustomEquals() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt");
         }
 
         @Test
         @TestMetadata("inlineToString.kt")
         public void testInlineToString() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineToString.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineToString.kt");
         }
 
         @Test
@@ -21800,7 +21800,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("javaPrimitiveTypeIC.kt")
         public void testJavaPrimitiveTypeIC() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
         }
 
         @Test
@@ -21830,13 +21830,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValue() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt");
         }
 
         @Test
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt");
         }
 
         @Test
@@ -21866,7 +21866,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("jvmStaticVarInInlineClassCompanion.kt")
         public void testJvmStaticVarInInlineClassCompanion() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt");
         }
 
         @Test
@@ -22376,13 +22376,13 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("kt54536.kt")
         public void testKt54536() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/kt54536.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/kt54536.kt");
         }
 
         @Test
         @TestMetadata("kt54603.kt")
         public void testKt54603() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/kt54603.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/kt54603.kt");
         }
 
         @Test
@@ -22958,7 +22958,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("useOfInlineClassWithGenericMethodFromJava.kt")
         public void testUseOfInlineClassWithGenericMethodFromJava() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt");
         }
 
         @Test
@@ -32600,7 +32600,7 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("constructorWithMangledParams.kt")
         public void testConstructorWithMangledParams() throws Exception {
-            runTest("compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt");
         }
 
         @Test
@@ -50426,133 +50426,133 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
         @Test
         @TestMetadata("classFlattening.kt")
         public void testClassFlattening() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/classFlattening.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/classFlattening.kt");
         }
 
         @Test
         @TestMetadata("complex.kt")
         public void testComplex() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/complex.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/complex.kt");
         }
 
         @Test
         @TestMetadata("conditionalExpressions.kt")
         public void testConditionalExpressions() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt");
         }
 
         @Test
         @TestMetadata("defaultParameters.kt")
         public void testDefaultParameters() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/defaultParameters.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/defaultParameters.kt");
         }
 
         @Test
         @TestMetadata("delegating.kt")
         public void testDelegating() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/delegating.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/delegating.kt");
         }
 
         @Test
         @TestMetadata("equality.kt")
         public void testEquality() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/equality.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/equality.kt");
         }
 
         @Test
         @TestMetadata("forStatement.kt")
         public void testForStatement() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/forStatement.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/forStatement.kt");
         }
 
         @Test
         @TestMetadata("functionReferences.kt")
         public void testFunctionReferences() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/functionReferences.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/functionReferences.kt");
         }
 
         @Test
         @TestMetadata("mfvcBothEqualsOverride.kt")
         public void testMfvcBothEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt");
         }
 
         @Test
         @TestMetadata("mfvcEqualsConsistency.kt")
         public void testMfvcEqualsConsistency() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt");
         }
 
         @Test
         @TestMetadata("mfvcEqualsOverriddenForCollections.kt")
         public void testMfvcEqualsOverriddenForCollections() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt");
         }
 
         @Test
         @TestMetadata("mfvcEqualsOverride.kt")
         public void testMfvcEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt");
         }
 
         @Test
         @TestMetadata("mfvcFieldInitializationOrder.kt")
         public void testMfvcFieldInitializationOrder() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt");
         }
 
         @Test
         @TestMetadata("mfvcHashCodeOverride.kt")
         public void testMfvcHashCodeOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt");
         }
 
         @Test
         @TestMetadata("mfvcTypedEqualsGenerics.kt")
         public void testMfvcTypedEqualsGenerics() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt");
         }
 
         @Test
         @TestMetadata("mfvcUntypedEqualsOverriden.kt")
         public void testMfvcUntypedEqualsOverriden() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt");
         }
 
         @Test
         @TestMetadata("overrides.kt")
         public void testOverrides() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/overrides.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/overrides.kt");
         }
 
         @Test
         @TestMetadata("overrides_inlineClass.kt")
         public void testOverrides_inlineClass() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt");
         }
 
         @Test
         @TestMetadata("overrides_typeParameters.kt")
         public void testOverrides_typeParameters() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt");
         }
 
         @Test
         @TestMetadata("throwingMFVCReassignments.kt")
         public void testThrowingMFVCReassignments() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt");
         }
 
         @Test
         @TestMetadata("tryExpressions.kt")
         public void testTryExpressions() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/tryExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/tryExpressions.kt");
         }
 
         @Test
         @TestMetadata("visibility.kt")
         public void testVisibility() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/visibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/visibility.kt");
         }
     }
 
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
index f8022aa60d0..bad5caf203f 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.test.runners.codegen;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.utils.TransformersFunctions;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -5804,43 +5803,43 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
         @Test
         @TestMetadata("conditionalExpressions.kt")
         public void testConditionalExpressions() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt");
         }
 
         @Test
         @TestMetadata("equalsBoxTest.kt")
         public void testEqualsBoxTest() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt");
         }
 
         @Test
         @TestMetadata("mfvcDeclaration.kt")
         public void testMfvcDeclaration() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt");
         }
 
         @Test
         @TestMetadata("mfvcReassignments.kt")
         public void testMfvcReassignments() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt");
         }
 
         @Test
         @TestMetadata("passingMFVC2Functions.kt")
         public void testPassingMFVC2Functions() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt");
         }
 
         @Test
         @TestMetadata("regularClassWithMFVC.kt")
         public void testRegularClassWithMFVC() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt");
         }
 
         @Test
         @TestMetadata("tryExpressions.kt")
         public void testTryExpressions() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt");
         }
     }
 
diff --git a/compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt b/compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt
index 16147056b90..79248cf8edd 100644
--- a/compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt
+++ b/compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt
@@ -1,23 +1,22 @@
 // WITH_STDLIB
 // WITH_REFLECT
 // TARGET_BACKEND: JVM
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 package root
 
 import kotlin.reflect.KClass
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IcInt(val x: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IcLong(val l: Long)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IcAny(val a: Any?)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IcOverIc(val o: IcLong)
 
 fun check(c: KClass<*>, s: String) {
diff --git a/compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt b/compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt
index ac62547f1e2..e24562c7c7b 100644
--- a/compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt
+++ b/compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt
@@ -1,21 +1,20 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
 // FULL_JDK
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +GenericInlineClassParameter
 
 import java.lang.reflect.Modifier
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC1<T: Int> public constructor(val i: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC11<T: Int> internal constructor(val i: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC2<T: Int> private constructor(val i: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC4<T: Int> protected constructor(val i: T)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt
index 84b482be7a6..d068479eda3 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt
@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
@@ -9,7 +8,7 @@ interface I {
     fun getVal(): Int
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC1(val x: Int) : I {
     override fun getVal(): Int {
         return x
@@ -31,7 +30,7 @@ value class IC1(val x: Int) : I {
     }
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC2(val y: Int) : I {
     override fun getVal(): Int {
         return y * 10
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt
index 4958d83108f..fd5d016b4c8 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt
@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
@@ -7,14 +6,14 @@
 import java.lang.AssertionError
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC1(val x: Double) {
     fun equals(other: IC1): Boolean {
         return abs(x - other.x) < 0.5
     }
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC2(val x: Int) {
     override fun equals(other: Any?): Boolean {
         if (other !is IC2) {
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt
index 54a66ac87de..908f17f099b 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt
@@ -1,12 +1,11 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC(val x: Double) {
     operator fun equals(other: IC): Boolean {
         return abs(x - other.x) < 0.1
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt
index b042d3ed5b6..5ccd8ea62cb 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt
@@ -1,12 +1,11 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC1(val value: Double) {
     fun equals(other: IC1): Boolean {
         return abs(value - other.value) < 0.1
@@ -17,29 +16,29 @@ interface I {
     fun equals(param: IC2): Boolean
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC2(val value: Int) : I {
     override operator fun equals(param: IC2): Boolean {
         return abs(value - param.value) < 2
     }
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC3(val value: Int) {
 
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC4(val value: Int) {
     override fun equals(other: Any?) = TODO()
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC5(val value: Int) {
     operator fun equals(other: IC5): Nothing = TODO()
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC6(val value: Int) {
     override fun equals(other: Any?): Nothing = TODO()
 }
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt
index 4672d028691..8c3ed3b0e85 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt
@@ -1,10 +1,9 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC1<T : Number>(val x: T) {
     fun equals(other: Int) = false
     fun equals(other: IC1<*>) = true
@@ -12,19 +11,19 @@ value class IC1<T : Number>(val x: T) {
 
 class Generic<T, R>(val x: T, val y: R)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC2<T, R>(val value: Generic<T, R>) {
     fun equals(other: IC1<Double>) = false
     fun equals(other: IC2<*, *>) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC3<T>(val value: T) {
     fun equals(other: Int) = false
     fun equals(other: IC3<*>) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC4<T>(val value: T) {
     fun equals(other: String) = false
     fun equals(other: IC4<*>) = true
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt b/compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt
index 15d7cfa673e..a5421f23a20 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt
@@ -1,12 +1,11 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC(val x: Int) {
     override fun equals(other: Any?): Boolean {
         if (other !is IC) {
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt b/compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt
index 128319eed14..5c1f6468ca3 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt
@@ -1,11 +1,10 @@
 // TARGET_BACKEND: JVM_IR
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // FILE: R.kt
 import kotlin.jvm.JvmInline
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class R(val value: String) {
     companion object {
         inline fun ok() = R("OK")
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt b/compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt
index 49c4ecf0312..b771c827ad6 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt
@@ -1,11 +1,10 @@
 // TARGET_BACKEND: JVM_IR
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +GenericInlineClassParameter
 // FILE: R.kt
 import kotlin.jvm.JvmInline
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class R<T: String>(val value: T) {
     companion object {
         inline fun ok() = R("OK")
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt b/compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt
index 45aad661d7e..1daef70b306 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt
@@ -1,47 +1,46 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A(val x: Int) {
     operator fun equals(other: A) = true
 }
 
 class C
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B1(val x: A)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B2(val x: A?)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class D1(val x: C) {
     operator fun equals(other: D1) = true
 }
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class D2(val x: C?) {
     operator fun equals(other: D2) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class E1(val x: D1)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class E2(val x: D2)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F<T>(val x: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class G<T : D1>(val x: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class H<T>(val x: F<T>)
 
 fun box(): String {
diff --git a/compiler/testData/codegen/box/inlineClasses/inlineToString.kt b/compiler/testData/codegen/box/inlineClasses/inlineToString.kt
index 53ae07aaa68..91258f2deb7 100644
--- a/compiler/testData/codegen/box/inlineClasses/inlineToString.kt
+++ b/compiler/testData/codegen/box/inlineClasses/inlineToString.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM_IR
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 import kotlin.jvm.JvmInline
@@ -9,7 +8,7 @@ open class Expando {
     val expansion: Expansion = Expansion()
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Expansion(val map: MutableMap<String, Any?> = mutableMapOf()) {
     override inline fun toString(): String = "OK"
 }
diff --git a/compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt b/compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt
index def97f44a9a..5918dfd8bd9 100644
--- a/compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt
+++ b/compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt
@@ -1,20 +1,19 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 import kotlin.test.*
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class I(val x: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class JLI(val x: java.lang.Integer)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class U(val x: Unit?)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class N(val x: Nothing?)
 
 val icUnit = U(Unit)
diff --git a/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt b/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt
index 0346c291ac3..e55f762348f 100644
--- a/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt
+++ b/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt
@@ -1,9 +1,8 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Str(val s: String)
 
 @JvmOverloads
diff --git a/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt b/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt
index 4530d3ba6f5..1f94158378d 100644
--- a/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt
+++ b/compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt
@@ -1,9 +1,8 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +GenericInlineClassParameter
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Str<T: String>(val s: T)
 
 @JvmOverloads
diff --git a/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt b/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt
index 35e901d0284..dc285c7fab7 100644
--- a/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt
+++ b/compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt
@@ -1,11 +1,10 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 // FILE: test.kt
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class R(private val r: Int) {
 
     companion object {
diff --git a/compiler/testData/codegen/box/inlineClasses/kt54536.kt b/compiler/testData/codegen/box/inlineClasses/kt54536.kt
index befce671397..a96e786d495 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt54536.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt54536.kt
@@ -1,14 +1,13 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A(val x: Int) {
     operator fun equals(other: A) = x % 5 == other.x % 5
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B(val x: A)
 
 fun box() = if (B(A(0)) == B(A(5))) "OK" else "Fail"
diff --git a/compiler/testData/codegen/box/inlineClasses/kt54603.kt b/compiler/testData/codegen/box/inlineClasses/kt54603.kt
index 7460173184e..36eb51f5011 100644
--- a/compiler/testData/codegen/box/inlineClasses/kt54603.kt
+++ b/compiler/testData/codegen/box/inlineClasses/kt54603.kt
@@ -1,46 +1,45 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 
 class A(x: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B(val a: A) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class C<T>(val t: T) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class D<T : Int>(val t: T) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class E(val d: Double) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F(val e: E) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class G(val e: Int?) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class H(val e: Any?) {
     override fun equals(other: Any?) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class I(val e: E?) {
     override fun equals(other: Any?) = true
 }
diff --git a/compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt b/compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt
index 6382015b5fa..19be6ffeb94 100644
--- a/compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt
+++ b/compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt
@@ -1,11 +1,10 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 // FILE: a.kt
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC(val v: Int) {
     fun <T> getT(): T? = null
 }
diff --git a/compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt b/compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt
index 8ae350438a7..8a4484a3023 100644
--- a/compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt
+++ b/compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt
@@ -1,6 +1,5 @@
 // WITH_REFLECT
 // FULL_JDK
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // TARGET_BACKEND: JVM_IR
 
@@ -9,7 +8,7 @@ import java.lang.reflect.InvocationTargetException
 import kotlin.reflect.jvm.isAccessible
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class IC(val str: String)
 
 class A(val a: IC, val x : String) {
diff --git a/compiler/testData/codegen/box/valueClasses/classFlattening.kt b/compiler/testData/codegen/box/valueClasses/classFlattening.kt
index 8ba2abd774f..29932f2a1e1 100644
--- a/compiler/testData/codegen/box/valueClasses/classFlattening.kt
+++ b/compiler/testData/codegen/box/valueClasses/classFlattening.kt
@@ -1,7 +1,6 @@
 // IGNORE_BACKEND_K2: JVM_IR
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses +ContextReceivers
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
diff --git a/compiler/testData/codegen/box/valueClasses/complex.kt b/compiler/testData/codegen/box/valueClasses/complex.kt
index 872f3498997..f4ad77671cc 100644
--- a/compiler/testData/codegen/box/valueClasses/complex.kt
+++ b/compiler/testData/codegen/box/valueClasses/complex.kt
@@ -2,7 +2,6 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
 // IGNORE_BACKEND: ANDROID, ANDROID_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +ValueClassesSecondaryConstructorWithBody
 
 @JvmInline
diff --git a/compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt b/compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt
index e3cc2964886..baa5afbee69 100644
--- a/compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt
+++ b/compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/box/valueClasses/defaultParameters.kt b/compiler/testData/codegen/box/valueClasses/defaultParameters.kt
index 8acc749a6b5..8e9eb838708 100644
--- a/compiler/testData/codegen/box/valueClasses/defaultParameters.kt
+++ b/compiler/testData/codegen/box/valueClasses/defaultParameters.kt
@@ -1,7 +1,6 @@
 // CHECK_BYTECODE_LISTING
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/box/valueClasses/delegating.kt b/compiler/testData/codegen/box/valueClasses/delegating.kt
index 1642d382694..c4bf53d78ce 100644
--- a/compiler/testData/codegen/box/valueClasses/delegating.kt
+++ b/compiler/testData/codegen/box/valueClasses/delegating.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +ValueClasses
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
diff --git a/compiler/testData/codegen/box/valueClasses/equality.kt b/compiler/testData/codegen/box/valueClasses/equality.kt
index 080e94a61cd..59440fc09c3 100644
--- a/compiler/testData/codegen/box/valueClasses/equality.kt
+++ b/compiler/testData/codegen/box/valueClasses/equality.kt
@@ -1,28 +1,27 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // CHECK_BYTECODE_LISTING
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F1(val x: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F2(val x: UInt)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F3(val x: F1, val y: F2)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F4(val x: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F5(val x: UInt)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F6(val x: String)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A(
     val f1: F1,
     val f2: F2,
@@ -35,7 +34,7 @@ value class A(
     val f9: String,
 )
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B(val a1: A, val a2: A) {
     override fun toString(): String {
         return "OverridenBToString(a1 = $a1, a2 = $a2)"
diff --git a/compiler/testData/codegen/box/valueClasses/forStatement.kt b/compiler/testData/codegen/box/valueClasses/forStatement.kt
index 3c0b96b410e..0e2715fd252 100644
--- a/compiler/testData/codegen/box/valueClasses/forStatement.kt
+++ b/compiler/testData/codegen/box/valueClasses/forStatement.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/box/valueClasses/functionReferences.kt b/compiler/testData/codegen/box/valueClasses/functionReferences.kt
index 6e60e5f11a4..bb2f9ae7959 100644
--- a/compiler/testData/codegen/box/valueClasses/functionReferences.kt
+++ b/compiler/testData/codegen/box/valueClasses/functionReferences.kt
@@ -2,7 +2,6 @@
 // WITH_STDLIB
 // WITH_COROUTINES
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 // FILE: caller.kt
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt b/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt
index 9a68f9a5796..27b887755c4 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt
@@ -1,12 +1,11 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
 var counter = 0
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC(val x: Int, val y: Int) {
 
     fun equals(other: MFVC): Boolean {
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt
index 595cde9d743..84601a51805 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt
@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
@@ -7,14 +6,14 @@
 import java.lang.AssertionError
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC1(val x: Int, val y: Int) {
     fun equals(other: MFVC1): Boolean {
         return abs(x - other.x) < 2 && abs(y - other.y) < 2
     }
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC2(val x: Int, val y: Int) {
     override fun equals(other: Any?): Boolean {
         if (other !is MFVC2) {
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt
index e2262be551c..975e2d5c430 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt
@@ -1,12 +1,11 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC(val x: Double, val y: Int) {
     fun equals(other: MFVC): Boolean {
         return abs(x - other.x) < 0.1
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt
index 77a34c6c86e..aa17ce8bec8 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt
@@ -1,5 +1,4 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
@@ -10,7 +9,7 @@ interface I {
     fun equals(param: MFVC): Boolean
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC(val value: Int, val y: Int) : I {
     override fun equals(param: MFVC): Boolean {
         return abs(value - param.value) < 2
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt b/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt
index af487390b9e..b6d8d467597 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt b/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt
index a71b12798f6..20b063980be 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt
@@ -1,10 +1,9 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A(val value1: MyClass, val value2: MyClass) {
     override fun hashCode() = 42
 }
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt b/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt
index 428deb9e263..7331b6ee3a3 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt
@@ -1,10 +1,9 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC1<T : Number>(val x: T, val other: Int) {
     fun equals(x: Int, other: Int) = false
     fun equals(other: MFVC1<*>) = true
@@ -12,19 +11,19 @@ value class MFVC1<T : Number>(val x: T, val other: Int) {
 
 class Generic<T, R>(val x: T, val y: R)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC2<T, R>(val value: Generic<T, R>, val other: Int) {
     fun equals(value: MFVC1<Double>, other: Int) = false
     fun equals(other: MFVC2<*, *>) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC3<T>(val value: T, val other: Int) {
     fun equals(value: Int, other: Int) = false
     fun equals(other: MFVC3<*>) = true
 }
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC4<T>(val value: T, val other: Int) {
     fun equals(value: Any, other: Int) = false
     fun equals(other: MFVC4<*>) = true
diff --git a/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt b/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt
index 696821a6cf3..32eb5153b6b 100644
--- a/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt
+++ b/compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt
@@ -1,12 +1,11 @@
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses, +CustomEqualsInValueClasses
 // TARGET_BACKEND: JVM_IR
 // CHECK_BYTECODE_LISTING
 
 import kotlin.math.abs
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class MFVC(val x: Int, val y: Int) {
     override fun equals(other: Any?): Boolean {
         if (other !is MFVC) {
diff --git a/compiler/testData/codegen/box/valueClasses/overrides.kt b/compiler/testData/codegen/box/valueClasses/overrides.kt
index 3f46ba9b768..d4b3be263da 100644
--- a/compiler/testData/codegen/box/valueClasses/overrides.kt
+++ b/compiler/testData/codegen/box/valueClasses/overrides.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // CHECK_BYTECODE_LISTING
 
diff --git a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt
index 39d5854b5c9..ee2de8be224 100644
--- a/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt
+++ b/compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // CHECK_BYTECODE_LISTING
 
diff --git a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt
index d789f00b35e..127ceab640b 100644
--- a/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt
+++ b/compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // LANGUAGE: +GenericInlineClassParameter
 // CHECK_BYTECODE_LISTING
diff --git a/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt b/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt
index 7c26792ab85..bea09d86d31 100644
--- a/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt
+++ b/compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt
@@ -1,6 +1,5 @@
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 // CHECK_BYTECODE_LISTING
 // FIR_IDENTICAL
diff --git a/compiler/testData/codegen/box/valueClasses/tryExpressions.kt b/compiler/testData/codegen/box/valueClasses/tryExpressions.kt
index 1046e654b28..b2a4a769b12 100644
--- a/compiler/testData/codegen/box/valueClasses/tryExpressions.kt
+++ b/compiler/testData/codegen/box/valueClasses/tryExpressions.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/box/valueClasses/visibility.kt b/compiler/testData/codegen/box/valueClasses/visibility.kt
index 7114daa6b19..a194f2c73d8 100644
--- a/compiler/testData/codegen/box/valueClasses/visibility.kt
+++ b/compiler/testData/codegen/box/valueClasses/visibility.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
@@ -294,4 +293,4 @@ fun box(): String {
     }
 
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.kt b/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.kt
index 59124bfcae2..482f777ea0d 100644
--- a/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.kt
+++ b/compiler/testData/codegen/bytecodeListing/valueClasses/annotations.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +ValueClasses
 // WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
 // FIR_IDENTICAL
 // TARGET_BACKEND: JVM_IR
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt b/compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt
index 03f521eb0fa..33da491f2d8 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt b/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt
index 139101d6655..a0efdf1c327 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt b/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt
index d45cbd5b1aa..bb88d692dab 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt b/compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt
index 3197831d164..87a5d596b52 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt b/compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt
index c1bee05c110..b0ef7b2a3a3 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt b/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt
index 5c07879f505..6844e395505 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt b/compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt
index b1367a2249e..d629f5d02db 100644
--- a/compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt
+++ b/compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt
@@ -2,7 +2,6 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 @JvmInline
diff --git a/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt b/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt
index c789ce4a158..39ed198e4f8 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt
@@ -1,82 +1,81 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A1(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A1<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B1(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B1<!>, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B1<!>)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A2(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B2<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B2(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A2<!>, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A2<!>)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A3(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B3<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B3(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A3<!>)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A4(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B4<!>, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>B4<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B4(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A4<!>, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A4<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class C4(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>D4?<!>, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>D4?<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class D4(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>D4?<!>, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>C4?<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class E4(val x: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>E4?<!>, val y: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class F4(val x: Int, val y: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>F4?<!>)
 
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A5<T : A5<T>>(val x: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B5<T : B5<T>>(val x: T, val y: T)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A6<T : B6<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T, val y: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B6<T : A6<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A7<T : B7<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T, val y: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B7<T : A7<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T, val y: T)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A8<T : B8<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T?, val y: T?)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B8<T : A8<<!UPPER_BOUND_VIOLATED!>T<!>>>(val x: T?, val y: T?)
 
 interface I1
 interface I2
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class A<T, G : C?>(
     val t1: List<T>,
     val t2: UInt,
@@ -91,8 +90,8 @@ value class A<T, G : C?>(
     val t11: T?,
 ) where T : I1, T : B?, T : I2
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class B(val x: UInt, val a: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A<B, Nothing><!>) : I1, I2
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class C(val x: UInt, val a: <!VALUE_CLASS_CANNOT_BE_RECURSIVE!>A<B, Nothing><!>)
diff --git a/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.txt b/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.txt
index 357efbdb1e5..7fb6124100e 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.txt
+++ b/compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A</*0*/ T : I1, /*1*/ G : C?> where T : B?, T : I2 {
+@kotlin.jvm.JvmInline public final value class A</*0*/ T : I1, /*1*/ G : C?> where T : B?, T : I2 {
     public constructor A</*0*/ T : I1, /*1*/ G : C?>(/*0*/ t1: kotlin.collections.List<T>, /*1*/ t2: kotlin.UInt, /*2*/ t3: kotlin.collections.List<G?>, /*3*/ t4: kotlin.UInt, /*4*/ t5: C, /*5*/ t6: kotlin.Int, /*6*/ t7: B, /*7*/ t8: kotlin.String, /*8*/ t9: T, /*9*/ t10: kotlin.Char, /*10*/ t11: T?) where T : B?, T : I2
     public final val t1: kotlin.collections.List<T>
     public final val t10: kotlin.Char
@@ -18,7 +18,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A1 {
+@kotlin.jvm.JvmInline public final value class A1 {
     public constructor A1(/*0*/ x: A1)
     public final val x: A1
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -26,7 +26,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A2 {
+@kotlin.jvm.JvmInline public final value class A2 {
     public constructor A2(/*0*/ x: B2)
     public final val x: B2
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -34,7 +34,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A3 {
+@kotlin.jvm.JvmInline public final value class A3 {
     public constructor A3(/*0*/ x: B3)
     public final val x: B3
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -42,7 +42,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A4 {
+@kotlin.jvm.JvmInline public final value class A4 {
     public constructor A4(/*0*/ x: B4, /*1*/ y: B4)
     public final val x: B4
     public final val y: B4
@@ -51,7 +51,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A5</*0*/ T : A5<T>> {
+@kotlin.jvm.JvmInline public final value class A5</*0*/ T : A5<T>> {
     public constructor A5</*0*/ T : A5<T>>(/*0*/ x: T)
     public final val x: T
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -59,7 +59,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A6</*0*/ T : B6<T>> {
+@kotlin.jvm.JvmInline public final value class A6</*0*/ T : B6<T>> {
     public constructor A6</*0*/ T : B6<T>>(/*0*/ x: T, /*1*/ y: T)
     public final val x: T
     public final val y: T
@@ -68,7 +68,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A7</*0*/ T : B7<T>> {
+@kotlin.jvm.JvmInline public final value class A7</*0*/ T : B7<T>> {
     public constructor A7</*0*/ T : B7<T>>(/*0*/ x: T, /*1*/ y: T)
     public final val x: T
     public final val y: T
@@ -77,7 +77,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class A8</*0*/ T : B8<T>> {
+@kotlin.jvm.JvmInline public final value class A8</*0*/ T : B8<T>> {
     public constructor A8</*0*/ T : B8<T>>(/*0*/ x: T?, /*1*/ y: T?)
     public final val x: T?
     public final val y: T?
@@ -86,7 +86,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B : I1, I2 {
+@kotlin.jvm.JvmInline public final value class B : I1, I2 {
     public constructor B(/*0*/ x: kotlin.UInt, /*1*/ a: A<B, kotlin.Nothing>)
     public final val a: A<B, kotlin.Nothing>
     public final val x: kotlin.UInt
@@ -95,7 +95,7 @@ package
     public open override /*2*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B1 {
+@kotlin.jvm.JvmInline public final value class B1 {
     public constructor B1(/*0*/ x: B1, /*1*/ y: B1)
     public final val x: B1
     public final val y: B1
@@ -104,7 +104,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B2 {
+@kotlin.jvm.JvmInline public final value class B2 {
     public constructor B2(/*0*/ x: A2, /*1*/ y: A2)
     public final val x: A2
     public final val y: A2
@@ -113,7 +113,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B3 {
+@kotlin.jvm.JvmInline public final value class B3 {
     public constructor B3(/*0*/ x: A3)
     public final val x: A3
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -121,7 +121,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B4 {
+@kotlin.jvm.JvmInline public final value class B4 {
     public constructor B4(/*0*/ x: A4, /*1*/ y: A4)
     public final val x: A4
     public final val y: A4
@@ -130,7 +130,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B5</*0*/ T : B5<T>> {
+@kotlin.jvm.JvmInline public final value class B5</*0*/ T : B5<T>> {
     public constructor B5</*0*/ T : B5<T>>(/*0*/ x: T, /*1*/ y: T)
     public final val x: T
     public final val y: T
@@ -139,7 +139,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B6</*0*/ T : A6<T>> {
+@kotlin.jvm.JvmInline public final value class B6</*0*/ T : A6<T>> {
     public constructor B6</*0*/ T : A6<T>>(/*0*/ x: T)
     public final val x: T
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -147,7 +147,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B7</*0*/ T : A7<T>> {
+@kotlin.jvm.JvmInline public final value class B7</*0*/ T : A7<T>> {
     public constructor B7</*0*/ T : A7<T>>(/*0*/ x: T, /*1*/ y: T)
     public final val x: T
     public final val y: T
@@ -156,7 +156,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class B8</*0*/ T : A8<T>> {
+@kotlin.jvm.JvmInline public final value class B8</*0*/ T : A8<T>> {
     public constructor B8</*0*/ T : A8<T>>(/*0*/ x: T?, /*1*/ y: T?)
     public final val x: T?
     public final val y: T?
@@ -165,7 +165,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class C {
+@kotlin.jvm.JvmInline public final value class C {
     public constructor C(/*0*/ x: kotlin.UInt, /*1*/ a: A<B, kotlin.Nothing>)
     public final val a: A<B, kotlin.Nothing>
     public final val x: kotlin.UInt
@@ -174,7 +174,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class C4 {
+@kotlin.jvm.JvmInline public final value class C4 {
     public constructor C4(/*0*/ x: D4?, /*1*/ y: D4?)
     public final val x: D4?
     public final val y: D4?
@@ -183,7 +183,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class D4 {
+@kotlin.jvm.JvmInline public final value class D4 {
     public constructor D4(/*0*/ x: D4?, /*1*/ y: C4?)
     public final val x: D4?
     public final val y: C4?
@@ -192,7 +192,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class E4 {
+@kotlin.jvm.JvmInline public final value class E4 {
     public constructor E4(/*0*/ x: E4?, /*1*/ y: kotlin.Int)
     public final val x: E4?
     public final val y: kotlin.Int
@@ -201,7 +201,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class F4 {
+@kotlin.jvm.JvmInline public final value class F4 {
     public constructor F4(/*0*/ x: kotlin.Int, /*1*/ y: F4?)
     public final val x: kotlin.Int
     public final val y: F4?
diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt
index 13b9571d8ce..ad5012fd04d 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt
@@ -1,49 +1,48 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
-// WORKS_WHEN_VALUE_CLASS
 // LANGUAGE: +ValueClasses
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Empty<T><!VALUE_CLASS_EMPTY_CONSTRUCTOR!>()<!>
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Foo<T>(val x: T, val y: T)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class FooNullable<T>(val x: T?, val y: T?)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class FooGenericArray<T>(val x: Array<T>, val y: Array<T>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class FooGenericArray2<T>(val x: Array<Array<T>>, val y: Array<Array<T>>)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class FooStarProjectedArray(val x: Array<*>, val y: Array<*>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class FooStarProjectedArray2(val x: Array<Array<*>>, val y: Array<Array<*>>)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Bar(val u: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Unit<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Unit<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class BarNullable(val u: Unit?, val y: Unit?)
 
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Baz(val u: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Nothing<!>, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Nothing<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Baz1(val u: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Nothing<!>, val y: Int)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class Baz2(val u: Int, val y: <!VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE!>Nothing<!>)
 
-OPTIONAL_JVM_INLINE_ANNOTATION
+@JvmInline
 value class BazNullable(val u: Nothing?, val y: Nothing?)
diff --git a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.txt b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.txt
index d73660f06c0..9a60d99de5b 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.txt
+++ b/compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.txt
@@ -1,6 +1,6 @@
 package
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class Bar {
+@kotlin.jvm.JvmInline public final value class Bar {
     public constructor Bar(/*0*/ u: kotlin.Unit, /*1*/ y: kotlin.Unit)
     public final val u: kotlin.Unit
     public final val y: kotlin.Unit
@@ -9,7 +9,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class BarNullable {
+@kotlin.jvm.JvmInline public final value class BarNullable {
     public constructor BarNullable(/*0*/ u: kotlin.Unit?, /*1*/ y: kotlin.Unit?)
     public final val u: kotlin.Unit?
     public final val y: kotlin.Unit?
@@ -18,7 +18,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class Baz {
+@kotlin.jvm.JvmInline public final value class Baz {
     public constructor Baz(/*0*/ u: kotlin.Nothing, /*1*/ y: kotlin.Nothing)
     public final val u: kotlin.Nothing
     public final val y: kotlin.Nothing
@@ -27,7 +27,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class Baz1 {
+@kotlin.jvm.JvmInline public final value class Baz1 {
     public constructor Baz1(/*0*/ u: kotlin.Nothing, /*1*/ y: kotlin.Int)
     public final val u: kotlin.Nothing
     public final val y: kotlin.Int
@@ -36,7 +36,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class Baz2 {
+@kotlin.jvm.JvmInline public final value class Baz2 {
     public constructor Baz2(/*0*/ u: kotlin.Int, /*1*/ y: kotlin.Nothing)
     public final val u: kotlin.Int
     public final val y: kotlin.Nothing
@@ -45,7 +45,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class BazNullable {
+@kotlin.jvm.JvmInline public final value class BazNullable {
     public constructor BazNullable(/*0*/ u: kotlin.Nothing?, /*1*/ y: kotlin.Nothing?)
     public final val u: kotlin.Nothing?
     public final val y: kotlin.Nothing?
@@ -54,14 +54,14 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class Empty</*0*/ T> {
+@kotlin.jvm.JvmInline public final value class Empty</*0*/ T> {
     public constructor Empty</*0*/ 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.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.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, /*1*/ y: T)
     public final val x: T
     public final val y: T
@@ -70,7 +70,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.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>, /*1*/ y: kotlin.Array<T>)
     public final val x: kotlin.Array<T>
     public final val y: kotlin.Array<T>
@@ -79,7 +79,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.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>>, /*1*/ y: kotlin.Array<kotlin.Array<T>>)
     public final val x: kotlin.Array<kotlin.Array<T>>
     public final val y: kotlin.Array<kotlin.Array<T>>
@@ -88,7 +88,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.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?, /*1*/ y: T?)
     public final val x: T?
     public final val y: T?
@@ -97,7 +97,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class FooStarProjectedArray {
+@kotlin.jvm.JvmInline public final value class FooStarProjectedArray {
     public constructor FooStarProjectedArray(/*0*/ x: kotlin.Array<*>, /*1*/ y: kotlin.Array<*>)
     public final val x: kotlin.Array<*>
     public final val y: kotlin.Array<*>
@@ -106,7 +106,7 @@ package
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-@kotlin.Suppress(names = {"OPTIONAL_DECLARATION_USAGE_IN_NON_COMMON_SOURCE"}) @kotlin.jvm.JvmInline public final value class FooStarProjectedArray2 {
+@kotlin.jvm.JvmInline public final value class FooStarProjectedArray2 {
     public constructor FooStarProjectedArray2(/*0*/ x: kotlin.Array<kotlin.Array<*>>, /*1*/ y: kotlin.Array<kotlin.Array<*>>)
     public final val x: kotlin.Array<kotlin.Array<*>>
     public final val y: kotlin.Array<kotlin.Array<*>>
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index af225ec818b..233d6378629 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -33801,7 +33801,7 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             @Test
             @TestMetadata("recursiveMultiFieldValueClasses.kt")
             public void testRecursiveMultiFieldValueClasses() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/recursiveMultiFieldValueClasses.kt");
             }
 
             @Test
@@ -33867,7 +33867,7 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             @Test
             @TestMetadata("valueClassWithForbiddenUnderlyingTypeMultiField.kt")
             public void testValueClassWithForbiddenUnderlyingTypeMultiField() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithUniversal());
+                runTest("compiler/testData/diagnostics/tests/valueClasses/valueClassWithForbiddenUnderlyingTypeMultiField.kt");
             }
 
             @Test
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
index fe2c1bd822e..7fed798b289 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
@@ -20252,7 +20252,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @Test
         @TestMetadata("classLiteralOnInlineClass.kt")
         public void testClassLiteralOnInlineClass() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt");
         }
 
         @Test
@@ -20300,7 +20300,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @Test
         @TestMetadata("constructorImplVisibilityGeneric.kt")
         public void testConstructorImplVisibilityGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt");
         }
 
         @Test
@@ -21002,7 +21002,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @Test
         @TestMetadata("javaPrimitiveTypeIC.kt")
         public void testJavaPrimitiveTypeIC() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
         }
 
         @Test
@@ -21032,13 +21032,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @Test
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValue() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt");
         }
 
         @Test
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt");
         }
 
         @Test
@@ -21068,7 +21068,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @Test
         @TestMetadata("jvmStaticVarInInlineClassCompanion.kt")
         public void testJvmStaticVarInInlineClassCompanion() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt");
         }
 
         @Test
@@ -22136,7 +22136,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @Test
         @TestMetadata("useOfInlineClassWithGenericMethodFromJava.kt")
         public void testUseOfInlineClassWithGenericMethodFromJava() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt");
         }
 
         @Test
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
index c52bb5574e9..90eb5578301 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.test.runners.codegen;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.utils.TransformersFunctions;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
index 74cd55233c3..0b23a6b9ae8 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.test.runners.codegen;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.utils.TransformersFunctions;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index b8accecf370..4ca22c23c79 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -20984,7 +20984,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("classLiteralOnInlineClass.kt")
         public void testClassLiteralOnInlineClass() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt");
         }
 
         @Test
@@ -21032,7 +21032,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("constructorImplVisibilityGeneric.kt")
         public void testConstructorImplVisibilityGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt");
         }
 
         @Test
@@ -21464,7 +21464,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("inlineClassBothEqualsOverride.kt")
         public void testInlineClassBothEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassBothEqualsOverride.kt");
         }
 
         @Test
@@ -21482,19 +21482,19 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("inlineClassEqualsConsistency.kt")
         public void testInlineClassEqualsConsistency() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsConsistency.kt");
         }
 
         @Test
         @TestMetadata("inlineClassEqualsOverriddenForCollections.kt")
         public void testInlineClassEqualsOverriddenForCollections() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverriddenForCollections.kt");
         }
 
         @Test
         @TestMetadata("inlineClassEqualsOverride.kt")
         public void testInlineClassEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassEqualsOverride.kt");
         }
 
         @Test
@@ -21584,13 +21584,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("inlineClassTypedEqualsGenerics.kt")
         public void testInlineClassTypedEqualsGenerics() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt");
         }
 
         @Test
         @TestMetadata("inlineClassUntypedEqualsOverriden.kt")
         public void testInlineClassUntypedEqualsOverriden() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassUntypedEqualsOverriden.kt");
         }
 
         @Test
@@ -21740,25 +21740,25 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("inlineInCompanion.kt")
         public void testInlineInCompanion() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanion.kt");
         }
 
         @Test
         @TestMetadata("inlineInCompanionGeneric.kt")
         public void testInlineInCompanionGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineInCompanionGeneric.kt");
         }
 
         @Test
         @TestMetadata("inlineOverInlineWithCustomEquals.kt")
         public void testInlineOverInlineWithCustomEquals() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineOverInlineWithCustomEquals.kt");
         }
 
         @Test
         @TestMetadata("inlineToString.kt")
         public void testInlineToString() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/inlineToString.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineToString.kt");
         }
 
         @Test
@@ -21800,7 +21800,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("javaPrimitiveTypeIC.kt")
         public void testJavaPrimitiveTypeIC() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
         }
 
         @Test
@@ -21830,13 +21830,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValue() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt");
         }
 
         @Test
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt");
         }
 
         @Test
@@ -21866,7 +21866,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("jvmStaticVarInInlineClassCompanion.kt")
         public void testJvmStaticVarInInlineClassCompanion() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt");
         }
 
         @Test
@@ -22376,13 +22376,13 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("kt54536.kt")
         public void testKt54536() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/kt54536.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/kt54536.kt");
         }
 
         @Test
         @TestMetadata("kt54603.kt")
         public void testKt54603() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/kt54603.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/kt54603.kt");
         }
 
         @Test
@@ -22958,7 +22958,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("useOfInlineClassWithGenericMethodFromJava.kt")
         public void testUseOfInlineClassWithGenericMethodFromJava() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt");
         }
 
         @Test
@@ -32600,7 +32600,7 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("constructorWithMangledParams.kt")
         public void testConstructorWithMangledParams() throws Exception {
-            runTest("compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/notNullAssertions/constructorWithMangledParams.kt");
         }
 
         @Test
@@ -50426,133 +50426,133 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @Test
         @TestMetadata("classFlattening.kt")
         public void testClassFlattening() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/classFlattening.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/classFlattening.kt");
         }
 
         @Test
         @TestMetadata("complex.kt")
         public void testComplex() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/complex.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/complex.kt");
         }
 
         @Test
         @TestMetadata("conditionalExpressions.kt")
         public void testConditionalExpressions() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/conditionalExpressions.kt");
         }
 
         @Test
         @TestMetadata("defaultParameters.kt")
         public void testDefaultParameters() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/defaultParameters.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/defaultParameters.kt");
         }
 
         @Test
         @TestMetadata("delegating.kt")
         public void testDelegating() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/delegating.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/delegating.kt");
         }
 
         @Test
         @TestMetadata("equality.kt")
         public void testEquality() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/equality.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/equality.kt");
         }
 
         @Test
         @TestMetadata("forStatement.kt")
         public void testForStatement() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/forStatement.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/forStatement.kt");
         }
 
         @Test
         @TestMetadata("functionReferences.kt")
         public void testFunctionReferences() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/functionReferences.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/functionReferences.kt");
         }
 
         @Test
         @TestMetadata("mfvcBothEqualsOverride.kt")
         public void testMfvcBothEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.kt");
         }
 
         @Test
         @TestMetadata("mfvcEqualsConsistency.kt")
         public void testMfvcEqualsConsistency() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.kt");
         }
 
         @Test
         @TestMetadata("mfvcEqualsOverriddenForCollections.kt")
         public void testMfvcEqualsOverriddenForCollections() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.kt");
         }
 
         @Test
         @TestMetadata("mfvcEqualsOverride.kt")
         public void testMfvcEqualsOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.kt");
         }
 
         @Test
         @TestMetadata("mfvcFieldInitializationOrder.kt")
         public void testMfvcFieldInitializationOrder() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.kt");
         }
 
         @Test
         @TestMetadata("mfvcHashCodeOverride.kt")
         public void testMfvcHashCodeOverride() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.kt");
         }
 
         @Test
         @TestMetadata("mfvcTypedEqualsGenerics.kt")
         public void testMfvcTypedEqualsGenerics() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.kt");
         }
 
         @Test
         @TestMetadata("mfvcUntypedEqualsOverriden.kt")
         public void testMfvcUntypedEqualsOverriden() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.kt");
         }
 
         @Test
         @TestMetadata("overrides.kt")
         public void testOverrides() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/overrides.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/overrides.kt");
         }
 
         @Test
         @TestMetadata("overrides_inlineClass.kt")
         public void testOverrides_inlineClass() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/overrides_inlineClass.kt");
         }
 
         @Test
         @TestMetadata("overrides_typeParameters.kt")
         public void testOverrides_typeParameters() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/overrides_typeParameters.kt");
         }
 
         @Test
         @TestMetadata("throwingMFVCReassignments.kt")
         public void testThrowingMFVCReassignments() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.kt");
         }
 
         @Test
         @TestMetadata("tryExpressions.kt")
         public void testTryExpressions() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/tryExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/tryExpressions.kt");
         }
 
         @Test
         @TestMetadata("visibility.kt")
         public void testVisibility() throws Exception {
-            runTest("compiler/testData/codegen/box/valueClasses/visibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/valueClasses/visibility.kt");
         }
     }
 
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
index 8583d4a288f..b7ac280451f 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.test.runners.codegen;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.utils.TransformersFunctions;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -2526,7 +2525,7 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
         @Test
         @TestMetadata("annotations.kt")
         public void testAnnotations() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeListing/valueClasses/annotations.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeListing/valueClasses/annotations.kt");
         }
     }
 }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
index fdbd5777719..a00a35e569b 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.test.runners.codegen;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
-import org.jetbrains.kotlin.test.utils.TransformersFunctions;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -5804,43 +5803,43 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
         @Test
         @TestMetadata("conditionalExpressions.kt")
         public void testConditionalExpressions() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/conditionalExpressions.kt");
         }
 
         @Test
         @TestMetadata("equalsBoxTest.kt")
         public void testEqualsBoxTest() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt");
         }
 
         @Test
         @TestMetadata("mfvcDeclaration.kt")
         public void testMfvcDeclaration() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt");
         }
 
         @Test
         @TestMetadata("mfvcReassignments.kt")
         public void testMfvcReassignments() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/mfvcReassignments.kt");
         }
 
         @Test
         @TestMetadata("passingMFVC2Functions.kt")
         public void testPassingMFVC2Functions() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/passingMFVC2Functions.kt");
         }
 
         @Test
         @TestMetadata("regularClassWithMFVC.kt")
         public void testRegularClassWithMFVC() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt");
         }
 
         @Test
         @TestMetadata("tryExpressions.kt")
         public void testTryExpressions() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/bytecodeText/valueClasses/tryExpressions.kt");
         }
     }
 
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index 88b9f4ce84d..8dbf5cc39e1 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -17067,7 +17067,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
 
         @TestMetadata("classLiteralOnInlineClass.kt")
         public void testClassLiteralOnInlineClass() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/classLiteralOnInlineClass.kt");
         }
 
         @TestMetadata("computablePropertyInsideInlineClass.kt")
@@ -17102,7 +17102,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
 
         @TestMetadata("constructorImplVisibilityGeneric.kt")
         public void testConstructorImplVisibilityGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/constructorImplVisibilityGeneric.kt");
         }
 
         @TestMetadata("correctBoxingForBranchExpressions.kt")
@@ -17647,7 +17647,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
 
         @TestMetadata("javaPrimitiveTypeIC.kt")
         public void testJavaPrimitiveTypeIC() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/javaPrimitiveTypeIC.kt");
         }
 
         @TestMetadata("javaPrimitiveTypeICGeneric.kt")
@@ -17672,12 +17672,12 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
 
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValue() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValue.kt");
         }
 
         @TestMetadata("jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt")
         public void testJvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmOverloadsOnTopLevelFunctionReturningInlineClassValueGeneric.kt");
         }
 
         @TestMetadata("jvmStaticFunInInlineClassCompanion.kt")
@@ -17702,7 +17702,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
 
         @TestMetadata("jvmStaticVarInInlineClassCompanion.kt")
         public void testJvmStaticVarInInlineClassCompanion() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/jvmStaticVarInInlineClassCompanion.kt");
         }
 
         @TestMetadata("jvmStaticVarInInlineClassCompanionGeneric.kt")
@@ -18442,7 +18442,7 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
 
         @TestMetadata("useOfInlineClassWithGenericMethodFromJava.kt")
         public void testUseOfInlineClassWithGenericMethodFromJava() throws Exception {
-            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+            runTest("compiler/testData/codegen/box/inlineClasses/useOfInlineClassWithGenericMethodFromJava.kt");
         }
 
         @TestMetadata("useOfInlineClassWithGenericMethodFromJavaGeneric.kt")