From cd6b2a2a8cd4903848c815660025b2472160bbc4 Mon Sep 17 00:00:00 2001
From: Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com>
Date: Sun, 15 Dec 2013 23:46:07 +0100
Subject: [PATCH] Mark tests that regress when name hashing is enabled.

There are number of scripted tests that fail if we switch to name hashing
being enabled by default. There's no easy way to mark those tests as
pending only when name hashing flag is enabled so I decided to "mark" them
by copying those tests, enabling name hashing in each of them and mark
those copies as pending.

Here's explanation of each failing test:

  * `constants` and `java-static` fail due to typer inlining constants
    so we can't track dependencies properly (see SI-7173)
  * `macro` fails for similar reasons as above: typer expands macros
    and we can't track dependencies properly
  * `struct` fails because it turns out that we need to handle structural
    types in a special way both at declaration and use sites. At the moment
    we handle them explicitly at declaration site so `struct-usage` passes
    but `struct` fails
---
 .../constants-name-hashing/build.sbt          |  1 +
 .../constants-name-hashing/changes/A1.scala   |  1 +
 .../constants-name-hashing/changes/A2.scala   |  1 +
 .../constants-name-hashing/changes/B.scala    |  4 +++
 .../constants-name-hashing/pending            | 11 +++++++
 .../java-static-name-hashing/build.sbt        |  1 +
 .../java-static-name-hashing/changes/J1.java  |  4 +++
 .../java-static-name-hashing/changes/J2.java  |  4 +++
 .../java-static-name-hashing/changes/S.scala  |  4 +++
 .../java-static-name-hashing/pending          | 24 +++++++++++++++
 .../macro-client/Client.scala                 |  5 ++++
 .../macro-provider/Provider.scala             |  8 +++++
 .../macro-provider/changes/Provider.scala     |  8 +++++
 .../macro-name-hashing/pending                | 13 +++++++++
 .../macro-name-hashing/project/build.scala    | 29 +++++++++++++++++++
 .../struct-name-hashing/A.scala               |  3 ++
 .../struct-name-hashing/B.scala               |  4 +++
 .../struct-name-hashing/C.scala               |  4 +++
 .../struct-name-hashing/build.sbt             |  1 +
 .../struct-name-hashing/changes/A.scala       |  3 ++
 .../struct-name-hashing/pending               |  6 ++++
 21 files changed, 139 insertions(+)
 create mode 100644 sbt/src/sbt-test/source-dependencies/constants-name-hashing/build.sbt
 create mode 100644 sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A1.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A2.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/B.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/constants-name-hashing/pending
 create mode 100644 sbt/src/sbt-test/source-dependencies/java-static-name-hashing/build.sbt
 create mode 100644 sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J1.java
 create mode 100644 sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J2.java
 create mode 100644 sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/S.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/java-static-name-hashing/pending
 create mode 100644 sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-client/Client.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/Provider.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/changes/Provider.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/macro-name-hashing/pending
 create mode 100644 sbt/src/sbt-test/source-dependencies/macro-name-hashing/project/build.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/struct-name-hashing/A.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/struct-name-hashing/B.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/struct-name-hashing/C.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/struct-name-hashing/build.sbt
 create mode 100644 sbt/src/sbt-test/source-dependencies/struct-name-hashing/changes/A.scala
 create mode 100644 sbt/src/sbt-test/source-dependencies/struct-name-hashing/pending

diff --git a/sbt/src/sbt-test/source-dependencies/constants-name-hashing/build.sbt b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/build.sbt
new file mode 100644
index 000000000..8a38ef414
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/build.sbt
@@ -0,0 +1 @@
+incOptions := incOptions.value.withNameHashing(true)
diff --git a/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A1.scala b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A1.scala
new file mode 100644
index 000000000..f67b6f474
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A1.scala
@@ -0,0 +1 @@
+object A { final val x = 1 }
diff --git a/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A2.scala b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A2.scala
new file mode 100644
index 000000000..4f9396f13
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/A2.scala
@@ -0,0 +1 @@
+object A { final val x = 2 }
diff --git a/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/B.scala b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/B.scala
new file mode 100644
index 000000000..058527993
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/changes/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+	def main(args: Array[String]) = assert(args(0).toInt == A.x )
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/constants-name-hashing/pending b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/pending
new file mode 100644
index 000000000..61df26ef6
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/constants-name-hashing/pending
@@ -0,0 +1,11 @@
+# Tests if source dependencies are tracked properly
+# for compile-time constants (like final vals in top-level objects)
+# see https://issues.scala-lang.org/browse/SI-7173 for details
+# why compile-time constants can be tricky to track due to early inlining
+
+$ copy-file changes/B.scala B.scala
+
+$ copy-file changes/A1.scala A.scala
+> run 1
+$ copy-file changes/A2.scala A.scala
+> run 2
diff --git a/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/build.sbt b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/build.sbt
new file mode 100644
index 000000000..8a38ef414
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/build.sbt
@@ -0,0 +1 @@
+incOptions := incOptions.value.withNameHashing(true)
diff --git a/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J1.java b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J1.java
new file mode 100644
index 000000000..a3a75fefd
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J1.java
@@ -0,0 +1,4 @@
+public class J
+{
+	public static final int x = 3;
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J2.java b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J2.java
new file mode 100644
index 000000000..8ff2e24c6
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/J2.java
@@ -0,0 +1,4 @@
+public class J
+{
+	public static final String x = "3";
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/S.scala b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/S.scala
new file mode 100644
index 000000000..45436972b
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/changes/S.scala
@@ -0,0 +1,4 @@
+object S
+{
+	val y: Int = J.x
+}
diff --git a/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/pending b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/pending
new file mode 100644
index 000000000..42890ca74
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-static-name-hashing/pending
@@ -0,0 +1,24 @@
+# When a Java class is loaded from a class file and not parsed from a source file, scalac reports
+#    the statics as an object without a file and so the Analyzer must know to look for the
+#    object's linked class.
+# This test verifies this happens.
+# The test compiles a Java class with a static field. 
+# It then adds a Scala object that references the static field.  Because the object only depends on a
+#   static member and because the Java source is not included in the compilation (since it didn't change),
+#   this triggers the special case above.
+
+# add and compile the Java source
+$ copy-file changes/J1.java src/main/java/J.java
+> compile
+
+# add and compile the Scala source
+$ copy-file changes/S.scala src/main/scala/S.scala
+> compile
+
+# change the Java source so that a compile error should occur if S.scala is also recompiled (which will happen if the dependency was properly recorded)
+$ copy-file changes/J2.java src/main/java/J.java
+-> compile
+
+# verify it should have failed by doing a full recompilation
+> clean
+-> compile
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-client/Client.scala b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-client/Client.scala
new file mode 100644
index 000000000..90932d136
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-client/Client.scala
@@ -0,0 +1,5 @@
+package macro
+
+object Client {
+	Provider.tree(0)
+}
diff --git a/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/Provider.scala
new file mode 100644
index 000000000..9b6d27676
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/Provider.scala
@@ -0,0 +1,8 @@
+package macro
+import scala.language.experimental.macros
+import scala.reflect.macros._
+
+object Provider {
+	def tree(args: Any) = macro treeImpl
+	def treeImpl(c: Context)(args: c.Expr[Any]) = c.universe.reify(args.splice)
+}
diff --git a/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/changes/Provider.scala b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/changes/Provider.scala
new file mode 100644
index 000000000..711989b32
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/macro-provider/changes/Provider.scala
@@ -0,0 +1,8 @@
+package macro
+import scala.language.experimental.macros
+import scala.reflect.macros._
+
+object Provider {
+	def tree(args: Any) = macro treeImpl
+	def treeImpl(c: Context)(args: c.Expr[Any]) = sys.error("no macro for you!")
+}
diff --git a/sbt/src/sbt-test/source-dependencies/macro-name-hashing/pending b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/pending
new file mode 100644
index 000000000..b3755d4ee
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/pending
@@ -0,0 +1,13 @@
+> compile
+
+# replace macro with one that throws an error
+
+$ copy-file macro-provider/changes/Provider.scala macro-provider/Provider.scala
+
+> macro-provider/compile
+
+-> macro-client/compile
+
+> clean
+
+-> compile
diff --git a/sbt/src/sbt-test/source-dependencies/macro-name-hashing/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/project/build.scala
new file mode 100644
index 000000000..a5382240f
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/macro-name-hashing/project/build.scala
@@ -0,0 +1,29 @@
+import sbt._
+import Keys._
+
+object build extends Build {
+	val defaultSettings = Seq(
+		libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ ),
+		incOptions := incOptions.value.withNameHashing(true)
+	)
+
+	lazy val root = Project(
+	   base = file("."),
+	   id = "macro",
+	   aggregate = Seq(macroProvider, macroClient),
+	   settings = Defaults.defaultSettings ++ defaultSettings
+	)
+
+	lazy val macroProvider = Project(
+	   base = file("macro-provider"),
+	   id = "macro-provider",
+	   settings = Defaults.defaultSettings ++ defaultSettings
+	)
+
+	lazy val macroClient = Project(
+	   base = file("macro-client"),
+	   id = "macro-client",
+	   dependencies = Seq(macroProvider),
+	   settings = Defaults.defaultSettings ++ defaultSettings
+	)
+}
diff --git a/sbt/src/sbt-test/source-dependencies/struct-name-hashing/A.scala b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/A.scala
new file mode 100644
index 000000000..d17a6e20a
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: Int = 3
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/struct-name-hashing/B.scala b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/B.scala
new file mode 100644
index 000000000..635568727
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/B.scala
@@ -0,0 +1,4 @@
+object B {
+	def onX(m: { def x: Int } ) =
+		m.x
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/struct-name-hashing/C.scala b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/C.scala
new file mode 100644
index 000000000..413cd6d63
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/C.scala
@@ -0,0 +1,4 @@
+object C {
+	def main(args: Array[String]) =
+		println(B.onX(A))
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/source-dependencies/struct-name-hashing/build.sbt b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/build.sbt
new file mode 100644
index 000000000..8a38ef414
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/build.sbt
@@ -0,0 +1 @@
+incOptions := incOptions.value.withNameHashing(true)
diff --git a/sbt/src/sbt-test/source-dependencies/struct-name-hashing/changes/A.scala b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/changes/A.scala
new file mode 100644
index 000000000..dc9bbd3c0
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/changes/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: Byte = 3
+}
diff --git a/sbt/src/sbt-test/source-dependencies/struct-name-hashing/pending b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/pending
new file mode 100644
index 000000000..8c7328ea4
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/struct-name-hashing/pending
@@ -0,0 +1,6 @@
+> compile
+
+# modify A.scala so that it does not conform to the structural type in B.scala
+$ copy-file changes/A.scala A.scala
+
+-> compile
\ No newline at end of file