From ab26de17eb807d2d950ee8be45d42832ae14934f Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 15 May 2017 16:26:35 +0300 Subject: [PATCH] Update test for incremental compilation after new DCE Previous test had an inline setter that didn't produce any effect, thus, corresponding code was removed by new DCE. Make sure that changes made in the inline property are caught up by IC. Original commit: 890350433406991c63e1fd18b8967606647d221f --- .../pureKotlin/inlineClassVarProperty/inline.kt | 6 ++++-- .../pureKotlin/inlineClassVarProperty/inline.kt.new | 6 ++++-- .../pureKotlin/inlineTopLevelVarProperty/build.log | 2 +- .../pureKotlin/inlineTopLevelVarProperty/inline.kt | 8 ++++++-- .../pureKotlin/inlineTopLevelVarProperty/inline.kt.new | 8 ++++++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt index f5e8fa6a4b1..9cc37e4b71b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt @@ -1,9 +1,11 @@ package inline class A { + var z = 0 + inline var f: Int - get() = 0 + get() = z set(p: Int) { - 0 + z = p } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new index 05b3f2c0365..299071674f1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new @@ -1,9 +1,11 @@ package inline class A { + var z = 0 + inline var f: Int - get() = 0 + get() = z set(p: Int) { - 1 + z = p + 1 } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log index 98c5e9ece93..965d0ac8180 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log @@ -19,4 +19,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt index e345852dbb9..89b4af8b157 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt @@ -1,5 +1,9 @@ package inline +var z = 0 + inline var f: Int - get() = 0 - set(p: Int) {0} + get() = z + set(p: Int) { + z = p + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new index bf8d995196a..4e36b0312af 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new @@ -1,5 +1,9 @@ package inline +var z = 0 + inline var f: Int - get() = 0 - set(p: Int) { 1 } \ No newline at end of file + get() = z + set(p: Int) { + z = p + 1 + } \ No newline at end of file