diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-12-19 17:12:12 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2016-12-19 17:18:39 +0100 |
| commit | a7d17e286760879a35dfaeeadca1dbad2aa85dfc (patch) | |
| tree | 946874b6ea32e18168ea1c296ed1493d503b7f9a /compiler/src/dotty/tools/dotc/core | |
| parent | 3270404d2a6ea5fc96a3ba475e9a79fb977f3a32 (diff) | |
| download | dotty-a7d17e286760879a35dfaeeadca1dbad2aa85dfc.tar.gz dotty-a7d17e286760879a35dfaeeadca1dbad2aa85dfc.tar.bz2 dotty-a7d17e286760879a35dfaeeadca1dbad2aa85dfc.zip | |
Fix #1812, Symbols.mapSymbols shouldn't force annotation transformation.
Reasoning similar to one in the previous commit also applies to annotations.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/Symbols.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index c475e99f5..e0117300a 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -328,6 +328,7 @@ trait Symbols { this: Context => // Note that this is a hack, but hack commonly used in Dotty // The same thing is done by other completers all the time denot.info = ttmap1.mapType(oinfo) + denot.annotations = odenot.annotations.mapConserve(ttmap1.apply) } } @@ -337,7 +338,7 @@ trait Symbols { this: Context => initFlags = odenot.flags &~ (Frozen | Touched) | Fresh, info = completer, privateWithin = ttmap1.mapOwner(odenot.privateWithin), // since this refers to outer symbols, need not include copies (from->to) in ownermap here. - annotations = odenot.annotations.mapConserve(ttmap1.apply)) + annotations = odenot.annotations) } |