JVM: Set value of propagated @JvmExposeBoxed argument to empty string

if there is no @JvmName annotation to copy the value from.

 #KT-78358

Author: ilmirus

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

@@ -7,11 +7,13 @@ package org.jetbrains.kotlin.backend.jvm
 
 import org.jetbrains.kotlin.backend.jvm.ir.isInlineClassType
 import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
 import org.jetbrains.kotlin.ir.builders.declarations.IrFunctionBuilder
 import org.jetbrains.kotlin.ir.builders.declarations.buildFun
 import org.jetbrains.kotlin.ir.builders.declarations.buildProperty
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.fromSymbolOwner
 import org.jetbrains.kotlin.ir.irAttribute
@@ -190,6 +192,7 @@ fun List<IrConstructorCall>.withJvmExposeBoxedAnnotation(declaration: IrDeclarat
         // Copy the name from @JvmName if it is present
         val jvmName = declaration.getAnnotation(JVM_NAME_ANNOTATION_FQ_NAME)?.arguments[0]
         arguments[0] = jvmName?.deepCopyWithSymbols()
+            ?: IrConstImpl.string(UNDEFINED_OFFSET, UNDEFINED_OFFSET, context.irBuiltIns.stringType, "")
     }
 }
 

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

@@ -73,10 +73,9 @@ import java.lang.annotation.RetentionPolicy
 
 fun IrDeclaration.getJvmNameFromAnnotation(): String? {
     // TODO lower @JvmName and @JvmExposeBoxed?
-    val const = getAnnotation(DescriptorUtils.JVM_NAME)?.arguments[0] as? IrConst
-        ?: getAnnotation(JVM_EXPOSE_BOXED_ANNOTATION_FQ_NAME)?.arguments[0] as? IrConst
+    val value = (getAnnotation(DescriptorUtils.JVM_NAME)?.arguments[0] as? IrConst)?.value as? String
+        ?: getJvmNameFromJvmExposeBoxedAnnotation()
         ?: return null
-    val value = const.value as? String ?: return null
     return when (origin) {
         IrDeclarationOrigin.FUNCTION_FOR_DEFAULT_PARAMETER -> "$value\$default"
         JvmLoweredDeclarationOrigin.FOR_INLINE_STATE_MACHINE_TEMPLATE,
@@ -85,6 +84,11 @@ fun IrDeclaration.getJvmNameFromAnnotation(): String? {
     }
 }
 
+private fun IrDeclaration.getJvmNameFromJvmExposeBoxedAnnotation(): String? {
+    val value = getAnnotation(JVM_EXPOSE_BOXED_ANNOTATION_FQ_NAME)?.arguments[0] as? IrConst ?: return null
+    return if (value.value == "") null else value.value as? String
+}
+
 fun IrFunction.getJvmVisibilityOfDefaultArgumentStub() =
     when {
         DescriptorVisibilities.isPrivate(visibility) || isInlineOnly() -> JavaDescriptorVisibilities.PACKAGE_VISIBILITY

compiler/testData/asJava/lightClasses/lightClassByFqName/privateInterfaceCallable.lib.java

@@ -1,11 +1,11 @@
 public abstract interface MyInterface /* MyInterface*/ {
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   private abstract java.lang.String getMangledVariable(StringWrapper);//  getMangledVariable(StringWrapper)
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   private abstract void mangledMethod(StringWrapper);//  mangledMethod(StringWrapper)
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   private abstract void setMangledVariable(StringWrapper, java.lang.String);//  setMangledVariable(StringWrapper, java.lang.String)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/companionObject.lib.java

@@ -6,7 +6,7 @@ public final class StringWrapper /* StringWrapper*/ {
   @org.jetbrains.annotations.NotNull()
   public static final StringWrapper.Companion Companion;
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public  StringWrapper(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/constructor.lib.java

@@ -31,11 +31,11 @@ public final class Test /* Test*/ {
   @org.jetbrains.annotations.NotNull()
   private final java.lang.String s;
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @org.jetbrains.annotations.NotNull()
   public final StringWrapper getS();//  getS()
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public  Test(@org.jetbrains.annotations.NotNull() StringWrapper);//  .ctor(StringWrapper)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/constructorBoxed.lib.java

@@ -31,11 +31,11 @@ public final class Test /* Test*/ {
   @org.jetbrains.annotations.Nullable()
   private final StringWrapper s;
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @org.jetbrains.annotations.Nullable()
   public final StringWrapper getS();//  getS()
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public  Test(@org.jetbrains.annotations.Nullable() StringWrapper);//  .ctor(StringWrapper)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/contextAndReceiverVariable.lib.java

@@ -1,9 +1,9 @@
 public final class A /* A*/ {
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String getF(@org.jetbrains.annotations.NotNull() Z, @org.jetbrains.annotations.NotNull() B);//  getF(Z, B)
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public final void setF(@org.jetbrains.annotations.NotNull() Z, @org.jetbrains.annotations.NotNull() B, @org.jetbrains.annotations.NotNull() java.lang.String);//  setF(Z, B, java.lang.String)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/contextVariable.lib.java

@@ -1,9 +1,9 @@
 public final class A /* A*/ {
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String getF(@org.jetbrains.annotations.NotNull() Z);//  getF(Z)
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public final void setF(@org.jetbrains.annotations.NotNull() Z, @org.jetbrains.annotations.NotNull() java.lang.String);//  setF(Z, java.lang.String)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/contexts.lib.java

@@ -1,5 +1,5 @@
 public final class A /* A*/ {
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String f(@org.jetbrains.annotations.NotNull() Z, @org.jetbrains.annotations.NotNull() Z);//  f(Z, Z)
 
@@ -14,7 +14,7 @@ public final class Z /* Z*/ {
   @org.jetbrains.annotations.NotNull()
   private final java.lang.String value;
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public  Z(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
   @org.jetbrains.annotations.NotNull()

compiler/testData/asJava/lightClasses/lightClassByPsi/jvmExposeBoxed/directive/companionObject.lib.java

@@ -6,12 +6,12 @@ public final class StringWrapper /* StringWrapper*/ {
   @org.jetbrains.annotations.NotNull()
   public static final StringWrapper.Companion Companion;
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public static final java.lang.String unwrap(@org.jetbrains.annotations.NotNull() StringWrapper);//  unwrap(StringWrapper)
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public  StringWrapper(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
   @kotlin.jvm.JvmStatic()
@@ -54,16 +54,16 @@ class Companion ...
 }
 
 public static final class Companion /* StringWrapper.Companion*/ {
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @kotlin.jvm.JvmStatic()
   @org.jetbrains.annotations.NotNull()
   public final java.lang.String unwrap(@org.jetbrains.annotations.NotNull() StringWrapper);//  unwrap(StringWrapper)
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   @org.jetbrains.annotations.NotNull()
   public final StringWrapper getStaticVariable();//  getStaticVariable()
 
-  @kotlin.jvm.JvmExposeBoxed()
+  @kotlin.jvm.JvmExposeBoxed(jvmName = "")
   public final void setStaticVariable(@org.jetbrains.annotations.NotNull() StringWrapper);//  setStaticVariable(StringWrapper)
 
   @kotlin.jvm.JvmStatic()