FIR: assure annotation argument mapping is ready
^KT-66223 fixed
This commit is contained in:
@@ -563,6 +563,11 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
|
|||||||
val annotationCall = customAnnotations.firstOrNull {
|
val annotationCall = customAnnotations.firstOrNull {
|
||||||
it.resolvedType.fullyExpandedType(session).classId?.asSingleFqName() == fqName
|
it.resolvedType.fullyExpandedType(session).classId?.asSingleFqName() == fqName
|
||||||
} ?: return null
|
} ?: return null
|
||||||
|
|
||||||
|
if (annotationCall is FirAnnotationCall) {
|
||||||
|
annotationCall.containingDeclarationSymbol.lazyResolveToPhase(FirResolvePhase.ANNOTATION_ARGUMENTS)
|
||||||
|
}
|
||||||
|
|
||||||
val argument = when (val argument = annotationCall.argumentMapping.mapping.values.firstOrNull() ?: return null) {
|
val argument = when (val argument = annotationCall.argumentMapping.mapping.values.firstOrNull() ?: return null) {
|
||||||
is FirVarargArgumentsExpression -> argument.arguments.firstOrNull()
|
is FirVarargArgumentsExpression -> argument.arguments.firstOrNull()
|
||||||
is FirArrayLiteral -> argument.arguments.firstOrNull()
|
is FirArrayLiteral -> argument.arguments.firstOrNull()
|
||||||
|
|||||||
Vendored
+1
-1
@@ -33,7 +33,7 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ {
|
|||||||
public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);// deepOpen(Out<Out<Out<Open>>>)
|
public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);// deepOpen(Out<Out<Out<Open>>>)
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
@org.jetbrains.annotations.NotNull()
|
||||||
public static final OutPair<Final, OutPair<Out<Final>, Out<Final>>> falseTrueFalse();// falseTrueFalse()
|
public static final OutPair<? extends Final, OutPair<Out<Final>, Out<? extends Final>>> falseTrueFalse();// falseTrueFalse()
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
@org.jetbrains.annotations.NotNull()
|
||||||
public static final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();// combination()
|
public static final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();// combination()
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAc
|
|||||||
public final Out<? extends Final> getSimpleOut();// getSimpleOut()
|
public final Out<? extends Final> getSimpleOut();// getSimpleOut()
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
@org.jetbrains.annotations.NotNull()
|
||||||
public final Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);// getZoo(Out<? extends Out<? extends Out<? extends Open>>>)
|
public final Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);// getZoo(Out<Out<Out<Open>>>)
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
@org.jetbrains.annotations.NotNull()
|
||||||
public final Out<Open> getBar();// getBar()
|
public final Out<Open> getBar();// getBar()
|
||||||
-107
@@ -1,107 +0,0 @@
|
|||||||
public abstract interface A /* A*/<T> {
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = true)
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public abstract Out<T> foo();// foo()
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract interface B /* B*/ {
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = true)
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public abstract In<Open> foo();// foo()
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class Container /* Container*/ {
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = false)
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final Out<? extends Open> bar();// bar()
|
|
||||||
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = false)
|
|
||||||
public final int foo(boolean, @org.jetbrains.annotations.NotNull() Out<? extends java.lang.Integer>);// foo(boolean, Out<? extends java.lang.Integer>)
|
|
||||||
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = true)
|
|
||||||
public final int bar(boolean, @org.jetbrains.annotations.NotNull() In<java.lang.Long>, long);// bar(boolean, In<java.lang.Long>, long)
|
|
||||||
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = true)
|
|
||||||
public final void deepOpen(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);// deepOpen(Out<Out<Out<Open>>>)
|
|
||||||
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = true)
|
|
||||||
public final void zoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>, @org.jetbrains.annotations.NotNull() Out<? extends Open>);// zoo(Out<Out<Out<Open>>>, Out<? extends Open>)
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final OutPair<Final, OutPair<Out<Final>, Out<Final>>> falseTrueFalse();// falseTrueFalse()
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final OutPair<Open, ? extends OutPair<Open,? extends Out<Open>>> combination();// combination()
|
|
||||||
|
|
||||||
public Container();// .ctor()
|
|
||||||
|
|
||||||
public final void simpleIn(@org.jetbrains.annotations.NotNull() In<? super java.lang.Object>);// simpleIn(In<? super java.lang.Object>)
|
|
||||||
|
|
||||||
public final void simpleOut(@org.jetbrains.annotations.NotNull() Out<? extends Final>);// simpleOut(Out<? extends Final>)
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAccessors*/ {
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
private Out<? extends Open> bar;
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
private final In<? super java.lang.Object> simpleIn;
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
private final Out<? extends Final> simpleOut;
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
private final Out<Out<Out<Open>>> deepOpen;
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final In<? super java.lang.Object> getSimpleIn();// getSimpleIn()
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final Out<? extends Final> getSimpleOut();// getSimpleOut()
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final Out<Open> getBar();// getBar()
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final Out<Open> getZoo(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);// getZoo(Out<? extends Out<? extends Out<? extends Open>>>)
|
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
|
||||||
public final Out<Out<Out<Open>>> getDeepOpen();// getDeepOpen()
|
|
||||||
|
|
||||||
public ContainerForPropertyAndAccessors();// .ctor()
|
|
||||||
|
|
||||||
public final void setBar(@org.jetbrains.annotations.NotNull() Out<? extends Open>);// setBar(Out<? extends Open>)
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class Final /* Final*/ {
|
|
||||||
public Final();// .ctor()
|
|
||||||
}
|
|
||||||
|
|
||||||
@kotlin.jvm.JvmSuppressWildcards(suppress = true)
|
|
||||||
public final class HasAnnotation /* HasAnnotation*/ {
|
|
||||||
public HasAnnotation();// .ctor()
|
|
||||||
|
|
||||||
public final void doesNot(@org.jetbrains.annotations.NotNull() Out<Out<Open>>);// doesNot(Out<Out<Open>>)
|
|
||||||
|
|
||||||
public final void parameterDisagrees(@org.jetbrains.annotations.NotNull() Out<java.lang.Integer>);// parameterDisagrees(Out<java.lang.Integer>)
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class In /* In*/<Z> {
|
|
||||||
public In();// .ctor()
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class Inv /* Inv*/<E> {
|
|
||||||
public Inv();// .ctor()
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Open /* Open*/ {
|
|
||||||
public Open();// .ctor()
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class Out /* Out*/<T> {
|
|
||||||
public Out();// .ctor()
|
|
||||||
}
|
|
||||||
|
|
||||||
public final class OutPair /* OutPair*/<Final, Y> {
|
|
||||||
public OutPair();// .ctor()
|
|
||||||
}
|
|
||||||
+1
-1
@@ -60,7 +60,7 @@ public final class ContainerForPropertyAndAccessors /* ContainerForPropertyAndAc
|
|||||||
public final Out<? extends Final> getSimpleOut();// getSimpleOut()
|
public final Out<? extends Final> getSimpleOut();// getSimpleOut()
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
@org.jetbrains.annotations.NotNull()
|
||||||
public final Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<Out<Out<Open>>>);// getZoo(Out<Out<Out<Open>>>)
|
public final Out<? extends Open> getZoo(@org.jetbrains.annotations.NotNull() Out<? extends Out<? extends Out<? extends Open>>>);// getZoo(Out<? extends Out<? extends Out<? extends Open>>>)
|
||||||
|
|
||||||
@org.jetbrains.annotations.NotNull()
|
@org.jetbrains.annotations.NotNull()
|
||||||
public final Out<Open> getBar();// getBar()
|
public final Out<Open> getBar();// getBar()
|
||||||
|
|||||||
Reference in New Issue
Block a user