Simplify change

scala · Feb 8, 2023 · 661bc28 · 661bc28
1 parent 6bfde43
commit 661bc28
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -265,11 +265,7 @@ class TreeUnpickler(reader: TastyReader,
       case Some(sym) =>
         sym
       case None =>
-        val ownerInTree = ownerTree.findOwner(addr)
-        val ctx1 =
-          if ownerInTree.exists then ctx.withOwner(ownerInTree)
-          else ctx // this is a pickled expression and the owner is located outside the expression (i.e. pickled quote)
-        val sym = forkAt(addr).createSymbol()(using ctx1)
+        val sym = forkAt(addr).createSymbol()(using ctx.withOwner(ownerTree.findOwner(addr)))
         report.log(i"forward reference to $sym")
         sym
     }
@@ -1624,7 +1620,8 @@ class TreeUnpickler(reader: TastyReader,
         try cs match {
           case ot :: cs1 =>
             if (ot.addr.index == addr.index) {
-              current
+              // this is a pickled expression and the owner is located outside the expression (i.e. pickled quote)
+              ctx.owner
             }
             else if (ot.addr.index < addr.index && addr.index < ot.end.index)
               search(ot.children, reader.symbolAt(ot.addr))