Skip to content

Commit 6c29e3a

Browse files
committed
Don't force complete annotation unpickling when testing for SilentIntoAnnot
Fixes #23496
1 parent 01447df commit 6c29e3a

File tree

7 files changed

+19
-1
lines changed

7 files changed

+19
-1
lines changed

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ class TreeUnpickler(reader: TastyReader,
668668
val annotOwner =
669669
if sym.owner.isClass then newLocalDummy(sym.owner) else sym.owner
670670
var annots = annotFns.map(_(annotOwner))
671-
if annots.exists(_.symbol == defn.SilentIntoAnnot) then
671+
if annots.exists(_.hasSymbol(defn.SilentIntoAnnot)) then
672672
// Temporary measure until we can change TastyFormat to include an INTO tag
673673
sym.setFlag(Into)
674674
annots = annots.filterNot(_.symbol == defn.SilentIntoAnnot)

tests/pos/i23496/BaseLineSpec_2.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package scalaql
2+
import scalaql.fixture.*

tests/pos/i23496/Query_1.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package scalaql
2+
3+
import scala.annotation.unchecked.uncheckedVariance // unused
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package scalaql.syntax
2+
3+
@scalaql.forbiddenInheritance
4+
trait ScalaqlSyntax

tests/pos/i23496/annotations_1.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package scalaql
2+
3+
import scala.annotation.StaticAnnotation
4+
5+
class forbiddenInheritance extends StaticAnnotation

tests/pos/i23496/fixture_2.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package scalaql.fixture
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import scalaql.syntax.ScalaqlSyntax
2+
3+
package object scalaql extends ScalaqlSyntax

0 commit comments

Comments
 (0)