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

Sort class members to ensure deterministic builds

Browse Source 
Class methods and fields are currently sorted at serialization (see
DescriptorSerializer.sort) and at deserialization (see
DeserializedMemberScope.OptimizedImplementation#addMembers). Therefore,
the contents of the generated stub files are sorted in incremental
builds but not in clean builds.

The consequence is that the contents of the generated stub files may not
be consistent across a clean build and an incremental build, making the
build non-deterministic and dependent tasks run unnecessarily (see
KT-40882).

To work around that, this commit sorts class methods and fields when
outputting stub files.

Bug: KT-40882 (there are actually 2 issues in here; this commit fixes
     the first one)
Test: New DeterministicBuildIT + Updated existing test expectation files
This commit is contained in:
Hung Nguyen
2020-11-12 12:51:47 +00:00
committed by nataliya.valtman
parent 07a797cc3a
commit 4bf63a9539
70 changed files with 1380 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
Vendored
+26 -26
View File
@@ -23,10 +23,10 @@ public final class AnnotationsTest {
super();
}
@Anno(value = "top-level-fun")
public static final void topLevelFun(@org.jetbrains.annotations.NotNull()
@Anno(value = "top-level-fun-receiver")
java.lang.String $this$topLevelFun) {
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
int $this$topLevelVal) {
return null;
}
@Anno(value = "top-level-val")
@@ -34,10 +34,10 @@ public final class AnnotationsTest {
public static void getTopLevelVal$annotations(int p0) {
}
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
int $this$topLevelVal) {
return null;
@Anno(value = "top-level-fun")
public static final void topLevelFun(@org.jetbrains.annotations.NotNull()
@Anno(value = "top-level-fun-receiver")
java.lang.String $this$topLevelFun) {
}
}
@@ -56,14 +56,14 @@ public enum Enum {
/*public static final*/ BLACK /* = new Enum() */;
private final int x = 0;
public final int getX() {
return 0;
}
@Anno(value = "enum-constructor")
Enum(@Anno(value = "x")
int x) {
}
public final int getX() {
return 0;
}
}
////////////////////
@@ -78,21 +78,23 @@ public abstract class Test {
@org.jetbrains.annotations.NotNull()
private java.lang.String v;
@Anno(value = "test-constructor")
protected Test(@org.jetbrains.annotations.NotNull()
@Anno(value = "v-param")
java.lang.String v) {
super();
}
@org.jetbrains.annotations.NotNull()
@Anno(value = "abstract-method")
public abstract java.lang.String abstractMethod();
@Anno(value = "abstract-val")
@java.lang.Deprecated()
public static void getAbstractVal$annotations() {
}
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String getAbstractVal();
@Anno(value = "v-property")
@Anno(value = "abstract-val")
@java.lang.Deprecated()
public static void getV$annotations() {
public static void getAbstractVal$annotations() {
}
@org.jetbrains.annotations.NotNull()
@@ -101,16 +103,14 @@ public abstract class Test {
return null;
}
@Anno(value = "v-property")
@java.lang.Deprecated()
public static void getV$annotations() {
}
@Anno(value = "v-set")
public final void setV(@org.jetbrains.annotations.NotNull()
@Anno(value = "v-setparam")
java.lang.String p0) {
}
@Anno(value = "test-constructor")
protected Test(@org.jetbrains.annotations.NotNull()
@Anno(value = "v-param")
java.lang.String v) {
super();
}
}