summaryrefslogtreecommitdiff
path: root/test/files/run/delambdafy_t6555.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-05-04 21:16:41 +1000
committerJason Zaugg <jzaugg@gmail.com>2016-06-01 11:15:48 +1000
commit0533a3df71e9c855ac68e10d060c2c87d16994e0 (patch)
tree4aa840fb0367b00a0a2dc0c1108b064e7166669c /test/files/run/delambdafy_t6555.check
parent7b132f39b82e4fc47cd95eadce9e3f22da8c8d82 (diff)
downloadscala-0533a3df71e9c855ac68e10d060c2c87d16994e0.tar.gz
scala-0533a3df71e9c855ac68e10d060c2c87d16994e0.tar.bz2
scala-0533a3df71e9c855ac68e10d060c2c87d16994e0.zip
Lambda impl methods static and more stably named
The body of lambdas is compiled into a synthetic method in the enclosing class. Previously, this method was a public virtual method named `fully$qualified$Class$$anonfun$n`. For lambdas that didn't capture a `this` reference, a static method was used. This commit changes two aspects. Firstly, all lambda impl methods are now emitted static. An extra parameter is added to those that require a this reference. This is an improvement as it: - allows, shorter, more readable names for the lambda impl method - avoids pollution of the vtable of the class. Note that javac uses private instance methods, rather than public static methods. If we followed its lead, we would be unable to support important use cases in our inliner Secondly, the name of the enclosing method has been included in the name of the lambda impl method to improve debuggability and to improve serialization compatibility. The serialization improvement comes from the way that fresh names for the impl methods are allocated: adding or removing lambdas in methods not named "foo" won't change the numbering of the `anonfun$foo$n` impl methods from methods named "foo". This is in line with user expectations about anonymous class and lambda serialization stability. Brian Goetz has described this tricky area well in: http://cr.openjdk.java.net/~briangoetz/eg-attachments/lambda-serialization.html This commit doesn't go as far a Javac, we don't use the hash of the lambda type info, param names, etc to map to a lambda impl method name. As such, we are more prone to the type-1 and -2 failures described there. However, our Scala 2.11.8 has similar characteristics, so we aren't going backwards. Special case in the naming: Use "new" rather than "<init>" for constructor enclosed lambdas, as javac does. I have also changed the way that "delambdafy target" methods are identifed. Rather than relying on the naming convention, I have switched to using a symbol attachment. The assumption is that we only need to identify them from within the same compilation unit. This means we can distinguish impl metbods for expanded functions (ones called from an `apply` method of an ahead-of-time expanded anonfun class), from those that truly end up as targets for lambda metafactory. Only the latter are translated to static methods in this patch.
Diffstat (limited to 'test/files/run/delambdafy_t6555.check')
-rw-r--r--test/files/run/delambdafy_t6555.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/delambdafy_t6555.check b/test/files/run/delambdafy_t6555.check
index b6ccebde78..d8b834edc7 100644
--- a/test/files/run/delambdafy_t6555.check
+++ b/test/files/run/delambdafy_t6555.check
@@ -6,8 +6,8 @@ package <empty> {
()
};
private[this] val f: String => String = {
- final <artifact> def $anonfun(param: String): String = param;
- ((param: String) => $anonfun(param))
+ final <artifact> def $anonfun$f(param: String): String = param;
+ ((param: String) => $anonfun$f(param))
};
<stable> <accessor> def f(): String => String = Foo.this.f
}