diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-10-17 12:33:00 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-10-17 13:19:56 +0200 |
| commit | 52b6daad86eb9ab5bbeecb2709729d992ee977f7 (patch) | |
| tree | f9def573415eb7b4f71a640ad4a8fad9d34602a4 | |
| parent | 531f3c42c40ea05b412cbbdbcc020264dd2a4375 (diff) | |
| download | dotty-52b6daad86eb9ab5bbeecb2709729d992ee977f7.tar.gz dotty-52b6daad86eb9ab5bbeecb2709729d992ee977f7.tar.bz2 dotty-52b6daad86eb9ab5bbeecb2709729d992ee977f7.zip | |
Drop erroneous setPos in TreeUnpickler.
With that change, all files tested in pickleOK have the
same positions before and after pickling.
| -rw-r--r-- | src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 4 | ||||
| -rw-r--r-- | 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) |