wip

Author: nicolasstucki

Bar.scala

@@ -0,0 +1,42 @@
+class Bar {
+
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+  // asfdfdsfsadfsdfdsf
+
+  def bar: Int = {
+    Foo.foo(baz, 5)
+  }
+
+  def baz: Int = 2
+
+}

Foo.scala

@@ -0,0 +1,7 @@
+object Foo {
+
+  inline def foo(x: Int, y: Int): Int = {
+    println()
+    x + y
+  }
+}

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -236,7 +236,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
   private val bindingsBuf = new mutable.ListBuffer[ValOrDefDef]
 
   private def newSym(name: Name, flags: FlagSet, info: Type): Symbol =
-    ctx.newSymbol(ctx.owner, name, flags, info, coord = call.span)
+    ctx.newSymbol(ctx.owner, name, flags, info, coord = inlinedMethod.span)
 
   /** A binding for the parameter of an inline method. This is a `val` def for
    *  by-value parameters and a `def` def for by-name parameters. `val` defs inherit
@@ -249,6 +249,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
    */
   private def paramBindingDef(name: Name, paramtp: Type, arg: Tree,
                               bindingsBuf: mutable.ListBuffer[ValOrDefDef]): ValOrDefDef = {
+    implicit val ctx: Context = this.ctx.withSource(inlinedMethod.source(this.ctx))
+
     val argtpe = arg.tpe.dealiasKeepAnnots
     val isByName = paramtp.dealias.isInstanceOf[ExprType]
     var inlineFlag = InlineProxy
@@ -257,11 +259,21 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
       if (isByName) (InlineByNameProxy.toTermFlags, ExprType(argtpe.widen))
       else (inlineFlag, argtpe.widen)
     val boundSym = newSym(name, bindingFlags, bindingType).asTerm
+    println("=================")
+    println(arg.show)
+    println(arg)
+    println()
+    println(boundSym.span)
+    println()
     val binding = {
-      if (isByName) DefDef(boundSym, arg.changeOwner(ctx.owner, boundSym))
-      else ValDef(boundSym, arg)
-    }.withSpan(boundSym.span)
+      if (isByName) DefDef(boundSym, Inlined(EmptyTree, arg.changeOwner(ctx.owner, boundSym)))
+      else ValDef(boundSym, Inlined(EmptyTree, arg).withSpan(inlinedMethod.span))
+    }.withSpan(inlinedMethod.span)
     bindingsBuf += binding.setDefTree
+    println("********")
+    println(binding.show)
+    println()
+    println()
     binding
   }
 
@@ -516,6 +528,11 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
       // Drop unused bindings
       val (finalBindings, finalExpansion) = dropUnusedDefs(bindingsBuf.toList, expansion1)
 
+      println()
+      println(expansion1)
+      println(expansion1.span)
+      println()
+      println()
       if (inlinedMethod == defn.Compiletime_error) issueError()
 
       // Widen TermRefs to bindings
@@ -529,7 +546,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
           finalExpansion
       }
 
-      tpd.Inlined(call, tpd.seq(finalBindings, finalExpansion2))
+      tpd.Inlined(call, tpd.seq(finalBindings, finalExpansion2)(ctx.withSource(inlinedMethod.source)).withSpan(inlinedMethod.span union finalExpansion2.span))
     }
   }