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

Improve inline diagnostics, report "nothing to inline" on the modifier

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-14 13:02:12 +03:00
parent a946f787bc
commit b4470de713
9 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.kt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ inline fun <R> onlyLocal(p: () -> R) {
inlineAll(<!USAGE_IS_NOT_INLINABLE!>p<!>)
}
<!NOTHING_TO_INLINE!>inline fun <R> inlineAll(noinline p: () -> R)<!> {
<!NOTHING_TO_INLINE!>inline<!> fun <R> inlineAll(noinline p: () -> R) {
p()
}
compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ fun box() : String {
return "OK"
}
<!NOTHING_TO_INLINE!>inline fun <T> test(p: T)<!> {
<!NOTHING_TO_INLINE!>inline<!> fun <T> test(p: T) {
p.toString()
}
compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsNonFunction.kt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ fun box() : String {
return "OK"
}
<!NOTHING_TO_INLINE!>inline fun test(p: Any)<!> {
<!NOTHING_TO_INLINE!>inline<!> fun test(p: Any) {
p.toString()
}
compiler/testData/diagnostics/tests/inline/nothingToInline.kt
Vendored
+6 -6
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NULLABLE_INLINE_PARAMETER -CONFLICTING_JVM_DECLARATIONS
<!NOTHING_TO_INLINE!>inline fun test()<!> {
<!NOTHING_TO_INLINE!>inline<!> fun test() {
}
@@ -8,22 +8,22 @@ inline fun test2(s : (Int) -> Int) {
}
<!NOTHING_TO_INLINE!>inline fun test3(noinline s : (Int) -> Int)<!> {
<!NOTHING_TO_INLINE!>inline<!> fun test3(noinline s : (Int) -> Int) {
}
<!NOTHING_TO_INLINE!>inline fun test4(noinline s : Int.() -> Int)<!> {
<!NOTHING_TO_INLINE!>inline<!> fun test4(noinline s : Int.() -> Int) {
}
<!NOTHING_TO_INLINE!>inline fun Function1<Int, Int>?.test5()<!> {
<!NOTHING_TO_INLINE!>inline<!> fun Function1<Int, Int>?.test5() {
}
<!NOTHING_TO_INLINE!>inline fun Function1<Int, Int>?.test6()<!> {
<!NOTHING_TO_INLINE!>inline<!> fun Function1<Int, Int>?.test6() {
}
<!NOTHING_TO_INLINE!>inline fun test2(s : ((Int) -> Int)?)<!> {
<!NOTHING_TO_INLINE!>inline<!> fun test2(s : ((Int) -> Int)?) {
}
compiler/testData/diagnostics/tests/inline/nullableFunction.kt
Vendored
+2 -2
View File
@@ -12,10 +12,10 @@ public inline fun <T> submitNoInline(noinline action: Function1<Int, Int>?, s: (
action?.invoke(10)
}
<!NOTHING_TO_INLINE!>public inline fun <T> <!NULLABLE_INLINE_PARAMETER!>Function1<Int, Int>?<!>.submit()<!> {
public <!NOTHING_TO_INLINE!>inline<!> fun <T> <!NULLABLE_INLINE_PARAMETER!>Function1<Int, Int>?<!>.submit() {
}
<!NOTHING_TO_INLINE!>public inline fun <T> submit(<!NULLABLE_INLINE_PARAMETER!>action: Function1<Int, Int>?<!>)<!> {
public <!NOTHING_TO_INLINE!>inline<!> fun <T> submit(<!NULLABLE_INLINE_PARAMETER!>action: Function1<Int, Int>?<!>) {
}
compiler/testData/diagnostics/testsWithStdLib/native/inline.kt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
import kotlin.jvm.*
abstract class C {
<!EXTERNAL_DECLARATION_CANNOT_BE_INLINED, NOTHING_TO_INLINE!>inline external fun foo()<!>
<!EXTERNAL_DECLARATION_CANNOT_BE_INLINED!><!NOTHING_TO_INLINE!>inline<!> external fun foo()<!>
}
fun test() {
abstract class Local {
<!EXTERNAL_DECLARATION_CANNOT_BE_INLINED, NOTHING_TO_INLINE!>inline external fun foo()<!>
<!EXTERNAL_DECLARATION_CANNOT_BE_INLINED!><!NOTHING_TO_INLINE!>inline<!> external fun foo()<!>
}
}