diff options
7 files changed, 43 insertions, 0 deletions
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 diff --git a/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/src/dotty/tools/dotc/sbt/ExtractDependencies.scala index a36b47aa8..229e35360 100644 --- a/src/dotty/tools/dotc/sbt/ExtractDependencies.scala +++ b/src/dotty/tools/dotc/sbt/ExtractDependencies.scala @@ -190,6 +190,10 @@ private class ExtractDependenciesCollector(implicit val ctx: Context) extends tp addUsedName(rename) case _ => } + case Inlined(call, _, _) => + // The inlined call is normally ignored by TreeTraverser but we need to + // record it as a dependency + traverse(call) case t: TypeTree => usedTypeTraverser.traverse(t.tpe) case ref: RefTree => |