azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change behavior of equals/hashCode on adapted function references

Browse Source 
Function references are now equal if they refer to the same function,
and if the parameter/return type adaptation, which happens when a
reference is used where some function type is expected, is exactly the
same. This includes the number of expected positional parameters (which
can be affected by defaults/varargs), whether the coercion of vararg
parameter to Array type happened, and whether the coercion of return
type to Unit happened.

 #KT-37543 Fixed
This commit is contained in:
Alexander Udalov
2020-03-16 22:26:46 +01:00
committed by Alexander Udalov
parent c344b85d4e
commit 3269a7e693
24 changed files with 942 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+37 -3
View File
@@ -12,6 +12,7 @@ import kotlin.Unit;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
import org.jetbrains.kotlin.codegen.binding.CodegenBinding;
import org.jetbrains.kotlin.codegen.context.ClosureContext;
@@ -32,9 +33,11 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
import org.jetbrains.kotlin.metadata.ProtoBuf;
import org.jetbrains.kotlin.psi.KtElement;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
import org.jetbrains.kotlin.resolve.scopes.MemberScope;
import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver;
import org.jetbrains.kotlin.serialization.DescriptorSerializer;
import org.jetbrains.kotlin.types.KotlinType;
import org.jetbrains.kotlin.types.SimpleType;
@@ -64,6 +67,7 @@ public class ClosureCodegen extends MemberCodegen<KtElement> {
private final SamType samType;
private final KotlinType superClassType;
private final List<KotlinType> superInterfaceTypes;
private final ResolvedCall<FunctionDescriptor> functionReferenceCall;
private final FunctionDescriptor functionReferenceTarget;
private final FunctionGenerationStrategy strategy;
protected final CalculatedClosure closure;
@@ -80,7 +84,7 @@ public class ClosureCodegen extends MemberCodegen<KtElement> {
@NotNull KtElement element,
@Nullable SamType samType,
@NotNull ClosureContext context,
@Nullable FunctionDescriptor functionReferenceTarget,
@Nullable ResolvedCall<FunctionDescriptor> functionReferenceCall,
@NotNull FunctionGenerationStrategy strategy,
@NotNull MemberCodegen<?> parentCodegen,
@NotNull ClassBuilder classBuilder
@@ -90,7 +94,8 @@ public class ClosureCodegen extends MemberCodegen<KtElement> {
this.funDescriptor = context.getFunctionDescriptor();
this.classDescriptor = context.getContextDescriptor();
this.samType = samType;
this.functionReferenceTarget = functionReferenceTarget;
this.functionReferenceCall = functionReferenceCall;
this.functionReferenceTarget = functionReferenceCall != null ? functionReferenceCall.getResultingDescriptor() : null;
this.strategy = strategy;
if (samType == null) {
@@ -510,7 +515,10 @@ public class ClosureCodegen extends MemberCodegen<KtElement> {
generateCallableReferenceDeclarationContainerClass(iv, functionReferenceTarget, state);
iv.aconst(functionReferenceTarget.getName().asString());
PropertyReferenceCodegen.generateCallableReferenceSignature(iv, functionReferenceTarget, state);
iv.aconst(isTopLevelCallableReference(functionReferenceTarget) ? 1 : 0);
int flags =
(isTopLevelCallableReference(functionReferenceTarget) ? 1 : 0) +
(calculateFunctionReferenceFlags(functionReferenceCall, funDescriptor) << 1);
iv.aconst(flags);
superCtorArgTypes.add(JAVA_CLASS_TYPE);
superCtorArgTypes.add(JAVA_STRING_TYPE);
superCtorArgTypes.add(JAVA_STRING_TYPE);
@@ -532,6 +540,32 @@ public class ClosureCodegen extends MemberCodegen<KtElement> {
return constructor;
}
private static int calculateFunctionReferenceFlags(
@NotNull ResolvedCall<?> call, @NotNull FunctionDescriptor anonymousAdaptedFunction
) {
boolean hasVarargMappedToElement = false;
CallableDescriptor target = call.getResultingDescriptor();
int shift =
(call.getDispatchReceiver() instanceof TransientReceiver ? 1 : 0) +
(call.getExtensionReceiver() instanceof TransientReceiver ? 1 : 0);
for (int i = shift;
i < anonymousAdaptedFunction.getValueParameters().size() && i - shift < target.getValueParameters().size();
i++) {
KotlinType varargElementType = target.getValueParameters().get(i - shift).getVarargElementType();
if (varargElementType != null && !varargElementType.equals(anonymousAdaptedFunction.getValueParameters().get(i).getType())) {
hasVarargMappedToElement = true;
break;
}
}
//noinspection ConstantConditions
boolean hasCoercionToUnit = KotlinBuiltIns.isUnit(anonymousAdaptedFunction.getReturnType()) &&
!KotlinBuiltIns.isUnit(target.getReturnType());
return (hasVarargMappedToElement ? 1 : 0) +
((hasCoercionToUnit ? 1 : 0) << 1);
}
protected int calculateArity() {
int arity = funDescriptor.getValueParameters().size();
if (funDescriptor.getExtensionReceiverParameter() != null) arity++;
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+4 -7
View File
@@ -1023,7 +1023,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
@NotNull FunctionDescriptor descriptor,
@NotNull FunctionGenerationStrategy strategy,
@Nullable SamType samType,
@Nullable FunctionDescriptor functionReferenceTarget,
@Nullable ResolvedCall<FunctionDescriptor> functionReferenceCall,
@Nullable StackValue functionReferenceReceiver
) {
ClassBuilder cv = state.getFactory().newVisitor(
@@ -1038,8 +1038,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
descriptor, this, state.getTypeMapper()
) : this.context.intoClosure(descriptor, this, typeMapper);
ClosureCodegen closureCodegen = coroutineCodegen != null ? coroutineCodegen : new ClosureCodegen(
state, declaration, samType, closureContext,
functionReferenceTarget, strategy, parentCodegen, cv
state, declaration, samType, closureContext, functionReferenceCall, strategy, parentCodegen, cv
);
closureCodegen.generate();
@@ -3261,6 +3260,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
}
@Override
@SuppressWarnings("unchecked")
public StackValue visitCallableReferenceExpression(@NotNull KtCallableReferenceExpression expression, StackValue data) {
ResolvedCall<?> resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression.getCallableReference(), bindingContext);
@@ -3274,10 +3274,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
null, false
);
return genClosure(
expression, functionDescriptor, strategy, null,
(FunctionDescriptor) resolvedCall.getResultingDescriptor(), receiver
);
return genClosure(expression, functionDescriptor, strategy, null, (ResolvedCall<FunctionDescriptor>) resolvedCall, receiver);
}
return generatePropertyReference(
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+73
View File
@@ -2174,6 +2174,74 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/equality")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Equality extends AbstractFirBlackBoxCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
}
public void testAllFilesPresentInEquality() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("capturedDefaults.kt")
public void testCapturedDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt");
}
@TestMetadata("capturedVararg.kt")
public void testCapturedVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt");
}
@TestMetadata("coercionToUnit.kt")
public void testCoercionToUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt");
}
@TestMetadata("coercionToUnitWithDefaults.kt")
public void testCoercionToUnitWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt");
}
@TestMetadata("coercionToUnitWithVararg.kt")
public void testCoercionToUnitWithVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt");
}
@TestMetadata("extensionReceiverVsDefault.kt")
public void testExtensionReceiverVsDefault() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
}
@TestMetadata("noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt")
public void testNoCoercionToUnitIfFunctionAlreadyReturnsUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt");
}
@TestMetadata("simpleEquality.kt")
public void testSimpleEquality() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt");
}
@TestMetadata("varargAsArrayMemberOrExtension.kt")
public void testVarargAsArrayMemberOrExtension() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
}
@TestMetadata("varargAsArrayWithDefaults.kt")
public void testVarargAsArrayWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
}
@TestMetadata("varargWithDefaults.kt")
public void testVarargWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/function")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -23706,6 +23774,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
KotlinTestUtils.runTestWithCustomIgnoreDirective(this::doTest, TargetBackend.JVM_IR, testDataFilePath, "// IGNORE_BACKEND_FIR: ");
}
@TestMetadata("adaptedCallableReferencesNotEqualToCallablesFromAPI.kt")
public void testAdaptedCallableReferencesNotEqualToCallablesFromAPI() throws Exception {
runTest("compiler/testData/codegen/box/reflection/methodsFromAny/adaptedCallableReferencesNotEqualToCallablesFromAPI.kt");
}
public void testAllFilesPresentInMethodsFromAny() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt
Vendored
+64
View File
@@ -0,0 +1,64 @@
// IGNORE_BACKEND: JVM_IR, JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
class V {
fun target(x: String = "x", y: String = "y", z: String = "z"): String = x + y + z
}
private fun captureNoDefaults(f: (V, String, String, String) -> String): Any = f
private fun captureOneDefault(f: (V, String, String) -> String): Any = f
private fun captureAllDefaults(f: (V) -> String): Any = f
private fun captureNoDefaultsBound(f: (String, String, String) -> String): Any = f
private fun captureOneDefaultBound(f: (String, String) -> String): Any = f
private fun captureAllDefaultsBound(f: () -> String): Any = f
fun box(): String {
val v0 = V()
checkEqual(captureNoDefaults(V::target), captureNoDefaults(V::target))
checkEqual(captureNoDefaults(V::target), captureNoDefaultsFromOtherFile())
checkEqual(captureOneDefault(V::target), captureOneDefault(V::target))
checkEqual(captureOneDefault(V::target), captureOneDefaultFromOtherFile())
checkEqual(captureAllDefaults(V::target), captureAllDefaults(V::target))
checkEqual(captureNoDefaultsBound(v0::target), captureNoDefaultsBound(v0::target))
checkEqual(captureNoDefaultsBound(v0::target), captureNoDefaultsBoundFromOtherFile(v0))
checkEqual(captureOneDefaultBound(v0::target), captureOneDefaultBound(v0::target))
checkEqual(captureAllDefaultsBound(v0::target), captureAllDefaultsBound(v0::target))
checkNotEqual(captureNoDefaults(V::target), captureOneDefault(V::target))
checkNotEqual(captureNoDefaults(V::target), captureAllDefaults(V::target))
checkNotEqual(captureNoDefaultsBound(v0::target), captureOneDefaultBound(v0::target))
checkNotEqual(captureNoDefaultsBound(v0::target), captureAllDefaultsBound(v0::target))
checkNotEqual(captureNoDefaults(V::target), captureNoDefaultsBoundFromOtherFile(v0))
return "OK"
}
// FILE: fromOtherFile.kt
private fun captureNoDefaults(f: (V, String, String, String) -> String): Any = f
private fun captureOneDefault(f: (V, String, String) -> String): Any = f
private fun captureNoDefaultsBound(f: (String, String, String) -> String): Any = f
fun captureNoDefaultsFromOtherFile(): Any = captureNoDefaults(V::target)
fun captureOneDefaultFromOtherFile(): Any = captureOneDefault(V::target)
fun captureNoDefaultsBoundFromOtherFile(v0: V) = captureNoDefaultsBound(v0::target)
compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt
Vendored
+66
View File
@@ -0,0 +1,66 @@
// IGNORE_BACKEND: JVM_IR, JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
class V {
fun target(vararg x: String) {}
}
private fun captureVararg2(f: (V, String, String) -> Unit): Any = f
private fun captureVararg1(f: (V, String) -> Unit): Any = f
private fun captureVararg0(f: (V) -> Unit): Any = f
private fun captureVarargAsArray(f: (V, Array<String>) -> Unit): Any = f
private fun captureVararg2Bound(f: (String, String) -> Unit): Any = f
private fun captureVararg1Bound(f: (String) -> Unit): Any = f
private fun captureVararg0Bound(f: () -> Unit): Any = f
private fun captureVarargAsArrayBound(f: (Array<String>) -> Unit): Any = f
fun box(): String {
val v0 = V()
checkEqual(captureVararg2(V::target), captureVararg2(V::target))
checkEqual(captureVararg1(V::target), captureVararg1(V::target))
checkEqual(captureVararg0(V::target), captureVararg0(V::target))
checkEqual(captureVararg0(V::target), captureVararg0FromOtherFile())
checkEqual(captureVarargAsArray(V::target), captureVarargAsArrayFromOtherFile())
checkEqual(captureVararg2Bound(v0::target), captureVararg2Bound(v0::target))
checkEqual(captureVararg1Bound(v0::target), captureVararg1Bound(v0::target))
checkEqual(captureVararg0Bound(v0::target), captureVararg0Bound(v0::target))
checkEqual(captureVararg0Bound(v0::target), captureVararg0BoundFromOtherFile(v0))
checkEqual(captureVarargAsArrayBound(v0::target), captureVarargAsArrayBoundFromOtherFile(v0))
checkNotEqual(captureVararg2(V::target), captureVararg0(V::target))
checkNotEqual(captureVararg2Bound(v0::target), captureVararg0Bound(v0::target))
checkNotEqual(captureVararg2(V::target), captureVarargAsArray(V::target))
checkNotEqual(captureVararg1(V::target), captureVarargAsArray(V::target))
checkNotEqual(captureVararg0(V::target), captureVarargAsArray(V::target))
checkNotEqual(captureVararg1Bound(v0::target), captureVarargAsArrayBound(v0::target))
checkNotEqual(captureVararg1Bound(v0::target), captureVarargAsArrayBoundFromOtherFile(v0))
return "OK"
}
// FILE: fromOtherFile.kt
private fun captureVararg0(f: (V) -> Unit): Any = f
private fun captureVararg0Bound(f: () -> Unit): Any = f
private fun captureVarargAsArray(f: (V, Array<String>) -> Unit): Any = f
private fun captureVarargAsArrayBound(f: (Array<String>) -> Unit): Any = f
fun captureVararg0FromOtherFile(): Any = captureVararg0(V::target)
fun captureVararg0BoundFromOtherFile(v0: V): Any = captureVararg0Bound(v0::target)
fun captureVarargAsArrayFromOtherFile(): Any = captureVarargAsArray(V::target)
fun captureVarargAsArrayBoundFromOtherFile(v0: V): Any = captureVarargAsArrayBound(v0::target)
compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt
Vendored
+56
View File
@@ -0,0 +1,56 @@
// IGNORE_BACKEND: JVM_IR, JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
class V {
fun target(): String = ""
}
private fun captureString(f: (V) -> String): Any = f
private fun captureUnit(f: (V) -> Unit): Any = f
private fun captureStringBound(f: () -> String): Any = f
private fun captureUnitBound(f: () -> Unit): Any = f
fun box(): String {
val v0 = V()
checkEqual(captureString(V::target), captureString(V::target))
checkEqual(captureString(V::target), captureStringFromOtherFile())
checkEqual(captureUnit(V::target), captureUnit(V::target))
checkEqual(captureUnit(V::target), captureUnitFromOtherFile())
checkEqual(captureStringBound(v0::target), captureStringBound(v0::target))
checkEqual(captureStringBound(v0::target), captureStringBoundFromOtherFile(v0))
checkEqual(captureUnitBound(v0::target), captureUnitBound(v0::target))
checkEqual(captureUnitBound(v0::target), captureUnitBoundFromOtherFile(v0))
checkNotEqual(captureString(V::target), captureUnit(V::target))
checkNotEqual(captureStringBound(v0::target), captureUnitBound(v0::target))
checkNotEqual(captureString(V::target), captureUnitBoundFromOtherFile(v0))
return "OK"
}
// FILE: fromOtherFile.kt
private fun captureString(f: (V) -> String): Any = f
private fun captureUnit(f: (V) -> Unit): Any = f
private fun captureStringBound(f: () -> String): Any = f
private fun captureUnitBound(f: () -> Unit): Any = f
fun captureStringFromOtherFile(): Any = captureString(V::target)
fun captureUnitFromOtherFile(): Any = captureUnit(V::target)
fun captureStringBoundFromOtherFile(v0: V): Any = captureStringBound(v0::target)
fun captureUnitBoundFromOtherFile(v0: V): Any = captureUnitBound(v0::target)
compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt
Vendored
+34
View File
@@ -0,0 +1,34 @@
// IGNORE_BACKEND: JVM_IR, JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
fun target(x: Int, y: String = "", z: String = ""): Int = x
fun captureNoDefaults(fn: (Int, String, String) -> Unit): Any = fn
fun captureOneDefault(fn: (Int, String) -> Unit): Any = fn
fun captureAllDefaults(fn: (Int) -> Unit): Any = fn
fun box(): String {
checkEqual(captureNoDefaults(::target), captureNoDefaults(::target))
checkEqual(captureOneDefault(::target), captureOneDefault(::target))
checkEqual(captureAllDefaults(::target), captureAllDefaults(::target))
checkEqual(captureNoDefaults(::target), captureNoDefaultsFromOtherFile())
checkNotEqual(captureNoDefaults(::target), captureOneDefault(::target))
checkNotEqual(captureNoDefaults(::target), captureAllDefaults(::target))
return "OK"
}
// FILE: fromOtherFile.kt
fun captureNoDefaultsFromOtherFile(): Any = captureNoDefaults(::target)
compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt
Vendored
+31
View File
@@ -0,0 +1,31 @@
// IGNORE_BACKEND: JVM_IR, JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
fun target(x: Int, vararg ys: String): Int = x + ys.size
fun captureVararg1(fn: (Int, String) -> Unit): Any = fn
fun captureVararg0(fn: (Int) -> Unit): Any = fn
fun box(): String {
checkEqual(captureVararg1(::target), captureVararg1(::target))
checkEqual(captureVararg0(::target), captureVararg0(::target))
checkEqual(captureVararg1(::target), captureVararg1FromOtherFile())
checkNotEqual(captureVararg1(::target), captureVararg0(::target))
return "OK"
}
// FILE: fromOtherFile.kt
fun captureVararg1FromOtherFile(): Any = captureVararg1(::target)
compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// FILE: test.kt
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
fun target(s: String = "") {}
fun capture1(fn: String.() -> Unit): Any = fn
fun capture2(fn: () -> Unit): Any = fn
fun box(): String {
checkNotEqual(capture1(::target), capture2(::target))
checkNotEqual(capture1(::target), captureFromOtherFile())
return "OK"
}
// FILE: fromOtherFile.kt
fun captureFromOtherFile(): Any = capture2(::target)
compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// IGNORE_BACKEND: JS, JS_IR, NATIVE
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun target(x: Int) {}
fun use(fn: (Int) -> Unit): Any = fn
fun box(): String {
checkEqual(use(::target), ::target)
checkEqual(useFromOtherFile(), ::target)
return "OK"
}
// FILE: fromOtherFile.kt
fun useFromOtherFile(): Any = use(::target)
compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt
Vendored
+47
View File
@@ -0,0 +1,47 @@
// IGNORE_BACKEND: JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
class V {
val memberVal: String = ""
fun memberFun(): String = ""
}
val topLevelVar: String = ""
fun topLevelFun(): String = ""
fun box(): String {
val v0 = V()
val v1 = V()
checkEqual(::topLevelFun, ::topLevelFun)
checkEqual(::topLevelFun, referenceTopLevelFunFromOtherFile())
checkEqual(::topLevelVar, ::topLevelVar)
checkEqual(::topLevelVar, referenceTopLevelVarFromOtherFile())
checkEqual(V::memberFun, V::memberFun)
checkEqual(v0::memberFun, v0::memberFun)
checkEqual(V::memberVal, V::memberVal)
checkEqual(v0::memberVal, v0::memberVal)
checkNotEqual(v0::memberFun, V::memberFun)
checkNotEqual(v0::memberVal, V::memberVal)
checkNotEqual(v0::memberFun, v1::memberFun)
checkNotEqual(v0::memberVal, v1::memberVal)
return "OK"
}
// FILE: fromOtherFile.kt
fun referenceTopLevelFunFromOtherFile() = ::topLevelFun
fun referenceTopLevelVarFromOtherFile() = ::topLevelVar
compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt
Vendored
+29
View File
@@ -0,0 +1,29 @@
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
class C {
fun member(vararg xs: String) {}
}
fun C.extension(vararg xs: String) {}
fun capture1(fn: C.(String) -> Unit): Any = fn
fun capture2(fn: C.(Array<String>) -> Unit): Any = fn
fun box(): String {
checkNotEqual(capture1(C::member), capture2(C::member))
checkNotEqual(capture1(C::member), captureMemberFromOtherFile())
checkNotEqual(capture1(C::extension), capture2(C::extension))
checkNotEqual(capture1(C::extension), captureExtensionFromOtherFile())
return "OK"
}
// FILE: fromOtherFile.kt
fun captureMemberFromOtherFile(): Any = capture2(C::member)
fun captureExtensionFromOtherFile(): Any = capture2(C::extension)
compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkNotEqual(x: Any, y: Any) {
if (x == y || y == x) throw AssertionError("$x and $y should NOT be equal")
}
fun target(s1: String, vararg xs: Int, s2: String = "") {}
fun capture1(fn: (String, IntArray, String) -> Unit): Any = fn
fun capture2(fn: (String, Int, Int) -> Unit): Any = fn
fun box(): String {
checkNotEqual(capture1(::target), capture2(::target))
checkNotEqual(capture1(::target), captureFromOtherFile())
return "OK"
}
// FILE: fromOtherFile.kt
fun captureFromOtherFile(): Any = capture2(::target)
compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
// IGNORE_BACKEND: JVM_IR, JS, JS_IR, NATIVE
// IGNORE_BACKEND_FIR: JVM_IR
// FILE: test.kt
fun checkEqual(x: Any, y: Any) {
if (x != y || y != x) throw AssertionError("$x and $y should be equal")
if (x.hashCode() != y.hashCode()) throw AssertionError("$x and $y should have the same hash code")
}
fun target(x: Int = 0, vararg ys: String) {}
fun captureAll1(fn: () -> Unit): Any = fn
fun captureAll2(fn: () -> Unit): Any = fn
fun box(): String {
checkEqual(captureAll1(::target), captureAll2(::target))
return "OK"
}
// FILE: fromOtherFile.kt
fun captureAllFromOtherFile(): Any = captureAll1(::target)
compiler/testData/codegen/box/reflection/methodsFromAny/adaptedCallableReferencesNotEqualToCallablesFromAPI.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
// TARGET_BACKEND: JVM
// Temporarily ignored for JVM until KT-36024 is fixed.
// IGNORE_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// WITH_REFLECT
import kotlin.reflect.*
import kotlin.test.assertNotEquals
class A {
fun foo(s: String = "", vararg xs: Long): String = "foo"
}
fun checkNotEqual(x: Any, y: Any) {
assertNotEquals(x, y)
assertNotEquals(y, x)
}
fun coercionToUnit(f: (A, String, LongArray) -> Unit): Any = f
fun varargToElement(f: (A, String, Long, Long) -> String): Any = f
fun defaultAndVararg(f: (A) -> String): Any = f
fun allOfTheAbove(f: (A) -> Unit): Any = f
fun box(): String {
val foo = A::class.members.single { it.name == "foo" }
checkNotEqual(coercionToUnit(A::foo), foo)
checkNotEqual(varargToElement(A::foo), foo)
checkNotEqual(defaultAndVararg(A::foo), foo)
checkNotEqual(allOfTheAbove(A::foo), foo)
return "OK"
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+73
View File
@@ -2194,6 +2194,74 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/equality")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Equality extends AbstractBlackBoxCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInEquality() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("capturedDefaults.kt")
public void testCapturedDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt");
}
@TestMetadata("capturedVararg.kt")
public void testCapturedVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt");
}
@TestMetadata("coercionToUnit.kt")
public void testCoercionToUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt");
}
@TestMetadata("coercionToUnitWithDefaults.kt")
public void testCoercionToUnitWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt");
}
@TestMetadata("coercionToUnitWithVararg.kt")
public void testCoercionToUnitWithVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt");
}
@TestMetadata("extensionReceiverVsDefault.kt")
public void testExtensionReceiverVsDefault() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
}
@TestMetadata("noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt")
public void testNoCoercionToUnitIfFunctionAlreadyReturnsUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt");
}
@TestMetadata("simpleEquality.kt")
public void testSimpleEquality() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt");
}
@TestMetadata("varargAsArrayMemberOrExtension.kt")
public void testVarargAsArrayMemberOrExtension() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
}
@TestMetadata("varargAsArrayWithDefaults.kt")
public void testVarargAsArrayWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
}
@TestMetadata("varargWithDefaults.kt")
public void testVarargWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/function")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -25267,6 +25335,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
@TestMetadata("adaptedCallableReferencesNotEqualToCallablesFromAPI.kt")
public void testAdaptedCallableReferencesNotEqualToCallablesFromAPI() throws Exception {
runTest("compiler/testData/codegen/box/reflection/methodsFromAny/adaptedCallableReferencesNotEqualToCallablesFromAPI.kt");
}
public void testAllFilesPresentInMethodsFromAny() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+73
View File
@@ -2194,6 +2194,74 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/equality")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Equality extends AbstractLightAnalysisModeTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
public void testAllFilesPresentInEquality() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@TestMetadata("capturedDefaults.kt")
public void testCapturedDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt");
}
@TestMetadata("capturedVararg.kt")
public void testCapturedVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt");
}
@TestMetadata("coercionToUnit.kt")
public void testCoercionToUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt");
}
@TestMetadata("coercionToUnitWithDefaults.kt")
public void testCoercionToUnitWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt");
}
@TestMetadata("coercionToUnitWithVararg.kt")
public void testCoercionToUnitWithVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt");
}
@TestMetadata("extensionReceiverVsDefault.kt")
public void testExtensionReceiverVsDefault() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
}
@TestMetadata("noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt")
public void testNoCoercionToUnitIfFunctionAlreadyReturnsUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt");
}
@TestMetadata("simpleEquality.kt")
public void testSimpleEquality() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt");
}
@TestMetadata("varargAsArrayMemberOrExtension.kt")
public void testVarargAsArrayMemberOrExtension() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
}
@TestMetadata("varargAsArrayWithDefaults.kt")
public void testVarargAsArrayWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
}
@TestMetadata("varargWithDefaults.kt")
public void testVarargWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/function")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -24080,6 +24148,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class MethodsFromAny extends AbstractLightAnalysisModeTest {
@TestMetadata("adaptedCallableReferencesNotEqualToCallablesFromAPI.kt")
public void ignoreAdaptedCallableReferencesNotEqualToCallablesFromAPI() throws Exception {
runTest("compiler/testData/codegen/box/reflection/methodsFromAny/adaptedCallableReferencesNotEqualToCallablesFromAPI.kt");
}
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
}
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+73
View File
@@ -2174,6 +2174,74 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/equality")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Equality extends AbstractIrBlackBoxCodegenTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
public void testAllFilesPresentInEquality() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@TestMetadata("capturedDefaults.kt")
public void testCapturedDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt");
}
@TestMetadata("capturedVararg.kt")
public void testCapturedVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt");
}
@TestMetadata("coercionToUnit.kt")
public void testCoercionToUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt");
}
@TestMetadata("coercionToUnitWithDefaults.kt")
public void testCoercionToUnitWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt");
}
@TestMetadata("coercionToUnitWithVararg.kt")
public void testCoercionToUnitWithVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt");
}
@TestMetadata("extensionReceiverVsDefault.kt")
public void testExtensionReceiverVsDefault() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
}
@TestMetadata("noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt")
public void testNoCoercionToUnitIfFunctionAlreadyReturnsUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt");
}
@TestMetadata("simpleEquality.kt")
public void testSimpleEquality() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt");
}
@TestMetadata("varargAsArrayMemberOrExtension.kt")
public void testVarargAsArrayMemberOrExtension() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
}
@TestMetadata("varargAsArrayWithDefaults.kt")
public void testVarargAsArrayWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
}
@TestMetadata("varargWithDefaults.kt")
public void testVarargWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/function")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -23706,6 +23774,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
}
@TestMetadata("adaptedCallableReferencesNotEqualToCallablesFromAPI.kt")
public void testAdaptedCallableReferencesNotEqualToCallablesFromAPI() throws Exception {
runTest("compiler/testData/codegen/box/reflection/methodsFromAny/adaptedCallableReferencesNotEqualToCallablesFromAPI.kt");
}
public void testAllFilesPresentInMethodsFromAny() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+68
View File
@@ -1589,6 +1589,74 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/equality")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Equality extends AbstractIrJsCodegenBoxTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS_IR, testDataFilePath);
}
public void testAllFilesPresentInEquality() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@TestMetadata("capturedDefaults.kt")
public void testCapturedDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt");
}
@TestMetadata("capturedVararg.kt")
public void testCapturedVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt");
}
@TestMetadata("coercionToUnit.kt")
public void testCoercionToUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt");
}
@TestMetadata("coercionToUnitWithDefaults.kt")
public void testCoercionToUnitWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt");
}
@TestMetadata("coercionToUnitWithVararg.kt")
public void testCoercionToUnitWithVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt");
}
@TestMetadata("extensionReceiverVsDefault.kt")
public void testExtensionReceiverVsDefault() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
}
@TestMetadata("noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt")
public void testNoCoercionToUnitIfFunctionAlreadyReturnsUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt");
}
@TestMetadata("simpleEquality.kt")
public void testSimpleEquality() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt");
}
@TestMetadata("varargAsArrayMemberOrExtension.kt")
public void testVarargAsArrayMemberOrExtension() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
}
@TestMetadata("varargAsArrayWithDefaults.kt")
public void testVarargAsArrayWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
}
@TestMetadata("varargWithDefaults.kt")
public void testVarargWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/function")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+68
View File
@@ -1589,6 +1589,74 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/equality")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Equality extends AbstractJsCodegenBoxTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest0(this::doTest, TargetBackend.JS, testDataFilePath);
}
public void testAllFilesPresentInEquality() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/callableReference/equality"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
}
@TestMetadata("capturedDefaults.kt")
public void testCapturedDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedDefaults.kt");
}
@TestMetadata("capturedVararg.kt")
public void testCapturedVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/capturedVararg.kt");
}
@TestMetadata("coercionToUnit.kt")
public void testCoercionToUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnit.kt");
}
@TestMetadata("coercionToUnitWithDefaults.kt")
public void testCoercionToUnitWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithDefaults.kt");
}
@TestMetadata("coercionToUnitWithVararg.kt")
public void testCoercionToUnitWithVararg() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/coercionToUnitWithVararg.kt");
}
@TestMetadata("extensionReceiverVsDefault.kt")
public void testExtensionReceiverVsDefault() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/extensionReceiverVsDefault.kt");
}
@TestMetadata("noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt")
public void testNoCoercionToUnitIfFunctionAlreadyReturnsUnit() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/noCoercionToUnitIfFunctionAlreadyReturnsUnit.kt");
}
@TestMetadata("simpleEquality.kt")
public void testSimpleEquality() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/simpleEquality.kt");
}
@TestMetadata("varargAsArrayMemberOrExtension.kt")
public void testVarargAsArrayMemberOrExtension() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayMemberOrExtension.kt");
}
@TestMetadata("varargAsArrayWithDefaults.kt")
public void testVarargAsArrayWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargAsArrayWithDefaults.kt");
}
@TestMetadata("varargWithDefaults.kt")
public void testVarargWithDefaults() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/equality/varargWithDefaults.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/callableReference/function")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
libraries/stdlib/jvm/runtime/kotlin/jvm/internal/CallableReference.java
+3 -7
View File
@@ -62,20 +62,16 @@ public abstract class CallableReference implements KCallable, Serializable {
@SinceKotlin(version = "1.1")
protected CallableReference(Object receiver) {
this(receiver, null, null, null, 0);
this(receiver, null, null, null, false);
}
/**
* @param flags Bitmask where bits represent the following flags:<br/>
* <li><ul>0 - the owner of this reference is a package, not a class.</ul></li>
*/
@SinceKotlin(version = "1.4")
protected CallableReference(Object receiver, Class owner, String name, String signature, int flags) {
protected CallableReference(Object receiver, Class owner, String name, String signature, boolean isTopLevel) {
this.receiver = receiver;
this.owner = owner;
this.name = name;
this.signature = signature;
this.isTopLevel = (flags & 1) == 1;
this.isTopLevel = isTopLevel;
}
protected abstract KCallable computeReflected();
libraries/stdlib/jvm/runtime/kotlin/jvm/internal/FunctionReference.java
+24 -3
View File
@@ -13,8 +13,26 @@ import kotlin.reflect.KFunction;
public class FunctionReference extends CallableReference implements FunctionBase, KFunction {
private final int arity;
/**
* Bitmask where bits represent the following flags:<br/>
* <li>
* <ul>0 - whether the vararg to element parameter type conversion happened, i.e.<pre>
* fun target(vararg xs: Int) {}
* fun use(f: (Int, Int, Int) -> Unit) {}
* use(::target)
* </pre></ul>
* <ul>1 - whether coercion of return type to Unit happened, i.e.<pre>
* fun target(): Boolean = true
* fun use(f: () -> Unit) {}
* use(::target)
* </pre></ul>
* </li>
*/
@SinceKotlin(version = "1.4")
private final int flags;
public FunctionReference(int arity) {
this.arity = arity;
this(arity, NO_RECEIVER, null, null, null, 0);
}
@SinceKotlin(version = "1.1")
@@ -24,8 +42,9 @@ public class FunctionReference extends CallableReference implements FunctionBase
@SinceKotlin(version = "1.4")
public FunctionReference(int arity, Object receiver, Class owner, String name, String signature, int flags) {
super(receiver, owner, name, signature, flags);
super(receiver, owner, name, signature, (flags & 1) == 1);
this.arity = arity;
this.flags = flags >> 1;
}
@Override
@@ -81,9 +100,11 @@ public class FunctionReference extends CallableReference implements FunctionBase
if (obj instanceof FunctionReference) {
FunctionReference other = (FunctionReference) obj;
return (getOwner() == null ? other.getOwner() == null : getOwner().equals(other.getOwner())) &&
return Intrinsics.areEqual(getOwner(), other.getOwner()) &&
getName().equals(other.getName()) &&
getSignature().equals(other.getSignature()) &&
flags == other.flags &&
arity == other.arity &&
Intrinsics.areEqual(getBoundReceiver(), other.getBoundReceiver());
}
if (obj instanceof KFunction) {
libraries/stdlib/jvm/runtime/kotlin/jvm/internal/PropertyReference.java
+1 -1
View File
@@ -22,7 +22,7 @@ public abstract class PropertyReference extends CallableReference implements KPr
@SinceKotlin(version = "1.4")
public PropertyReference(Object receiver, Class owner, String name, String signature, int flags) {
super(receiver, owner, name, signature, flags);
super(receiver, owner, name, signature, (flags & 1) == 1);
}
@Override
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+1 -1
View File
@@ -3226,7 +3226,7 @@ public abstract class kotlin/jvm/internal/CallableReference : java/io/Serializab
protected final field receiver Ljava/lang/Object;
public fun <init> ()V
protected fun <init> (Ljava/lang/Object;)V
protected fun <init> (Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
protected fun <init> (Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Z)V
public fun call ([Ljava/lang/Object;)Ljava/lang/Object;
public fun callBy (Ljava/util/Map;)Ljava/lang/Object;
public fun compute ()Lkotlin/reflect/KCallable;