Merge pull request #8969 from dotty-staging/fix-#8968

odersky · web-flow · commit 689d4222964b · 2020-05-18T14:39:27.000+02:00
Fix #8968: Register export inline info
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1115,10 +1115,14 @@ class Namer { typer: Typer =>
               else {
                 import tpd._
                 val ref = path.select(sym.asTerm)
-                tpd.polyDefDef(forwarder.asTerm, targs => prefss =>
+                val ddef = tpd.polyDefDef(forwarder.asTerm, targs => prefss =>
                   ref.appliedToTypes(targs).appliedToArgss(prefss)
                 )
+                if forwarder.isInlineMethod then
+                  PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs)
+                ddef
               }
+
             buf += forwarderDef.withSpan(span)
           }
 
diff --git a/tests/pos/i8968.scala b/tests/pos/i8968.scala
@@ -0,0 +1,7 @@
+object Foo:
+  inline def get = 0
+
+object Bar:
+  export Foo._
+
+val v = Bar.get

Original file line number	Diff line number	Diff line change
`@@ -1115,10 +1115,14 @@ class Namer { typer: Typer =>`
`1115`	`1115`	`else {`
`1116`	`1116`	`import tpd._`
`1117`	`1117`	`val ref = path.select(sym.asTerm)`
`1118`		`- tpd.polyDefDef(forwarder.asTerm, targs => prefss =>`
	`1118`	`+ val ddef = tpd.polyDefDef(forwarder.asTerm, targs => prefss =>`
`1119`	`1119`	`ref.appliedToTypes(targs).appliedToArgss(prefss)`
`1120`	`1120`	`)`
	`1121`	`+ if forwarder.isInlineMethod then`
	`1122`	`+ PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs)`
	`1123`	`+ ddef`
`1121`	`1124`	`}`
	`1125`	`+`
`1122`	`1126`	`buf += forwarderDef.withSpan(span)`
`1123`	`1127`	`}`
`1124`	`1128`