summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-10-07 16:58:46 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-10-08 23:07:33 -0700
commit4265ab6345d7e84e36dc1444fdbbba3643b29b35 (patch)
tree3540d1bd334a504ed29e17d4989f67988c5bafeb /src/reflect
parent00c9c164f57223738789bdfd14959367a39c8d32 (diff)
downloadscala-4265ab6345d7e84e36dc1444fdbbba3643b29b35.tar.gz
scala-4265ab6345d7e84e36dc1444fdbbba3643b29b35.tar.bz2
scala-4265ab6345d7e84e36dc1444fdbbba3643b29b35.zip
Extract SerialVersionUIDAnnotation. Make SAM body synthetic.
Addressing review feedback.
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/Definitions.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 6fb99b9a5b..5970514102 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -750,7 +750,7 @@ trait Definitions extends api.StandardDefinitions {
// must filter out "universal" members (getClass is deferred for some reason)
val deferredMembers = (
tp membersBasedOnFlags (excludedFlags = BridgeAndPrivateFlags, requiredFlags = METHOD)
- filter (mem => mem.isDeferred && !isUniversalMember(mem))
+ filter (mem => mem.isDeferredNotDefault && !isUniversalMember(mem)) // TODO: test
)
// if there is only one, it's monomorphic and has a single argument list
@@ -1052,6 +1052,7 @@ trait Definitions extends api.StandardDefinitions {
lazy val ScalaInlineClass = requiredClass[scala.inline]
lazy val ScalaNoInlineClass = requiredClass[scala.noinline]
lazy val SerialVersionUIDAttr = requiredClass[scala.SerialVersionUID]
+ lazy val SerialVersionUIDAnnotation = AnnotationInfo(SerialVersionUIDAttr.tpe, List(Literal(Constant(0))), List())
lazy val SpecializedClass = requiredClass[scala.specialized]
lazy val ThrowsClass = requiredClass[scala.throws[_]]
lazy val TransientAttr = requiredClass[scala.transient]