Remove the workaround introduced for Kotlin to get the right xxxValue() method descriptor on boxed type.
The mapping from Kotlin function to the JRE method for builtin types has been fixed in a previous cl.
@@ -349,16 +349,8 @@ public final class RuntimeMethods {
public static MethodCall createUnboxingMethodCall(
Expression expression, DeclaredTypeDescriptor boxedType) {
- // TODO(b/233795767): Remove the fixup for Kotlin.
MethodDescriptor valueMethodDescriptor =
- MethodDescriptor.Builder.from(
- boxedType.getMethodDescriptor(
- boxedType.toUnboxedType().getSimpleSourceName() + "Value"))
- // Fixup the enclosing type descriptor for the boxed method call. Kotlin does
- // not provide the xxxValue() method calls on the boxed types in the type model, but it
- // finds the ones defined at Number instead.
- .setEnclosingTypeDescriptor(boxedType)
- .build();
+ boxedType.getMethodDescriptor(boxedType.toUnboxedType().getSimpleSourceName() + "Value");
return MethodCall.Builder.from(valueMethodDescriptor).setQualifier(expression).build();
}
