Merge pull request #11116 from dotty-staging/fix-#11075

nicolasstucki · web-flow · commit b97665a68ca9 · 2021-01-14T08:37:39.000+01:00
Handle abstract inline methods in TreeUnpickler
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -602,7 +602,7 @@ class TreeUnpickler(reader: TastyReader,
         sym.completer.withDecls(newScope)
         forkAt(templateStart).indexTemplateParams()(using localContext(sym))
       }
-      else if (sym.isInlineMethod)
+      else if (sym.isInlineMethod && !sym.is(Deferred))
         sym.addAnnotation(LazyBodyAnnotation { (ctx0: Context) ?=>
           val ctx1 = localContext(sym)(using ctx0).addMode(Mode.ReadPositions)
           inContext(sourceChangeContext(Addr(0))(using ctx1)) {
diff --git a/tests/pos/i11075/A_1.scala b/tests/pos/i11075/A_1.scala
@@ -0,0 +1,3 @@
+trait A {
+  inline def a: Int
+}
diff --git a/tests/pos/i11075/B_2.scala b/tests/pos/i11075/B_2.scala
@@ -0,0 +1,3 @@
+trait B extends A {
+  inline def a: Int = 0
+}

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ class TreeUnpickler(reader: TastyReader,`
`602`	`602`	`sym.completer.withDecls(newScope)`
`603`	`603`	`forkAt(templateStart).indexTemplateParams()(using localContext(sym))`
`604`	`604`	`}`
`605`		`- else if (sym.isInlineMethod)`
	`605`	`+ else if (sym.isInlineMethod && !sym.is(Deferred))`
`606`	`606`	`sym.addAnnotation(LazyBodyAnnotation { (ctx0: Context) ?=>`
`607`	`607`	`val ctx1 = localContext(sym)(using ctx0).addMode(Mode.ReadPositions)`
`608`	`608`	`inContext(sourceChangeContext(Addr(0))(using ctx1)) {`