diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-10-26 20:34:42 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-10-26 20:34:42 +0100 |
commit | 6477211abddf80d6f115d094f81b54733f52aef1 (patch) | |
tree | 75e3c52123e71d66ae687e27263d4a49be9e35e1 /test | |
parent | 462dc9af886391c9c31cb6949b15e69b0cab55ef (diff) | |
parent | cb4bb3141a9af9a05e335b7c12011c3f4e32ea6c (diff) | |
download | scala-6477211abddf80d6f115d094f81b54733f52aef1.tar.gz scala-6477211abddf80d6f115d094f81b54733f52aef1.tar.bz2 scala-6477211abddf80d6f115d094f81b54733f52aef1.zip |
Merge pull request #4807 from lrytz/opt/innerClassAttr
Simplify and correctify calculation of the InnerClass attribute
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/innerClassAttribute/Classes_1.scala | 6 | ||||
-rw-r--r-- | test/files/jvm/innerClassAttribute/Test.scala | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/jvm/innerClassAttribute/Classes_1.scala b/test/files/jvm/innerClassAttribute/Classes_1.scala index 2b690bdd7b..5b821d43f8 100644 --- a/test/files/jvm/innerClassAttribute/Classes_1.scala +++ b/test/files/jvm/innerClassAttribute/Classes_1.scala @@ -13,7 +13,7 @@ object A3 { class A4 { def f(l: List[String]): List[String] = { - l map (_ + "1") + l map (_ + "1") : @noinline // inlining adds a reference to the nested class scala/collection/generic/GenTraversableFactory$GenericCanBuildFrom } } @@ -274,8 +274,8 @@ object NestedInValueClass { class A(val arg: String) extends AnyVal { // A has InnerClass entries for the two closures (and for A and A$). not for B / C def f = { - def g = List().map(x => ((s: String) => x)) // outer class A, no outer method (g is moved to the companion, doesn't exist in A) - g.map(x => ((s: String) => x)) // outer class A, outer method f + def g = List().map(x => ((s: String) => x)): @noinline // outer class A, no outer method (g is moved to the companion, doesn't exist in A) + g.map(x => ((s: String) => x)): @noinline // outer class A, outer method f } // statements and field declarations are not allowed in value classes } diff --git a/test/files/jvm/innerClassAttribute/Test.scala b/test/files/jvm/innerClassAttribute/Test.scala index 702e5e279a..903d08f72d 100644 --- a/test/files/jvm/innerClassAttribute/Test.scala +++ b/test/files/jvm/innerClassAttribute/Test.scala @@ -23,7 +23,7 @@ object Test extends BytecodeTest { def testInner(cls: String, fs: (InnerClassNode => Unit)*) = { val ns = innerClassNodes(cls) - assert(ns.length == fs.length, ns) + assert(ns.length == fs.length, ns.map(_.name)) (ns zip fs.toList) foreach { case (n, f) => f(n) } } |