summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-11-10 22:33:06 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-11-10 22:33:06 +1000
commitc70774c4d531c18bb3bd43fd83676705e4b0e6e1 (patch)
treeb5114fb5c643751c348a07ebb8315a1b0f3e635a /test/files
parent60f009f47cc5bc36227f9b9ddc0f7df37345ce14 (diff)
parent9b2c10ad1807e62c348b6a38be76f2500185b2ab (diff)
downloadscala-c70774c4d531c18bb3bd43fd83676705e4b0e6e1.tar.gz
scala-c70774c4d531c18bb3bd43fd83676705e4b0e6e1.tar.bz2
scala-c70774c4d531c18bb3bd43fd83676705e4b0e6e1.zip
Merge pull request #4110 from lrytz/t8960-delambdafy
Make t8960 pass under delambdafy:method
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/t8960.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/files/run/t8960.scala b/test/files/run/t8960.scala
index c6bcd0770c..a58ac53d33 100644
--- a/test/files/run/t8960.scala
+++ b/test/files/run/t8960.scala
@@ -1,6 +1,12 @@
object Test extends App {
def test(o: AnyRef, sp: Boolean = false) = {
- if (sp) assert(o.getClass.getSuperclass.getName contains "$sp")
+ val isSpecialized = o.getClass.getSuperclass.getName contains "$sp"
+ val isDelambdafyMethod = o.getClass.getName contains "$lambda$"
+ assert(
+ // delambdafy:method doesn't currently emit specialized anonymous function classes
+ if (sp) (isSpecialized || isDelambdafyMethod) else !isSpecialized,
+ o.getClass.getName)
+
val Some(f) = o.getClass.getDeclaredFields.find(_.getName == "serialVersionUID")
assert(f.getLong(null) == 0l)
}