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

Fix some tests related to direct invoke optimization

Browse Source 
- Fix test data of light class tests
  (SymbolLightClassesForLibraryTestGenerated).
- Revert the changes in kt8666.kt because they fail on JS IR, and it
  seems that this test is mostly needed for JS anyway.
- Use 'invoke(' as the pattern in bytecode text tests because plain
  'invoke' is used when these tests are run on JDK 11, where indy string
  concatenation is enabled by default and therefore we reference
  `java/lang/invoke/StringConcatFactory`.
This commit is contained in:
Alexander Udalov
2022-07-15 00:17:00 +02:00
parent 8014712569
commit 3b613b3745
18 changed files with 20 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.lib.java
Vendored
-99
View File
@@ -1,99 +0,0 @@
public final class Class /* Class*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.String notNullVal;
@org.jetbrains.annotations.NotNull()
private final java.lang.String privateNN;
@org.jetbrains.annotations.NotNull()
private java.lang.String notNullVar;
@org.jetbrains.annotations.Nullable()
private final java.lang.String nullableVal;
@org.jetbrains.annotations.Nullable()
private final java.lang.String privateN;
@org.jetbrains.annotations.Nullable()
private java.lang.String nullableVar;
public java.lang.String lateInitVar;
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNotNullValWithGet();// getNotNullValWithGet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNotNullVarWithGetSet();// getNotNullVarWithGetSet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableValWithGet();// getNullableValWithGet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableVarWithGetSet();// getNullableVarWithGetSet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String notNullWithN();// notNullWithN()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String nullableWithNN();// nullableWithNN()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getLateInitVar();// getLateInitVar()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getNotNullVal();// getNotNullVal()
@org.jetbrains.annotations.NotNull()
public final java.lang.String getNotNullVar();// getNotNullVar()
@org.jetbrains.annotations.NotNull()
public final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);// notNull(java.lang.String)
@org.jetbrains.annotations.NotNull()
public final java.lang.String notNullWithNN();// notNullWithNN()
@org.jetbrains.annotations.NotNull()
public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVarWithGetSet(java.lang.String)
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableVal();// getNullableVal()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableVar();// getNullableVar()
@org.jetbrains.annotations.Nullable()
public final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);// nullable(java.lang.String)
@org.jetbrains.annotations.Nullable()
public final java.lang.String nullableWithN();// nullableWithN()
@org.jetbrains.annotations.Nullable()
public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVarWithGetSet(java.lang.String)
private static final java.lang.String notNullVal$lambda$2();// notNullVal$lambda$2()
private static final java.lang.String notNullVar$lambda$3();// notNullVar$lambda$3()
private static final java.lang.String nullableVal$lambda$0();// nullableVal$lambda$0()
private static final java.lang.String nullableVar$lambda$1();// nullableVar$lambda$1()
private static final java.lang.String privateN$lambda$5();// privateN$lambda$5()
private static final java.lang.String privateNN$lambda$4();// privateNN$lambda$4()
public Class();// .ctor()
public final void setLateInitVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setLateInitVar(java.lang.String)
public final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String)
public final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String)
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.lib.java
Vendored
-24
View File
@@ -1,24 +0,0 @@
public final class ClassObjectField /* ClassObjectField*/ {
@org.jetbrains.annotations.NotNull()
public static final ClassObjectField.Companion Companion;
@org.jetbrains.annotations.Nullable()
private static final java.lang.String x;
@org.jetbrains.annotations.Nullable()
private static final java.lang.String y;
private static final java.lang.String x$lambda$0();// x$lambda$0()
private static final java.lang.String y$lambda$1();// y$lambda$1()
public ClassObjectField();// .ctor()
public static final class Companion /* ClassObjectField.Companion*/ {
@org.jetbrains.annotations.Nullable()
public final java.lang.String getX();// getX()
private Companion();// .ctor()
}}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.lib.java
Vendored
-92
View File
@@ -1,92 +0,0 @@
public final class FileFacadeKt /* FileFacadeKt*/ {
@org.jetbrains.annotations.NotNull()
private static final java.lang.String notNullVal;
@org.jetbrains.annotations.NotNull()
private static final java.lang.String privateNn;
@org.jetbrains.annotations.NotNull()
private static java.lang.String notNullVar;
@org.jetbrains.annotations.Nullable()
private static final java.lang.String nullableVal;
@org.jetbrains.annotations.Nullable()
private static final java.lang.String privateN;
@org.jetbrains.annotations.Nullable()
private static java.lang.String nullableVar;
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNotNullValWithGet();// getNotNullValWithGet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNotNullVarWithGetSet();// getNotNullVarWithGetSet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableValWithGet();// getNullableValWithGet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableVarWithGetSet();// getNullableVarWithGetSet()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String notNullWithN();// notNullWithN()
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String nullableWithNN();// nullableWithNN()
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getNotNullVal();// getNotNullVal()
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getNotNullVar();// getNotNullVar()
@org.jetbrains.annotations.NotNull()
public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);// notNull(java.lang.String)
@org.jetbrains.annotations.NotNull()
public static final java.lang.String notNullWithNN();// notNullWithNN()
@org.jetbrains.annotations.NotNull()
public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVarWithGetSet(java.lang.String)
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableVal();// getNullableVal()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableVar();// getNullableVar()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);// nullable(java.lang.String)
@org.jetbrains.annotations.Nullable()
public static final java.lang.String nullableWithN();// nullableWithN()
@org.jetbrains.annotations.Nullable()
public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVarWithGetSet(java.lang.String)
private static final java.lang.String notNullVal$lambda$2();// notNullVal$lambda$2()
private static final java.lang.String notNullVar$lambda$3();// notNullVar$lambda$3()
private static final java.lang.String nullableVal$lambda$0();// nullableVal$lambda$0()
private static final java.lang.String nullableVar$lambda$1();// nullableVar$lambda$1()
private static final java.lang.String privateFun(java.lang.String, java.lang.String);// privateFun(java.lang.String, java.lang.String)
private static final java.lang.String privateN$lambda$5();// privateN$lambda$5()
private static final java.lang.String privateNn$lambda$4();// privateNn$lambda$4()
public static final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String)
public static final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String)
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.lib.java
Vendored
-14
View File
@@ -1,14 +0,0 @@
public final class C /* C*/ implements Tr {
private final int v;
@org.jetbrains.annotations.NotNull()
public java.lang.Integer foo();// foo()
@org.jetbrains.annotations.NotNull()
public java.lang.Integer getV();// getV()
private static final int v$lambda$0();// v$lambda$0()
public C();// .ctor()
}