From 52b6daad86eb9ab5bbeecb2709729d992ee977f7 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Mon, 17 Oct 2016 12:33:00 +0200
Subject: Drop erroneous setPos in TreeUnpickler.

With that change, all files tested in pickleOK have the
same positions before and after pickling.
---
 src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 4 ++--
 test/dotc/tests.scala                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
index 7038f6e0a..57c0fe32d 100644
--- a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
+++ b/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -626,7 +626,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle
      *  or else read definition.
      */
     def readIndexedDef()(implicit ctx: Context): Tree = treeAtAddr.remove(currentAddr) match {
-      case Some(tree) => skipTree(); setPos(currentAddr, tree)
+      case Some(tree) => skipTree(); tree
       case none => readNewDef()
     }
 
@@ -1022,7 +1022,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle
       if (ctx.mode.is(Mode.ReadPositions)) {
         posUnpicklerOpt match {
           case Some(posUnpickler) =>
-            //println(i"setPos $tree / ${tree.getClass} to ${posUnpickler.posAt(addr)}")
+            //println(i"setPos $tree / ${tree.getClass} at $addr to ${posUnpickler.posAt(addr)}")
             val pos = posUnpickler.posAt(addr)
             if (pos.exists) tree.setPosUnchecked(pos)
             tree
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 94b74d786..feb65021d 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -65,7 +65,7 @@ class tests extends CompilerTest {
     Directory(defaultOutputDir + "java").deleteRecursively()
   }
 
-  @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling)
+  @Test def pickle_pickleOK = compileDir(testsDir, "pickling", "-Yprintpos" :: testPickling)
 // This directory doesn't exist anymore
 // @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling)
   @Test def pickle_ast = compileDir(dotcDir, "ast", testPickling)
-- 
cgit v1.2.3