From 07ff2d8e2639b55ac22da296d1047ac6c25fab95 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Tue, 2 Feb 2016 16:37:19 +0100 Subject: [PATCH 1/2] Add a pending test for a modified member of a trait The test shows that name hashing optimization is broken for members defined in traits. The problem is that modification of a member of a trait triggers change of a hash of trait's name. The behavior covered by this test regressed in 40ebc825317ed29a2ab87be07246fcdcfc6d1e3d The bug is tracked in #2436. --- .../trait-member-modified/build.sbt | 27 +++++++++++++++++++ .../trait-member-modified/changes/A1.scala | 3 +++ .../trait-member-modified/pending | 9 +++++++ .../src/main/scala/A.scala | 1 + .../src/main/scala/B.scala | 1 + 5 files changed, 41 insertions(+) create mode 100644 sbt/src/sbt-test/compiler-project/trait-member-modified/build.sbt create mode 100644 sbt/src/sbt-test/compiler-project/trait-member-modified/changes/A1.scala create mode 100644 sbt/src/sbt-test/compiler-project/trait-member-modified/pending create mode 100644 sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/A.scala create mode 100644 sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/B.scala diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/build.sbt b/sbt/src/sbt-test/compiler-project/trait-member-modified/build.sbt new file mode 100644 index 000000000..949d78231 --- /dev/null +++ b/sbt/src/sbt-test/compiler-project/trait-member-modified/build.sbt @@ -0,0 +1,27 @@ +/* Performs checks related to compilations: + * a) checks in which compilation given set of files was recompiled + * b) checks overall number of compilations performed + */ +TaskKey[Unit]("check-compilations") := { + val analysis = (compile in Compile).value + val srcDir = (scalaSource in Compile).value + def relative(f: java.io.File): java.io.File = f.relativeTo(srcDir) getOrElse f + val allCompilations = analysis.compilations.allCompilations + val recompiledFiles: Seq[Set[java.io.File]] = allCompilations map { c => + val recompiledFiles = analysis.apis.internal.collect { + case (file, api) if api.compilation.startTime == c.startTime => relative(file) + } + recompiledFiles.toSet + } + def recompiledFilesInIteration(iteration: Int, fileNames: Set[String]) = { + val files = fileNames.map(new java.io.File(_)) + assert(recompiledFiles(iteration) == files, "%s != %s".format(recompiledFiles(iteration), files)) + } + assert(allCompilations.size == 2) + // B.scala is just compiled at the beginning + recompiledFilesInIteration(0, Set("B.scala")) + // A.scala is changed and recompiled + recompiledFilesInIteration(1, Set("A.scala")) +} + +logLevel := Level.Debug diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/changes/A1.scala b/sbt/src/sbt-test/compiler-project/trait-member-modified/changes/A1.scala new file mode 100644 index 000000000..57a1f34c6 --- /dev/null +++ b/sbt/src/sbt-test/compiler-project/trait-member-modified/changes/A1.scala @@ -0,0 +1,3 @@ +trait A { + def foo: Int = 12 +} diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/pending b/sbt/src/sbt-test/compiler-project/trait-member-modified/pending new file mode 100644 index 000000000..f8f7cb076 --- /dev/null +++ b/sbt/src/sbt-test/compiler-project/trait-member-modified/pending @@ -0,0 +1,9 @@ +# Test if adding a member to a trait affects classes that refer to that trait +# by a member reference +> compile +# add `foo` method to `A` +$ copy-file changes/A1.scala src/main/scala/A.scala +# only A.scala should be recompiled +> compile +# check if there are only two compile iterations performed +> check-compilations diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/A.scala b/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/A.scala new file mode 100644 index 000000000..0eab80adc --- /dev/null +++ b/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/A.scala @@ -0,0 +1 @@ +trait A diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/B.scala b/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/B.scala new file mode 100644 index 000000000..c4d3f7e97 --- /dev/null +++ b/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/B.scala @@ -0,0 +1 @@ +class B(a: A) From 0f5f818c730b6d604ba15bd97b2579080bc1b5ed Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Wed, 3 Feb 2016 14:34:31 +0100 Subject: [PATCH 2/2] Move `trait-member-modified` to source-dependencies It's not clear what the distinction between compiler-project and source-dependencies scripted tests is so let's stick to the one that has the biggest number of tests for incremental compiler. --- .../trait-member-modified/build.sbt | 0 .../trait-member-modified/changes/A1.scala | 0 .../trait-member-modified/pending | 0 .../trait-member-modified/src/main/scala/A.scala | 0 .../trait-member-modified/src/main/scala/B.scala | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename sbt/src/sbt-test/{compiler-project => source-dependencies}/trait-member-modified/build.sbt (100%) rename sbt/src/sbt-test/{compiler-project => source-dependencies}/trait-member-modified/changes/A1.scala (100%) rename sbt/src/sbt-test/{compiler-project => source-dependencies}/trait-member-modified/pending (100%) rename sbt/src/sbt-test/{compiler-project => source-dependencies}/trait-member-modified/src/main/scala/A.scala (100%) rename sbt/src/sbt-test/{compiler-project => source-dependencies}/trait-member-modified/src/main/scala/B.scala (100%) diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/build.sbt b/sbt/src/sbt-test/source-dependencies/trait-member-modified/build.sbt similarity index 100% rename from sbt/src/sbt-test/compiler-project/trait-member-modified/build.sbt rename to sbt/src/sbt-test/source-dependencies/trait-member-modified/build.sbt diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala similarity index 100% rename from sbt/src/sbt-test/compiler-project/trait-member-modified/changes/A1.scala rename to sbt/src/sbt-test/source-dependencies/trait-member-modified/changes/A1.scala diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/pending b/sbt/src/sbt-test/source-dependencies/trait-member-modified/pending similarity index 100% rename from sbt/src/sbt-test/compiler-project/trait-member-modified/pending rename to sbt/src/sbt-test/source-dependencies/trait-member-modified/pending diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/A.scala b/sbt/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala similarity index 100% rename from sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/A.scala rename to sbt/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/A.scala diff --git a/sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/B.scala b/sbt/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala similarity index 100% rename from sbt/src/sbt-test/compiler-project/trait-member-modified/src/main/scala/B.scala rename to sbt/src/sbt-test/source-dependencies/trait-member-modified/src/main/scala/B.scala