diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-17 23:43:12 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-17 23:43:12 +0200 |
| commit | 7872ea495a9e39f3c37e1662837cacb769a9f359 (patch) | |
| tree | 5008df3ee546acc50a76b73680f53415a8b85d84 /src/compiler | |
| parent | c763d8413b8e1ef5129378952b2327e8a7c2de7d (diff) | |
| parent | f9abdcef6c9b8d96e1aaf98942938e2e875285d0 (diff) | |
| download | scala-7872ea495a9e39f3c37e1662837cacb769a9f359.tar.gz scala-7872ea495a9e39f3c37e1662837cacb769a9f359.tar.bz2 scala-7872ea495a9e39f3c37e1662837cacb769a9f359.zip | |
Merge pull request #3738 from retronym/ticket/8574
SI-8574 Copy @SerialVersionUID, etc, to specialized subclasses
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 02e55241b3..908aa69310 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -538,6 +538,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { bytecodeClazz.info val sClass = clazz.owner.newClass(clazzName, clazz.pos, (clazz.flags | SPECIALIZED) & ~CASE) + sClass.setAnnotations(clazz.annotations) // SI-8574 important that the subclass picks up @SerialVersionUID, @strictfp, etc. def cloneInSpecializedClass(member: Symbol, flagFn: Long => Long, newName: Name = null) = member.cloneSymbol(sClass, flagFn(member.flags | SPECIALIZED), newName) diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index bf98c0e3dc..9fe693ce2a 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1687,7 +1687,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper val sameSourceFile = context.unit.source.file == psym.sourceFile - if (psym.hasDeprecatedInheritanceAnnotation && !sameSourceFile) { + if (!isPastTyper && psym.hasDeprecatedInheritanceAnnotation && !sameSourceFile) { val suffix = psym.deprecatedInheritanceMessage map (": " + _) getOrElse "" val msg = s"inheritance from ${psym.fullLocationString} is deprecated$suffix" unit.deprecationWarning(parent.pos, msg) |