summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2008-07-29 15:18:07 +0000
committerPhilipp Haller <hallerp@gmail.com>2008-07-29 15:18:07 +0000
commit0c33725df730590e399225b0fe25bd2a1f0a35a4 (patch)
tree8bd0cfaf742d7066f6a075066ccca7cd8fd7ca53 /src
parentf4efeb88f2b61f1ad6751988d09d288e77e33c17 (diff)
downloadscala-0c33725df730590e399225b0fe25bd2a1f0a35a4.tar.gz
scala-0c33725df730590e399225b0fe25bd2a1f0a35a4.tar.bz2
scala-0c33725df730590e399225b0fe25bd2a1f0a35a4.zip
Fixed #1143. Added tests for #1143 and #1116.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/transform/CleanUp.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
index a647f8c989..d766db7146 100644
--- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala
+++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
@@ -577,7 +577,8 @@ abstract class CleanUp extends Transform {
// Value types are assumed to be serializable,
// reference types must be marked as such.
isValueType(typeSym) ||
- typeSym.hasAttribute(SerializableAttr)
+ typeSym.hasAttribute(SerializableAttr) ||
+ (m.info.baseClasses exists { bc => bc hasAttribute SerializableAttr })
}
}