From d4f00691c4a26f716cbf29878022309a741de070 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Fri, 30 Sep 2016 15:49:22 +0200
Subject: Fix incremental compilation when inline method signature changes

---
 bridge/src/sbt-test/source-dependencies/inline/A.scala  |  3 +++
 bridge/src/sbt-test/source-dependencies/inline/C.scala  |  5 +++++
 .../source-dependencies/inline/changes/B1.scala         |  4 ++++
 .../source-dependencies/inline/changes/B2.scala         |  4 ++++
 .../inline/project/DottyInjectedPlugin.scala            | 17 +++++++++++++++++
 bridge/src/sbt-test/source-dependencies/inline/test     |  6 ++++++
 6 files changed, 39 insertions(+)
 create mode 100644 bridge/src/sbt-test/source-dependencies/inline/A.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/inline/C.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala
 create mode 100644 bridge/src/sbt-test/source-dependencies/inline/test

(limited to 'bridge/src/sbt-test')

diff --git a/bridge/src/sbt-test/source-dependencies/inline/A.scala b/bridge/src/sbt-test/source-dependencies/inline/A.scala
new file mode 100644
index 000000000..e889eef79
--- /dev/null
+++ b/bridge/src/sbt-test/source-dependencies/inline/A.scala
@@ -0,0 +1,3 @@
+object A {
+  def get: Int = 1
+}
diff --git a/bridge/src/sbt-test/source-dependencies/inline/C.scala b/bridge/src/sbt-test/source-dependencies/inline/C.scala
new file mode 100644
index 000000000..0370943e1
--- /dev/null
+++ b/bridge/src/sbt-test/source-dependencies/inline/C.scala
@@ -0,0 +1,5 @@
+object C {
+  def test: Unit = {
+    val i: Int = B.getInline
+  }
+}
diff --git a/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala b/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala
new file mode 100644
index 000000000..5685152b3
--- /dev/null
+++ b/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala
@@ -0,0 +1,4 @@
+object B {
+  @inline def getInline: Int =
+    A.get
+}
diff --git a/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala b/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala
new file mode 100644
index 000000000..1de104357
--- /dev/null
+++ b/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala
@@ -0,0 +1,4 @@
+object B {
+  @inline def getInline: Double =
+    A.get
+}
diff --git a/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala
new file mode 100644
index 000000000..3433779b6
--- /dev/null
+++ b/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala
@@ -0,0 +1,17 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := "0.1-SNAPSHOT",
+    scalaOrganization := "ch.epfl.lamp",
+    scalacOptions += "-language:Scala2",
+    scalaBinaryVersion  := "2.11",
+    autoScalaLibrary := false,
+    libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
+    scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
+  )
+}
diff --git a/bridge/src/sbt-test/source-dependencies/inline/test b/bridge/src/sbt-test/source-dependencies/inline/test
new file mode 100644
index 000000000..ba891710f
--- /dev/null
+++ b/bridge/src/sbt-test/source-dependencies/inline/test
@@ -0,0 +1,6 @@
+$ copy-file changes/B1.scala B.scala
+> compile
+
+$ copy-file changes/B2.scala B.scala
+# Compilation of C.scala should fail because B.getInline now has type Double instead of Int
+-> compile
-- 
cgit v1.2.3