changeset 2592:be4bcbd410e9

Restore serialization-testing-support patch dropped by previous merge
author briangoetz
date Thu, 31 Oct 2013 14:07:48 -0400
parents cacf685c22c7
children 097bc67c0099
files src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Mon Oct 28 21:14:41 2013 -0400
+++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Thu Oct 31 14:07:48 2013 -0400
@@ -93,6 +93,9 @@
     /** info about the current class being processed */
     private KlassInfo kInfo;
 
+    /** for testing purposes force all lambdas to take a serializable form */
+    private boolean forceSerializableRepresentation;
+
     /** dump statistics about lambda code generation */
     private boolean dumpLambdaToMethodStats;
 
@@ -127,6 +130,7 @@
         make = TreeMaker.instance(context);
         types = Types.instance(context);
         transTypes = TransTypes.instance(context);
+        // forceSerializableRepresentation = true;
         analyzer = new LambdaAnalyzerPreprocessor();
         Options options = Options.instance(context);
         dumpLambdaToMethodStats = options.isSet("dumpLambdaToMethodStats");
@@ -1677,6 +1681,9 @@
 
             /** does this functional expression require serialization support? */
             boolean isSerializable() {
+                if (forceSerializableRepresentation) {
+                    return true;
+                }
                 for (Type target : tree.targets) {
                     if (types.asSuper(target, syms.serializableType.tsym) != null) {
                         return true;