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

Minor: Fix light analysis tests (rebase to master)

Browse Source
This commit is contained in:
Yan Zhulanow
2016-12-11 21:03:05 +03:00
parent 40ff7c6e33
commit 2f50bd8c80
45 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/light-analysis/jvmOverloads/companionObject.txt
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ public final class C {
public final static field Companion: C.Companion
inner class C/Companion
public method <init>(): void
public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final static @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
}
@@ -11,7 +11,7 @@ public final static class C/Companion {
inner class C/Companion
private method <init>(): void
public synthetic static method foo$default(p0: C.Companion, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmStatic @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/defaultsNotAtEnd.txt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@ public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: int, p3: java.lang.String, p4: int, p5: int, p6: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, p2: int): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: int, p1: int): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, p1: int, p2: int): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(p0: int, p1: int): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/doubleParameters.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: double, p2: double, p3: java.lang.String, p4: int, p5: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: double, p1: double): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(p0: double, p1: double): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: double, p1: double, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/extensionMethod.txt
Vendored
+1 -1
View File
@@ -7,5 +7,5 @@ public final class ExtensionMethodKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: C, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String
public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: C, p1: java.lang.String): java.lang.String
public final static @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: C, p1: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/generics.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: java.lang.Object, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(p0: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/innerClass.txt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ public final class Outer/Inner {
synthetic final field this$0: Outer
inner class Outer/Inner
public @kotlin.jvm.JvmOverloads method <init>(@java.lang.Synthetic p0: Outer, @org.jetbrains.annotations.NotNull p1: java.lang.String, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
public @kotlin.jvm.JvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: Outer, p1: java.lang.String): void
public @kotlin.jvm.JvmOverloads @synthetic.kotlin.jvm.GeneratedByJvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: Outer, p1: java.lang.String): void
public synthetic method <init>(p0: Outer, p1: java.lang.String, p2: java.lang.String, p3: int, p4: kotlin.jvm.internal.DefaultConstructorMarker): void
public final @org.jetbrains.annotations.NotNull method getS1(): java.lang.String
public final @org.jetbrains.annotations.NotNull method getS2(): java.lang.String
compiler/testData/codegen/light-analysis/jvmOverloads/multipleDefaultParameters.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/nonDefaultParameter.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/primaryConstructor.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final class C {
private final @org.jetbrains.annotations.NotNull field status: java.lang.String
public @kotlin.jvm.JvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public @kotlin.jvm.JvmOverloads @synthetic.kotlin.jvm.GeneratedByJvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public @kotlin.jvm.JvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
public synthetic method <init>(p0: java.lang.String, p1: java.lang.String, p2: int, p3: kotlin.jvm.internal.DefaultConstructorMarker): void
public final @org.jetbrains.annotations.NotNull method getStatus(): java.lang.String
compiler/testData/codegen/light-analysis/jvmOverloads/privateClass.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
final class C {
private final @org.jetbrains.annotations.NotNull field status: java.lang.String
public method <init>(): void
public @synthetic.kotlin.jvm.GeneratedByJvmOverloads method <init>(): void
public method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public synthetic method <init>(p0: java.lang.String, p1: int, p2: kotlin.jvm.internal.DefaultConstructorMarker): void
public final @org.jetbrains.annotations.NotNull method component1(): java.lang.String
compiler/testData/codegen/light-analysis/jvmOverloads/secondaryConstructor.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class C {
private final field i: int
private @org.jetbrains.annotations.NotNull field status: java.lang.String
public @kotlin.jvm.JvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public @kotlin.jvm.JvmOverloads @synthetic.kotlin.jvm.GeneratedByJvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String): void
public @kotlin.jvm.JvmOverloads method <init>(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): void
public method <init>(p0: int): void
public synthetic method <init>(p0: java.lang.String, p1: java.lang.String, p2: int, p3: kotlin.jvm.internal.DefaultConstructorMarker): void
compiler/testData/codegen/light-analysis/jvmOverloads/simple.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: int, p3: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/simpleJavaCall.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: java.lang.String, p2: java.lang.String, p3: int, p4: java.lang.Object): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
public final @kotlin.jvm.JvmOverloads @org.jetbrains.annotations.NotNull method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String, @org.jetbrains.annotations.NotNull p1: java.lang.String): java.lang.String
}
compiler/testData/codegen/light-analysis/jvmOverloads/varargs.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public final class C {
public method <init>(): void
public synthetic static method foo$default(p0: C, p1: int, p2: java.lang.String[], p3: int, p4: java.lang.Object): void
public final @kotlin.jvm.JvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final @kotlin.jvm.JvmOverloads @synthetic.kotlin.jvm.GeneratedByJvmOverloads method foo(@org.jetbrains.annotations.NotNull p0: java.lang.String[]): void
public final @kotlin.jvm.JvmOverloads method foo(p0: int, @org.jetbrains.annotations.NotNull p1: java.lang.String[]): void
}