diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-29 18:18:09 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-29 23:19:26 -0700 |
commit | 3904c3216c741b387d81754e55aa079ce4218d06 (patch) | |
tree | 9d53968a9542a5b2791afac33d6f8fa2152b66dd /test/files/run/t6028.check | |
parent | 62d97d7f110894a0c2f36b1ed9dd7ad59c0115fa (diff) | |
download | scala-3904c3216c741b387d81754e55aa079ce4218d06.tar.gz scala-3904c3216c741b387d81754e55aa079ce4218d06.tar.bz2 scala-3904c3216c741b387d81754e55aa079ce4218d06.zip |
LMF cannot instantiate SAM of trait with non-trait superclass
Also, drop AbstractFunction for parent of anonymous subclass of
function type that must have its class spun up at compile time
(rather than at linkage time by LambdaMetaFactory).
This revealed an old problem with typedTemplate, in which
parent types may be normalized at the level of trees,
while this change does not get propagated to the class's info
in time for the constructor to be located when we type check
the primary constructor.
Diffstat (limited to 'test/files/run/t6028.check')
-rw-r--r-- | test/files/run/t6028.check | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/files/run/t6028.check b/test/files/run/t6028.check index 532d177300..f21b77fdc7 100644 --- a/test/files/run/t6028.check +++ b/test/files/run/t6028.check @@ -24,9 +24,10 @@ package <empty> { (new <$anon: Function0>(T.this, tryyParam, tryyLocal): Function0) } }; - @SerialVersionUID(value = 0) final <synthetic> class $anonfun$foo$1 extends scala.runtime.AbstractFunction0$mcI$sp with Serializable { + @SerialVersionUID(value = 0) final <synthetic> class $anonfun$foo$1 extends Object with Function0$mcI$sp with Serializable { def <init>($outer: T, methodParam$1: Int, methodLocal$1: Int): <$anon: Function0> = { $anonfun$foo$1.super.<init>(); + $anonfun$foo$1.super./*Function0*/$init$(); () }; final def apply(): Int = $anonfun$foo$1.this.apply$mcI$sp(); @@ -66,9 +67,10 @@ package <empty> { T.this.MethodLocalObject$lzycompute$1(barParam$1, MethodLocalObject$module$1) else MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type](); - @SerialVersionUID(value = 0) final <synthetic> class $anonfun$tryy$1 extends scala.runtime.AbstractFunction0$mcV$sp with Serializable { + @SerialVersionUID(value = 0) final <synthetic> class $anonfun$tryy$1 extends Object with Function0$mcV$sp with Serializable { def <init>($outer: T, tryyParam$1: Int, tryyLocal$1: runtime.IntRef): <$anon: Function0> = { $anonfun$tryy$1.super.<init>(); + $anonfun$tryy$1.super./*Function0*/$init$(); () }; final def apply(): Unit = $anonfun$tryy$1.this.apply$mcV$sp(); |